Skip to content

Commit

Permalink
Merge branch 'main' into fix-dockerfile-casing
Browse files Browse the repository at this point in the history
  • Loading branch information
MrAlias authored Oct 17, 2024
2 parents 691c1cb + bdd41b8 commit 57242ca
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http
- Support `golang.org/x/net` `v0.30.0`. ([#1149](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/1149))
- Support `google.golang.org/grpc` `1.65.1`. ([#1174](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/1174))
- Support `go.opentelemetry.io/[email protected]`. ([#1178](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/1178))
- Support `google.golang.org/grpc` `1.69.0-dev`. ([#1203](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/1203))

## [v0.15.0-alpha] - 2024-10-01

Expand Down
33 changes: 24 additions & 9 deletions internal/pkg/inject/offset_results.json
Original file line number Diff line number Diff line change
Expand Up @@ -1855,7 +1855,8 @@
"1.67.0-dev",
"1.67.0",
"1.67.1",
"1.68.0-dev"
"1.68.0-dev",
"1.69.0-dev"
]
}
]
Expand Down Expand Up @@ -2068,7 +2069,8 @@
"1.67.0-dev",
"1.67.0",
"1.67.1",
"1.68.0-dev"
"1.68.0-dev",
"1.69.0-dev"
]
}
]
Expand Down Expand Up @@ -2281,7 +2283,8 @@
"1.67.0-dev",
"1.67.0",
"1.67.1",
"1.68.0-dev"
"1.68.0-dev",
"1.69.0-dev"
]
}
]
Expand Down Expand Up @@ -2489,7 +2492,8 @@
"1.67.0-dev",
"1.67.0",
"1.67.1",
"1.68.0-dev"
"1.68.0-dev",
"1.69.0-dev"
]
}
]
Expand Down Expand Up @@ -2712,7 +2716,8 @@
"1.67.0-dev",
"1.67.0",
"1.67.1",
"1.68.0-dev"
"1.68.0-dev",
"1.69.0-dev"
]
}
]
Expand Down Expand Up @@ -2915,7 +2920,8 @@
"1.67.0-dev",
"1.67.0",
"1.67.1",
"1.68.0-dev"
"1.68.0-dev",
"1.69.0-dev"
]
}
]
Expand Down Expand Up @@ -3133,7 +3139,8 @@
"1.67.0-dev",
"1.67.0",
"1.67.1",
"1.68.0-dev"
"1.68.0-dev",
"1.69.0-dev"
]
}
]
Expand Down Expand Up @@ -3341,7 +3348,8 @@
"1.67.0-dev",
"1.67.0",
"1.67.1",
"1.68.0-dev"
"1.68.0-dev",
"1.69.0-dev"
]
}
]
Expand Down Expand Up @@ -3544,7 +3552,8 @@
"1.67.0-dev",
"1.67.0",
"1.67.1",
"1.68.0-dev"
"1.68.0-dev",
"1.69.0-dev"
]
}
]
Expand Down Expand Up @@ -3779,6 +3788,12 @@
"1.67.1",
"1.68.0-dev"
]
},
{
"offset": 440,
"versions": [
"1.69.0-dev"
]
}
]
}
Expand Down

0 comments on commit 57242ca

Please sign in to comment.