-
Notifications
You must be signed in to change notification settings - Fork 67
fix(deps): update dependency otel/semconv to v1.29.0 #1145
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1145 +/- ##
=============================================
- Coverage 85.71% 67.65% -18.06%
- Complexity 19 500 +481
=============================================
Files 3 53 +50
Lines 49 2588 +2539
Branches 5 348 +343
=============================================
+ Hits 42 1751 +1709
- Misses 3 711 +708
- Partials 4 126 +122 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
thpierce
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is upgrading to v1.34.0 the right thing to do? We are currently depending on OTEL Java Inst 2.11.0 - does 2.11.0 (transitiviely) depend on 1.34.0 or something else? You mentioned we are upgrading upstream dependencies, what version are we updating to, and does IT depend on 1.34.0?
...main/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGenerator.java
Show resolved
Hide resolved
39274db to
b44c80a
Compare
This PR upgrades these two upstream dependencies in ADOT Java from v1.28.0 to v1.29.0. io.opentelemetry.semconv:opentelemetry-semconv io.opentelemetry.semconv:opentelemetry-semconv-incubating Upstream OTel Java Agent v2.11 is using semconv v1.29.0, not v1.28.0. This PR keeps OTel and ADOT in sync. ADOT by default uses the same version of semconv OTel is using. In March 2024, upstream stopped using semconv keys from package "io.opentelemetry.semconv.SemanticAttributes". Semconv 1.25.0 migration #10983 open-telemetry/opentelemetry-java-instrumentation#10983 ADOT Java did not follow. It's still using keys from this package: https://github.com/aws-observability/aws-otel-java-instrumentation/blob/release/v2.11.x/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsSpanProcessingUtil.java#L18 Unfortunately, in this Jan., this package was deleted from upstream. This is causing ADOT Java build break if we need upgrade upstream dependencies. This PR replaces these old keys in ADOT Java code base. Basically, it is doing the same update upstream had done in last March. The code change is safe. It has a limited scope that only updates the definitions of semconv keys. The text content of these keys remain untouched. Test: ./gradlew build Pass ./gradlew test. Pass Manual E2E test Pass Backward Compatibility: This change is backward compatible. It does not change any runtime behaviors.
9d66d51 to
5806dc2
Compare
This PR upgrades these two upstream dependencies in ADOT Java from v1.28.0 to v1.29.0.
io.opentelemetry.semconv:opentelemetry-semconv
io.opentelemetry.semconv:opentelemetry-semconv-incubating
Upstream OTel Java Agent v2.11 is using semconv v1.29.0, not v1.28.0. This PR keeps OTel and ADOT in sync automatically on semconv. ADOT now relies on "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha" to get the version of semconv, instead of explicitly declaring one.
In March 2024, upstream stopped using semconv keys from package "io.opentelemetry.semconv.SemanticAttributes".
Semconv 1.25.0 migration #10983
open-telemetry/opentelemetry-java-instrumentation#10983
ADOT Java did not follow. It's still using keys from this package: https://github.com/aws-observability/aws-otel-java-instrumentation/blob/release/v2.11.x/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsSpanProcessingUtil.java#L18
Unfortunately, in this Jan., this package was deleted from upstream. This is causing ADOT Java build break if we need upgrade upstream dependencies.
This PR replaces these old keys in ADOT Java code base. Basically, it is doing the same update upstream had done in last March.
The code change is safe. It has a limited scope that only updates the definitions of semconv keys. The text content of these keys remain untouched.
Test:
./gradlew build Pass
./gradlew test. Pass
Manual E2E test Pass
Backward Compatibility:
This change is backward compatible. It does not change any runtime behaviors.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.