Skip to content

Commit 9afc553

Browse files
RonFedRonFed
committed
Merge branch 'main' into otelglobal_collect_user_tracer_name
2 parents b6b8bb1 + b2b51b2 commit 9afc553

File tree

17 files changed

+248
-190
lines changed

17 files changed

+248
-190
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http
1919
- Support Go `v1.22.3`. ([#824](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/824))
2020
- Support `google.golang.org/grpc` `1.65.0-dev`. ([#827](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/827))
2121
- Support `google.golang.org/grpc` `1.64.0`. ([#843](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/843))
22+
- `WithLoadedIndicator` `InstrumentationOption` to configure an Instrumentation to notify the caller once all the eBPF probes are loaded. ([#848](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/848))
23+
- Add env var equivalent to the WithGlobal InstrumentationOption. ([#849](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/849))
24+
- Support `go.opentelemetry.io/[email protected]`. ([#850](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/850))
2225

2326
### Fixed
2427

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,11 @@ Any [Maintainer] can merge the PR once the above criteria have been met.
143143
- [Dinesh Gurumurthy](https://github.com/dineshg13), DataDog
144144
- [Mike Dame](https://github.com/damemi), Google
145145
- [Robert Pająk](https://github.com/pellared), Splunk
146-
- [Ron Federman](https://github.com/RonFed), KeyVal
146+
- [Ron Federman](https://github.com/RonFed), Odigos
147147

148148
### Maintainers
149149

150-
- [Eden Federman](https://github.com/edeNFed), KeyVal
150+
- [Eden Federman](https://github.com/edeNFed), Odigos
151151
- [Przemyslaw Delewski](https://github.com/pdelewski), SumoLogic
152152
- [Tyler Yahn](https://github.com/MrAlias), Splunk
153153

‎cli/main.go‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ func main() {
9393

9494
logger.Info("building OpenTelemetry Go instrumentation ...", "globalImpl", globalImpl)
9595

96-
instOptions := []auto.InstrumentationOption{auto.WithEnv()}
96+
loadedIndicator := make(chan struct{})
97+
instOptions := []auto.InstrumentationOption{auto.WithEnv(), auto.WithLoadedIndicator(loadedIndicator)}
9798
if globalImpl {
9899
instOptions = append(instOptions, auto.WithGlobal())
99100
}
@@ -104,6 +105,15 @@ func main() {
104105
return
105106
}
106107

108+
go func() {
109+
select {
110+
case <-ctx.Done():
111+
return
112+
case <-loadedIndicator:
113+
logger.Info("instrumentation loaded successfully")
114+
}
115+
}()
116+
107117
logger.Info("starting instrumentation...")
108118
if err = inst.Run(ctx); err != nil && !errors.Is(err, process.ErrInterrupted) {
109119
logger.Error(err, "instrumentation crashed")

‎examples/kafka-go/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ go 1.22.0
44

55
require (
66
github.com/segmentio/kafka-go v0.4.47
7-
go.opentelemetry.io/otel v1.26.0
7+
go.opentelemetry.io/otel v1.27.0
88
)
99

1010
require (
1111
github.com/go-logr/logr v1.4.1 // indirect
1212
github.com/go-logr/stdr v1.2.2 // indirect
1313
github.com/klauspost/compress v1.15.9 // indirect
1414
github.com/pierrec/lz4/v4 v4.1.15 // indirect
15-
go.opentelemetry.io/otel/metric v1.26.0 // indirect
16-
go.opentelemetry.io/otel/trace v1.26.0 // indirect
15+
go.opentelemetry.io/otel/metric v1.27.0 // indirect
16+
go.opentelemetry.io/otel/trace v1.27.0 // indirect
1717
)

‎examples/kafka-go/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3k
2929
github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
3030
github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
3131
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
32-
go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs=
33-
go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4=
34-
go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30=
35-
go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4=
36-
go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA=
37-
go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0=
32+
go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg=
33+
go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ=
34+
go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik=
35+
go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak=
36+
go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw=
37+
go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4=
3838
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
3939
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
4040
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=

‎go.mod‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ retract (
2121

2222
require (
2323
github.com/cilium/ebpf v0.15.0
24-
github.com/go-logr/logr v1.4.1
24+
github.com/go-logr/logr v1.4.2
2525
github.com/go-logr/stdr v1.2.2
2626
github.com/go-logr/zapr v1.3.0
27-
github.com/hashicorp/go-version v1.6.0
27+
github.com/hashicorp/go-version v1.7.0
2828
github.com/pkg/errors v0.9.1
2929
github.com/stretchr/testify v1.9.0
30-
go.opentelemetry.io/contrib/exporters/autoexport v0.51.0
31-
go.opentelemetry.io/otel v1.26.0
32-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0
33-
go.opentelemetry.io/otel/sdk v1.26.0
34-
go.opentelemetry.io/otel/trace v1.26.0
30+
go.opentelemetry.io/contrib/exporters/autoexport v0.52.0
31+
go.opentelemetry.io/otel v1.27.0
32+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0
33+
go.opentelemetry.io/otel/sdk v1.27.0
34+
go.opentelemetry.io/otel/trace v1.27.0
3535
go.uber.org/zap v1.27.0
3636
golang.org/x/arch v0.8.0
3737
golang.org/x/sys v0.20.0
@@ -41,30 +41,31 @@ require (
4141
require (
4242
github.com/beorn7/perks v1.0.1 // indirect
4343
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
44-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
44+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4545
github.com/davecgh/go-spew v1.1.1 // indirect
46-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
46+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
4747
github.com/pmezard/go-difflib v1.0.0 // indirect
48-
github.com/prometheus/client_golang v1.19.0 // indirect
48+
github.com/prometheus/client_golang v1.19.1 // indirect
4949
github.com/prometheus/client_model v0.6.1 // indirect
50-
github.com/prometheus/common v0.48.0 // indirect
51-
github.com/prometheus/procfs v0.12.0 // indirect
52-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.26.0 // indirect
53-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.26.0 // indirect
54-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect
55-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0 // indirect
56-
go.opentelemetry.io/otel/exporters/prometheus v0.48.0 // indirect
57-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.26.0 // indirect
58-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.26.0 // indirect
59-
go.opentelemetry.io/otel/metric v1.26.0 // indirect
60-
go.opentelemetry.io/otel/sdk/metric v1.26.0 // indirect
50+
github.com/prometheus/common v0.53.0 // indirect
51+
github.com/prometheus/procfs v0.15.0 // indirect
52+
go.opentelemetry.io/contrib/bridges/prometheus v0.52.0 // indirect
53+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect
54+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect
55+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
56+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
57+
go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
58+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect
59+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect
60+
go.opentelemetry.io/otel/metric v1.27.0 // indirect
61+
go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect
6162
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
62-
go.uber.org/multierr v1.10.0 // indirect
63+
go.uber.org/multierr v1.11.0 // indirect
6364
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
64-
golang.org/x/net v0.24.0 // indirect
65-
golang.org/x/text v0.14.0 // indirect
66-
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
67-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
68-
google.golang.org/grpc v1.63.2 // indirect
69-
google.golang.org/protobuf v1.33.0 // indirect
65+
golang.org/x/net v0.25.0 // indirect
66+
golang.org/x/text v0.15.0 // indirect
67+
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
68+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect
69+
google.golang.org/grpc v1.64.0 // indirect
70+
google.golang.org/protobuf v1.34.1 // indirect
7071
)

0 commit comments

Comments
 (0)