Skip to content

Commit d1dbeed

Browse files
sigmasigma
authored
feat(telemetry): integrate devnet-sdk telemetry capabilities (#310)
1 parent a95503a commit d1dbeed

File tree

8 files changed

+233
-66
lines changed

8 files changed

+233
-66
lines changed

‎op-acceptor/cmd/main.go

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ import (
66
"os"
77

88
"github.com/ethereum/go-ethereum/log"
9+
"github.com/honeycombio/otel-config-go/otelconfig"
910
"github.com/urfave/cli/v2"
1011

1112
nat "github.com/ethereum-optimism/infra/op-acceptor"
1213
"github.com/ethereum-optimism/infra/op-acceptor/flags"
1314
"github.com/ethereum-optimism/infra/op-acceptor/service"
15+
"github.com/ethereum-optimism/optimism/devnet-sdk/telemetry"
1416
"github.com/ethereum-optimism/optimism/op-service/cliapp"
1517
"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
1618
oplog "github.com/ethereum-optimism/optimism/op-service/log"
@@ -49,14 +51,25 @@ func main() {
4951
}
5052
}
5153

54+
// Start telemetry
55+
ctx, shutdown, err := telemetry.SetupOpenTelemetry(
56+
context.Background(),
57+
otelconfig.WithServiceName(app.Name),
58+
otelconfig.WithServiceVersion(app.Version),
59+
)
60+
if err != nil {
61+
log.Crit("Failed to setup open telemetry", "message", err)
62+
}
63+
defer shutdown()
64+
5265
// Start server
5366
svc := service.New()
54-
svc.Start(context.Background())
67+
svc.Start(ctx)
5568
defer svc.Shutdown()
5669

5770
// Start CLI
58-
ctx := ctxinterrupt.WithSignalWaiterMain(context.Background())
59-
err := app.RunContext(ctx, os.Args)
71+
ctx = ctxinterrupt.WithSignalWaiterMain(ctx)
72+
err = app.RunContext(ctx, os.Args)
6073
if err != nil {
6174
log.Crit("Application failed", "message", err)
6275
}

‎op-acceptor/go.mod

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,22 @@ go 1.23.5
66
replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101503.4-rc.1
77

88
require (
9-
github.com/ethereum-optimism/optimism v1.13.3-0.20250421200510-5362f3d3916a
9+
github.com/ethereum-optimism/optimism v1.13.3-0.20250508151734-cb5f0fe9326c
1010
github.com/ethereum/go-ethereum v1.15.3
1111
github.com/google/uuid v1.6.0
12+
github.com/honeycombio/otel-config-go v1.17.0
1213
github.com/jedib0t/go-pretty/v6 v6.6.5
1314
github.com/prometheus/client_golang v1.22.0
1415
github.com/rs/cors v1.11.0
1516
github.com/stretchr/testify v1.10.0
1617
github.com/urfave/cli/v2 v2.27.6
18+
go.opentelemetry.io/otel v1.34.0
19+
go.opentelemetry.io/otel/trace v1.34.0
1720
gopkg.in/yaml.v3 v3.0.1
1821
)
1922

2023
require (
24+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2125
github.com/BurntSushi/toml v1.5.0 // indirect
2226
github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect
2327
github.com/Masterminds/semver/v3 v3.3.1 // indirect
@@ -30,6 +34,7 @@ require (
3034
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
3135
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
3236
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
37+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3338
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3439
github.com/cockroachdb/errors v1.11.3 // indirect
3540
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
@@ -45,21 +50,29 @@ require (
4550
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4651
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
4752
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
53+
github.com/distribution/reference v0.6.0 // indirect
54+
github.com/docker/docker v27.5.1+incompatible // indirect
55+
github.com/docker/go-connections v0.5.0 // indirect
56+
github.com/docker/go-units v0.5.0 // indirect
4857
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
4958
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 // indirect
5059
github.com/ethereum/c-kzg-4844 v1.0.3 // indirect
5160
github.com/ethereum/go-verkle v0.2.2 // indirect
5261
github.com/fatih/color v1.18.0 // indirect
62+
github.com/felixge/httpsnoop v1.0.4 // indirect
5363
github.com/fsnotify/fsnotify v1.9.0 // indirect
5464
github.com/getsentry/sentry-go v0.27.0 // indirect
5565
github.com/ghodss/yaml v1.0.0 // indirect
66+
github.com/go-logr/logr v1.4.2 // indirect
67+
github.com/go-logr/stdr v1.2.2 // indirect
5668
github.com/go-ole/go-ole v1.3.0 // indirect
5769
github.com/go-yaml/yaml v2.1.0+incompatible // indirect
5870
github.com/gofrs/flock v0.8.1 // indirect
5971
github.com/gogo/protobuf v1.3.2 // indirect
6072
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
6173
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e // indirect
6274
github.com/gorilla/websocket v1.5.3 // indirect
75+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
6376
github.com/hashicorp/go-bexpr v0.1.11 // indirect
6477
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
6578
github.com/holiman/uint256 v1.3.2 // indirect
@@ -74,19 +87,23 @@ require (
7487
github.com/kurtosis-tech/kurtosis/grpc-file-transfer/golang v0.0.0-20230803130419-099ee7a4e3dc // indirect
7588
github.com/kurtosis-tech/kurtosis/path-compression v0.0.0-20250108161014-0819b8ca912f // indirect
7689
github.com/kurtosis-tech/stacktrace v0.0.0-20211028211901-1c67a77b5409 // indirect
90+
github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect
7791
github.com/mattn/go-colorable v0.1.13 // indirect
7892
github.com/mattn/go-isatty v0.0.20 // indirect
7993
github.com/mattn/go-runewidth v0.0.16 // indirect
8094
github.com/mholt/archiver v3.1.1+incompatible // indirect
8195
github.com/mitchellh/mapstructure v1.5.0 // indirect
8296
github.com/mitchellh/pointerstructure v1.2.1 // indirect
8397
github.com/mmcloughlin/addchain v0.4.0 // indirect
98+
github.com/moby/docker-image-spec v1.3.1 // indirect
8499
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
85100
github.com/naoina/go-stringutil v0.1.0 // indirect
86101
github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416 // indirect
87102
github.com/nwaples/rardecode v1.1.3 // indirect
88103
github.com/olekukonko/tablewriter v0.0.5 // indirect
89104
github.com/onsi/gomega v1.27.1 // indirect
105+
github.com/opencontainers/go-digest v1.0.0 // indirect
106+
github.com/opencontainers/image-spec v1.1.0 // indirect
90107
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
91108
github.com/pion/dtls/v2 v2.2.12 // indirect
92109
github.com/pion/logging v0.2.2 // indirect
@@ -95,26 +112,46 @@ require (
95112
github.com/pion/transport/v3 v3.0.7 // indirect
96113
github.com/pkg/errors v0.9.1 // indirect
97114
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
115+
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
98116
github.com/prometheus/client_model v0.6.2 // indirect
99117
github.com/prometheus/common v0.62.0 // indirect
100118
github.com/prometheus/procfs v0.15.1 // indirect
101119
github.com/rivo/uniseg v0.4.7 // indirect
102120
github.com/rogpeppe/go-internal v1.13.1 // indirect
103121
github.com/russross/blackfriday/v2 v2.1.0 // indirect
122+
github.com/sethvargo/go-envconfig v1.1.0 // indirect
104123
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
124+
github.com/shirou/gopsutil/v4 v4.24.6 // indirect
125+
github.com/shoenig/go-m1cpu v0.1.6 // indirect
105126
github.com/sirupsen/logrus v1.9.3 // indirect
106127
github.com/spf13/afero v1.12.0 // indirect
107128
github.com/stretchr/objx v0.5.2 // indirect
108129
github.com/supranational/blst v0.3.14 // indirect
109130
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
110-
github.com/tklauser/go-sysconf v0.3.13 // indirect
111-
github.com/tklauser/numcpus v0.7.0 // indirect
131+
github.com/tklauser/go-sysconf v0.3.14 // indirect
132+
github.com/tklauser/numcpus v0.8.0 // indirect
112133
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
113134
github.com/ulikunitz/xz v0.5.12 // indirect
114135
github.com/wlynxg/anet v0.0.4 // indirect
115136
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
116137
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
117-
github.com/yusufpapurcu/wmi v1.2.3 // indirect
138+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
139+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
140+
go.opentelemetry.io/contrib/instrumentation/host v0.53.0 // indirect
141+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
142+
go.opentelemetry.io/contrib/instrumentation/runtime v0.53.0 // indirect
143+
go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect
144+
go.opentelemetry.io/contrib/propagators/ot v1.28.0 // indirect
145+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
146+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
147+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
148+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
149+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 // indirect
150+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
151+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
152+
go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
153+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
154+
go.uber.org/multierr v1.11.0 // indirect
118155
golang.org/x/crypto v0.32.0 // indirect
119156
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
120157
golang.org/x/net v0.34.0 // indirect

0 commit comments

Comments
 (0)