Skip to content

Commit 3104420

Browse files
tracing: Replace deprecated jaeger exporter with otelhttp exporter (#14928)
* Update go.opentelemetry.io/otel to v1.34.0 * Update otel exporter to replace deprecated jaeger exporter * Changelog * Use WithEndpointURL * Clarify potential breaking change
1 parent 3a1702e commit 3104420

File tree

8 files changed

+158
-74
lines changed

8 files changed

+158
-74
lines changed

beacon-chain/node/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414

1515
func configureTracing(cliCtx *cli.Context) error {
1616
return tracing.Setup(
17+
cliCtx.Context,
1718
"beacon-chain", // service name
1819
cliCtx.String(cmd.TracingProcessNameFlag.Name),
1920
cliCtx.String(cmd.TracingEndpointFlag.Name),

changelog/pvl_otel.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
### Changed
2+
3+
- Updated tracing exporter from jaeger to otelhttp. This should not be a breaking change. Jaeger supports otel format, however you may need to update your URL as the default otel-collector port is 4318. See the [OpenTelemtry Protocol Exporter docs](https://opentelemetry.io/docs/specs/otel/protocol/exporter/) for more details.

deps.bzl

Lines changed: 100 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ def prysm_deps():
9494
sum = "h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=",
9595
version = "v0.0.0-20161002113705-648efa622239",
9696
)
97+
go_repository(
98+
name = "com_github_antihax_optional",
99+
importpath = "github.com/antihax/optional",
100+
sum = "h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=",
101+
version = "v1.0.0",
102+
)
97103
go_repository(
98104
name = "com_github_apache_thrift",
99105
importpath = "github.com/apache/thrift",
@@ -352,6 +358,12 @@ def prysm_deps():
352358
sum = "h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=",
353359
version = "v2.2.1+incompatible",
354360
)
361+
go_repository(
362+
name = "com_github_cenkalti_backoff_v4",
363+
importpath = "github.com/cenkalti/backoff/v4",
364+
sum = "h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=",
365+
version = "v4.3.0",
366+
)
355367
go_repository(
356368
name = "com_github_census_instrumentation_opencensus_proto",
357369
importpath = "github.com/census-instrumentation/opencensus-proto",
@@ -439,8 +451,8 @@ def prysm_deps():
439451
go_repository(
440452
name = "com_github_cncf_xds_go",
441453
importpath = "github.com/cncf/xds/go",
442-
sum = "h1:ga8SEFjZ60pxLcmhnThWgvH2wg8376yUJmPhEH4H3kw=",
443-
version = "v0.0.0-20240423153145-555b57ec207b",
454+
sum = "h1:QVw89YDxXxEe+l8gU8ETbOasdwEV+avkR75ZzsVV9WI=",
455+
version = "v0.0.0-20240905190251-b4127c9b8d78",
444456
)
445457
go_repository(
446458
name = "com_github_cockroachdb_datadriven",
@@ -729,14 +741,14 @@ def prysm_deps():
729741
go_repository(
730742
name = "com_github_envoyproxy_go_control_plane",
731743
importpath = "github.com/envoyproxy/go-control-plane",
732-
sum = "h1:4X+VP1GHd1Mhj6IB5mMeGbLCleqxjletLK6K0rbxyZI=",
733-
version = "v0.12.0",
744+
sum = "h1:vPfJZCkob6yTMEgS+0TwfTUfbHjfy/6vOJ8hUWX/uXE=",
745+
version = "v0.13.1",
734746
)
735747
go_repository(
736748
name = "com_github_envoyproxy_protoc_gen_validate",
737749
importpath = "github.com/envoyproxy/protoc-gen-validate",
738-
sum = "h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=",
739-
version = "v1.0.4",
750+
sum = "h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM=",
751+
version = "v1.1.0",
740752
)
741753
go_repository(
742754
name = "com_github_ethereum_c_kzg_4844",
@@ -1132,8 +1144,8 @@ def prysm_deps():
11321144
go_repository(
11331145
name = "com_github_golang_glog",
11341146
importpath = "github.com/golang/glog",
1135-
sum = "h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4=",
1136-
version = "v1.2.1",
1147+
sum = "h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY=",
1148+
version = "v1.2.2",
11371149
)
11381150
go_repository(
11391151
name = "com_github_golang_groupcache",
@@ -1275,6 +1287,12 @@ def prysm_deps():
12751287
sum = "h1:tlyzajkF3030q6M8SvmJSemC9DTHL/xaMa18b65+JM4=",
12761288
version = "v0.0.0-20200911160855-bcd43fbb19e8",
12771289
)
1290+
go_repository(
1291+
name = "com_github_googlecloudplatform_opentelemetry_operations_go_detectors_gcp",
1292+
importpath = "github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp",
1293+
sum = "h1:cZpsGsWTIFKymTA0je7IIvi1O7Es7apb9CF3EQlOcfE=",
1294+
version = "v1.24.2",
1295+
)
12781296
go_repository(
12791297
name = "com_github_gopherjs_gopherjs",
12801298
importpath = "github.com/gopherjs/gopherjs",
@@ -1347,6 +1365,12 @@ def prysm_deps():
13471365
sum = "h1:UImYN5qQ8tuGpGE16ZmjvcTtTw24zw1QAp/SlnNrZhI=",
13481366
version = "v1.9.5",
13491367
)
1368+
go_repository(
1369+
name = "com_github_grpc_ecosystem_grpc_gateway_v2",
1370+
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2",
1371+
sum = "h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=",
1372+
version = "v2.25.1",
1373+
)
13501374
go_repository(
13511375
name = "com_github_guptarohit_asciigraph",
13521376
importpath = "github.com/guptarohit/asciigraph",
@@ -2737,6 +2761,12 @@ def prysm_deps():
27372761
sum = "h1:I2qBYMChEhIjOgazfJmV3/mZM256btk6wkCDRmW7JYs=",
27382762
version = "v1.13.1",
27392763
)
2764+
go_repository(
2765+
name = "com_github_planetscale_vtprotobuf",
2766+
importpath = "github.com/planetscale/vtprotobuf",
2767+
sum = "h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=",
2768+
version = "v0.6.1-0.20240319094008-0393e58bdf10",
2769+
)
27402770
go_repository(
27412771
name = "com_github_pmezard_go_difflib",
27422772
importpath = "github.com/pmezard/go-difflib",
@@ -2895,14 +2925,14 @@ def prysm_deps():
28952925
go_repository(
28962926
name = "com_github_rogpeppe_fastuuid",
28972927
importpath = "github.com/rogpeppe/fastuuid",
2898-
sum = "h1:gu+uRPtBe88sKxUCEXRoeCvVG90TJmwhiqRpvdhQFng=",
2899-
version = "v0.0.0-20150106093220-6724a57986af",
2928+
sum = "h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=",
2929+
version = "v1.2.0",
29002930
)
29012931
go_repository(
29022932
name = "com_github_rogpeppe_go_internal",
29032933
importpath = "github.com/rogpeppe/go-internal",
2904-
sum = "h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=",
2905-
version = "v1.12.0",
2934+
sum = "h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=",
2935+
version = "v1.13.1",
29062936
)
29072937
go_repository(
29082938
name = "com_github_rs_cors",
@@ -3243,8 +3273,8 @@ def prysm_deps():
32433273
go_repository(
32443274
name = "com_github_stretchr_testify",
32453275
importpath = "github.com/stretchr/testify",
3246-
sum = "h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=",
3247-
version = "v1.9.0",
3276+
sum = "h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=",
3277+
version = "v1.10.0",
32483278
)
32493279
go_repository(
32503280
name = "com_github_syndtr_goleveldb",
@@ -3696,8 +3726,8 @@ def prysm_deps():
36963726
go_repository(
36973727
name = "com_google_cloud_go_compute_metadata",
36983728
importpath = "cloud.google.com/go/compute/metadata",
3699-
sum = "h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=",
3700-
version = "v0.3.0",
3729+
sum = "h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo=",
3730+
version = "v0.5.2",
37013731
)
37023732
go_repository(
37033733
name = "com_google_cloud_go_contactcenterinsights",
@@ -4326,8 +4356,8 @@ def prysm_deps():
43264356
go_repository(
43274357
name = "dev_cel_expr",
43284358
importpath = "cel.dev/expr",
4329-
sum = "h1:O1jzfJCQBfL5BFoYktaxwIhuttaQPsVWerH9/EEKx0w=",
4330-
version = "v0.15.0",
4359+
sum = "h1:RwRhoH17VhAu9U5CMvMhH1PDVgf0tuz9FT+24AfMLfU=",
4360+
version = "v0.16.2",
43314361
)
43324362
go_repository(
43334363
name = "in_gopkg_alecthomas_kingpin_v2",
@@ -4543,35 +4573,65 @@ def prysm_deps():
45434573
sum = "h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=",
45444574
version = "v0.24.0",
45454575
)
4576+
go_repository(
4577+
name = "io_opentelemetry_go_auto_sdk",
4578+
importpath = "go.opentelemetry.io/auto/sdk",
4579+
sum = "h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=",
4580+
version = "v1.1.0",
4581+
)
4582+
go_repository(
4583+
name = "io_opentelemetry_go_contrib_detectors_gcp",
4584+
importpath = "go.opentelemetry.io/contrib/detectors/gcp",
4585+
sum = "h1:G1JQOreVrfhRkner+l4mrGxmfqYCAuy76asTDAo0xsA=",
4586+
version = "v1.31.0",
4587+
)
45464588
go_repository(
45474589
name = "io_opentelemetry_go_otel",
45484590
importpath = "go.opentelemetry.io/otel",
4549-
sum = "h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw=",
4550-
version = "v1.29.0",
4591+
sum = "h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=",
4592+
version = "v1.34.0",
45514593
)
45524594
go_repository(
4553-
name = "io_opentelemetry_go_otel_exporters_jaeger",
4554-
importpath = "go.opentelemetry.io/otel/exporters/jaeger",
4555-
sum = "h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4=",
4556-
version = "v1.17.0",
4595+
name = "io_opentelemetry_go_otel_exporters_otlp_otlptrace",
4596+
importpath = "go.opentelemetry.io/otel/exporters/otlp/otlptrace",
4597+
sum = "h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60=",
4598+
version = "v1.34.0",
4599+
)
4600+
go_repository(
4601+
name = "io_opentelemetry_go_otel_exporters_otlp_otlptrace_otlptracehttp",
4602+
importpath = "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp",
4603+
sum = "h1:BEj3SPM81McUZHYjRS5pEgNgnmzGJ5tRpU5krWnV8Bs=",
4604+
version = "v1.34.0",
45574605
)
45584606
go_repository(
45594607
name = "io_opentelemetry_go_otel_metric",
45604608
importpath = "go.opentelemetry.io/otel/metric",
4561-
sum = "h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc=",
4562-
version = "v1.29.0",
4609+
sum = "h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=",
4610+
version = "v1.34.0",
45634611
)
45644612
go_repository(
45654613
name = "io_opentelemetry_go_otel_sdk",
45664614
importpath = "go.opentelemetry.io/otel/sdk",
4567-
sum = "h1:vkqKjk7gwhS8VaWb0POZKmIEDimRCMsopNYnriHyryo=",
4568-
version = "v1.29.0",
4615+
sum = "h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=",
4616+
version = "v1.34.0",
4617+
)
4618+
go_repository(
4619+
name = "io_opentelemetry_go_otel_sdk_metric",
4620+
importpath = "go.opentelemetry.io/otel/sdk/metric",
4621+
sum = "h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc=",
4622+
version = "v1.31.0",
45694623
)
45704624
go_repository(
45714625
name = "io_opentelemetry_go_otel_trace",
45724626
importpath = "go.opentelemetry.io/otel/trace",
4573-
sum = "h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4=",
4574-
version = "v1.29.0",
4627+
sum = "h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=",
4628+
version = "v1.34.0",
4629+
)
4630+
go_repository(
4631+
name = "io_opentelemetry_go_proto_otlp",
4632+
importpath = "go.opentelemetry.io/proto/otlp",
4633+
sum = "h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=",
4634+
version = "v1.5.0",
45754635
)
45764636
go_repository(
45774637
name = "io_rsc_binaryregexp",
@@ -4636,27 +4696,27 @@ def prysm_deps():
46364696
go_repository(
46374697
name = "org_golang_google_genproto_googleapis_api",
46384698
importpath = "google.golang.org/genproto/googleapis/api",
4639-
sum = "h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw=",
4640-
version = "v0.0.0-20240528184218-531527333157",
4699+
sum = "h1:gap6+3Gk41EItBuyi4XX/bp4oqJ3UwuIMl25yGinuAA=",
4700+
version = "v0.0.0-20250115164207-1a7da9e5054f",
46414701
)
46424702
go_repository(
46434703
name = "org_golang_google_genproto_googleapis_rpc",
46444704
importpath = "google.golang.org/genproto/googleapis/rpc",
4645-
sum = "h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8=",
4646-
version = "v0.0.0-20240528184218-531527333157",
4705+
sum = "h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=",
4706+
version = "v0.0.0-20250115164207-1a7da9e5054f",
46474707
)
46484708
go_repository(
46494709
name = "org_golang_google_grpc",
46504710
build_file_proto_mode = "disable",
46514711
importpath = "google.golang.org/grpc",
4652-
sum = "h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=",
4653-
version = "v1.65.0",
4712+
sum = "h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=",
4713+
version = "v1.69.4",
46544714
)
46554715
go_repository(
46564716
name = "org_golang_google_protobuf",
46574717
importpath = "google.golang.org/protobuf",
4658-
sum = "h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=",
4659-
version = "v1.34.2",
4718+
sum = "h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=",
4719+
version = "v1.36.3",
46604720
)
46614721
go_repository(
46624722
name = "org_golang_x_build",
@@ -4715,8 +4775,8 @@ def prysm_deps():
47154775
go_repository(
47164776
name = "org_golang_x_oauth2",
47174777
importpath = "golang.org/x/oauth2",
4718-
sum = "h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=",
4719-
version = "v0.21.0",
4778+
sum = "h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=",
4779+
version = "v0.24.0",
47204780
)
47214781
go_repository(
47224782
name = "org_golang_x_perf",

go.mod

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ require (
6868
github.com/sirupsen/logrus v1.9.3
6969
github.com/spf13/afero v1.10.0
7070
github.com/status-im/keycard-go v0.2.0
71-
github.com/stretchr/testify v1.9.0
71+
github.com/stretchr/testify v1.10.0
7272
github.com/supranational/blst v0.3.14
7373
github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e
7474
github.com/trailofbits/go-mutexasserts v0.0.0-20230328101604-8cdbc5f3d279
@@ -80,19 +80,19 @@ require (
8080
github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.1.3
8181
go.etcd.io/bbolt v1.3.6
8282
go.opencensus.io v0.24.0
83-
go.opentelemetry.io/otel v1.29.0
84-
go.opentelemetry.io/otel/exporters/jaeger v1.17.0
85-
go.opentelemetry.io/otel/sdk v1.29.0
86-
go.opentelemetry.io/otel/trace v1.29.0
83+
go.opentelemetry.io/otel v1.34.0
84+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0
85+
go.opentelemetry.io/otel/sdk v1.34.0
86+
go.opentelemetry.io/otel/trace v1.34.0
8787
go.uber.org/automaxprocs v1.5.2
8888
go.uber.org/mock v0.4.0
8989
golang.org/x/crypto v0.32.0
9090
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
9191
golang.org/x/sync v0.10.0
9292
golang.org/x/tools v0.29.0
9393
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
94-
google.golang.org/grpc v1.65.0
95-
google.golang.org/protobuf v1.34.2
94+
google.golang.org/grpc v1.69.4
95+
google.golang.org/protobuf v1.36.3
9696
gopkg.in/d4l3k/messagediff.v1 v1.2.1
9797
gopkg.in/yaml.v2 v2.4.0
9898
gopkg.in/yaml.v3 v3.0.1
@@ -109,6 +109,7 @@ require (
109109
github.com/benbjohnson/clock v1.3.5 // indirect
110110
github.com/beorn7/perks v1.0.1 // indirect
111111
github.com/bits-and-blooms/bitset v1.17.0 // indirect
112+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
112113
github.com/cespare/cp v1.1.1 // indirect
113114
github.com/cespare/xxhash v1.1.0 // indirect
114115
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -151,6 +152,7 @@ require (
151152
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
152153
github.com/gorilla/websocket v1.5.3 // indirect
153154
github.com/graph-gophers/graphql-go v1.3.0 // indirect
155+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
154156
github.com/hashicorp/go-bexpr v0.1.10 // indirect
155157
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
156158
github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect
@@ -234,7 +236,7 @@ require (
234236
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
235237
github.com/raulk/go-watchdog v1.3.0 // indirect
236238
github.com/rivo/uniseg v0.4.7 // indirect
237-
github.com/rogpeppe/go-internal v1.12.0 // indirect
239+
github.com/rogpeppe/go-internal v1.13.1 // indirect
238240
github.com/russross/blackfriday/v2 v2.1.0 // indirect
239241
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
240242
github.com/spaolacci/murmur3 v1.1.0 // indirect
@@ -246,15 +248,18 @@ require (
246248
github.com/wlynxg/anet v0.0.4 // indirect
247249
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
248250
github.com/yusufpapurcu/wmi v1.2.3 // indirect
249-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
251+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
252+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
253+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
254+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
250255
go.uber.org/dig v1.18.0 // indirect
251256
go.uber.org/fx v1.22.2 // indirect
252257
go.uber.org/multierr v1.11.0 // indirect
253258
go.uber.org/zap v1.27.0 // indirect
254259
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect
255260
golang.org/x/mod v0.22.0 // indirect
256261
golang.org/x/net v0.34.0 // indirect
257-
golang.org/x/oauth2 v0.21.0 // indirect
262+
golang.org/x/oauth2 v0.24.0 // indirect
258263
golang.org/x/term v0.28.0 // indirect
259264
golang.org/x/text v0.21.0 // indirect
260265
golang.org/x/time v0.5.0 // indirect

0 commit comments

Comments
 (0)