Skip to content

Otel logger #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open

Otel logger #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2052168
Otel logger
AGMETEOR Jan 17, 2025
ce391d3
Otel logger
AGMETEOR Jan 17, 2025
8aaf650
Mod tidy
AGMETEOR Jan 17, 2025
37662f7
Otel logger
AGMETEOR Jan 17, 2025
76cfb1c
Send test log
AGMETEOR Jan 17, 2025
b19e535
More tests
AGMETEOR Jan 17, 2025
3f66304
More tests
AGMETEOR Jan 17, 2025
66c3ca5
Fix
AGMETEOR Jan 17, 2025
c5e4023
Fix
AGMETEOR Jan 17, 2025
e264c05
Fix
AGMETEOR Jan 17, 2025
c3a3a68
Fix
AGMETEOR Jan 17, 2025
2e8949a
Fix
AGMETEOR Jan 17, 2025
a6c5371
Fix
AGMETEOR Jan 19, 2025
a2219ba
Clean
AGMETEOR Jan 21, 2025
c4249e9
More logging
AGMETEOR Jan 22, 2025
94f8a47
Fix test
AGMETEOR Jan 22, 2025
a4e6b7d
Use new golog
AGMETEOR Jan 22, 2025
26ac18f
Use new cmux
AGMETEOR Jan 23, 2025
8798dc1
Test
AGMETEOR Jan 23, 2025
419f0f2
New golog
AGMETEOR Jan 23, 2025
5532ec2
.
AGMETEOR Jan 23, 2025
400e905
Better initialized logger
AGMETEOR Jan 24, 2025
51329fb
Back to original cmux
AGMETEOR Jan 24, 2025
61a5f77
Set logger in cmux
AGMETEOR Jan 24, 2025
9f475bf
Ignore track and route names for now
AGMETEOR Jan 24, 2025
f5fc89d
Del
AGMETEOR Jan 24, 2025
77b9b33
logger otel opts
AGMETEOR Jan 24, 2025
1ba470e
Clean logger
AGMETEOR Jan 25, 2025
fc79e39
Fix formatting
AGMETEOR Jan 25, 2025
30cf45e
rm sessionticket
AGMETEOR Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions analytics/analytics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (

"github.com/getlantern/http-proxy-lantern/v2/analytics/engine"

"github.com/getlantern/golog"
"github.com/getlantern/http-proxy-lantern/v2/common"
"github.com/getlantern/http-proxy-lantern/v2/logger"
"github.com/getlantern/proxy/v3/filters"
"github.com/golang/groupcache/lru"
)
Expand All @@ -26,7 +26,7 @@ func init() {
}

var (
log = golog.LoggerFor("http-proxy-lantern.analytics")
log = logger.InitLogger("http-proxy-lantern.analytics")
)

// siteAccess holds information for tracking access to a site
Expand Down
5 changes: 2 additions & 3 deletions blacklist/blacklist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import (
"sync"
"time"

"github.com/getlantern/golog"

"github.com/getlantern/http-proxy-lantern/v2/instrument"
"github.com/getlantern/http-proxy-lantern/v2/logger"
)

const (
Expand All @@ -33,7 +32,7 @@ const (
)

var (
log = golog.LoggerFor("blacklist")
log = logger.InitLogger("blacklist")

blacklistingEnabled = false // we've temporarily turned off blacklisting for safety
)
Expand Down
4 changes: 2 additions & 2 deletions devicefilter/devicefilter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (

"github.com/dustin/go-humanize"

"github.com/getlantern/golog"
"github.com/getlantern/proxy/v3/filters"

"github.com/getlantern/http-proxy-lantern/v2/listeners"
Expand All @@ -19,13 +18,14 @@ import (
"github.com/getlantern/http-proxy-lantern/v2/common"
"github.com/getlantern/http-proxy-lantern/v2/domains"
"github.com/getlantern/http-proxy-lantern/v2/instrument"
"github.com/getlantern/http-proxy-lantern/v2/logger"
"github.com/getlantern/http-proxy-lantern/v2/redis"
"github.com/getlantern/http-proxy-lantern/v2/throttle"
"github.com/getlantern/http-proxy-lantern/v2/usage"
)

var (
log = golog.LoggerFor("devicefilter")
log = logger.InitLogger("devicefilter")

epoch = time.Date(2016, 1, 1, 0, 0, 0, 0, time.UTC)

Expand Down
8 changes: 5 additions & 3 deletions diffserv/diffserv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
package diffserv

import (
"github.com/getlantern/golog"
"golang.org/x/net/ipv4"
"net"

"golang.org/x/net/ipv4"

"github.com/getlantern/http-proxy-lantern/v2/logger"
)

var (
log = golog.LoggerFor("diffserv")
log = logger.InitLogger("diffserv")
)

// Wrap wraps the given Listener into a Listener that applies the specified tos
Expand Down
61 changes: 36 additions & 25 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/OperatorFoundation/Starbridge-go/Starbridge/v3 v3.0.17
github.com/dustin/go-humanize v1.0.1
github.com/getlantern/broflake v0.0.0-20231117182649-7d46643a6f87
github.com/getlantern/cmux/v2 v2.0.0-20230301223233-dac79088a4c0
github.com/getlantern/cmux/v2 v2.0.0-20250124101821-d19fd14965c1
github.com/getlantern/cmuxprivate v0.0.0-20211216020409-d29d0d38be54
github.com/getlantern/enhttp v0.0.0-20210901195634-6f89d45ee033
github.com/getlantern/errors v1.0.4
Expand Down Expand Up @@ -48,31 +48,39 @@ require (
github.com/go-redis/redis/v8 v8.11.5
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
github.com/hashicorp/golang-lru v0.5.4
github.com/mitchellh/mapstructure v1.5.0
github.com/mitchellh/panicwrap v1.0.0
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
github.com/refraction-networking/utls v1.6.7
github.com/sagernet/sing v0.6.0-alpha.18
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726
github.com/spaolacci/murmur3 v1.1.0
github.com/stretchr/testify v1.10.0
github.com/uptrace/opentelemetry-go-extra/otelutil v0.3.2
github.com/vharitonsky/iniflags v0.0.0-20180513140207-a33cd0b5f3de
github.com/xtaci/smux v1.5.24
gitlab.com/yawning/obfs4.git v0.0.0-20220204003609-77af0cba934d
go.opentelemetry.io/otel v1.28.0
go.opentelemetry.io/otel v1.34.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0
go.opentelemetry.io/otel/metric v1.28.0
go.opentelemetry.io/otel/sdk v1.28.0
go.opentelemetry.io/otel/sdk/metric v1.28.0
go.opentelemetry.io/otel/trace v1.28.0
golang.org/x/net v0.26.0
go.opentelemetry.io/otel/metric v1.34.0
go.opentelemetry.io/otel/sdk v1.34.0
go.opentelemetry.io/otel/sdk/metric v1.31.0
go.opentelemetry.io/otel/trace v1.34.0
golang.org/x/net v0.34.0
google.golang.org/api v0.169.0
)

require (
cloud.google.com/go v0.112.1 // indirect
cloud.google.com/go/compute/metadata v0.3.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/otel/log v0.10.0
go.opentelemetry.io/otel/sdk/log v0.10.0
)

require (
cloud.google.com/go/compute/metadata v0.5.2 // indirect
filippo.io/edwards25519 v1.0.0 // indirect
github.com/OperatorFoundation/ghostwriter-go v1.0.6 // indirect
github.com/OperatorFoundation/go-bloom v1.0.1 // indirect
Expand Down Expand Up @@ -106,7 +114,7 @@ require (
github.com/blang/vfs v1.0.0 // indirect
github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dchest/siphash v1.2.3 // indirect
Expand Down Expand Up @@ -152,7 +160,7 @@ require (
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/josharian/native v1.1.0 // indirect
github.com/klauspost/compress v1.17.4 // indirect
Expand All @@ -171,7 +179,7 @@ require (
github.com/oschwald/geoip2-golang v1.9.0 // indirect
github.com/oschwald/maxminddb-golang v1.11.0 // indirect
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
github.com/pierrec/lz4/v4 v4.1.14 // indirect
github.com/pierrec/lz4/v4 v4.1.18 // indirect
github.com/pion/datachannel v1.5.5 // indirect
github.com/pion/dtls/v2 v2.2.7 // indirect
github.com/pion/ice/v2 v2.3.5 // indirect
Expand All @@ -191,7 +199,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
Expand Down Expand Up @@ -220,30 +228,31 @@ require (
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/mock v0.5.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.29.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/oauth2 v0.20.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.22.0 // indirect
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/grpc v1.64.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
google.golang.org/grpc v1.69.4 // indirect
google.golang.org/protobuf v1.36.3 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
modernc.org/libc v1.22.3 // indirect
modernc.org/libc v1.22.4 // indirect
modernc.org/mathutil v1.5.0 // indirect
modernc.org/memory v1.5.0 // indirect
modernc.org/sqlite v1.21.1 // indirect
modernc.org/sqlite v1.21.2 // indirect
nhooyr.io/websocket v1.8.10 // indirect
zombiezen.com/go/sqlite v0.13.1 // indirect
)
Expand All @@ -252,3 +261,5 @@ require (
replace github.com/mitchellh/panicwrap v1.0.0 => github.com/getlantern/panicwrap v0.0.0-20200707191944-9ba45baf8e51

replace github.com/tetratelabs/wazero => github.com/refraction-networking/wazero v1.7.1-w

// replace github.com/getlantern/golog => ../golog
Loading
Loading