Skip to content

Commit

Permalink
Merge branch 'main' into semconv-v1.26.0-db
Browse files Browse the repository at this point in the history
  • Loading branch information
MrAlias authored Jul 3, 2024
2 parents 8c97b14 + b18e7da commit 33d2537
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http
- Support Go `v1.21.12`. ([#905](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/905))
- Support Go `v1.22.5`. ([#905](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/905))
- Support `go.opentelemetry.io/[email protected]`. ([#904](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/904))
- Support `google.golang.org/grpc` `1.63.3`. ([#916](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/916))
- Support `google.golang.org/grpc` `1.64.1`. ([#916](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/916))

### Changed

Expand Down
16 changes: 15 additions & 1 deletion internal/pkg/inject/offset_results.json
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,9 @@
"1.63.0",
"1.63.1",
"1.63.2",
"1.63.3",
"1.64.0",
"1.64.1",
"1.65.0-dev",
"1.65.0",
"1.66.0-dev"
Expand Down Expand Up @@ -1440,7 +1442,9 @@
"1.63.0",
"1.63.1",
"1.63.2",
"1.63.3",
"1.64.0",
"1.64.1",
"1.65.0-dev",
"1.65.0",
"1.66.0-dev"
Expand Down Expand Up @@ -1632,7 +1636,9 @@
"1.63.0",
"1.63.1",
"1.63.2",
"1.63.3",
"1.64.0",
"1.64.1",
"1.65.0-dev",
"1.65.0",
"1.66.0-dev"
Expand Down Expand Up @@ -1834,7 +1840,9 @@
"1.63.0",
"1.63.1",
"1.63.2",
"1.63.3",
"1.64.0",
"1.64.1",
"1.65.0-dev",
"1.65.0",
"1.66.0-dev"
Expand Down Expand Up @@ -2031,7 +2039,9 @@
"1.63.0",
"1.63.1",
"1.63.2",
"1.63.3",
"1.64.0",
"1.64.1",
"1.65.0-dev",
"1.65.0",
"1.66.0-dev"
Expand Down Expand Up @@ -2223,7 +2233,9 @@
"1.63.0",
"1.63.1",
"1.63.2",
"1.63.3",
"1.64.0",
"1.64.1",
"1.65.0-dev",
"1.65.0",
"1.66.0-dev"
Expand Down Expand Up @@ -2414,7 +2426,8 @@
"1.62.2",
"1.63.0",
"1.63.1",
"1.63.2"
"1.63.2",
"1.63.3"
]
},
{
Expand Down Expand Up @@ -2446,6 +2459,7 @@
"offset": 432,
"versions": [
"1.64.0",
"1.64.1",
"1.65.0-dev",
"1.65.0",
"1.66.0-dev"
Expand Down

0 comments on commit 33d2537

Please sign in to comment.