Skip to content

Conversation

@lukeina2z
Copy link
Contributor

@lukeina2z lukeina2z commented Aug 19, 2025

The upstream OTel Java Agent upgraded its build toolchain from JDK 17 to 21 in May 2024. This PR aligns ADOT with that change. Without this upgrade, merges with recent upstream changes will result in build failures.

Build with jdk21 #11219
open-telemetry/opentelemetry-java-instrumentation#11219

Tests performed:

Local build with JDK 21 passes: ./gradlew build
Unit tests pass: ./gradlew test
Smoke/contract tests pass: ./gradlew appsignals-tests:contract-tests:contractTests

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

The upstream OTel Java Agent upgraded its build toolchain from JDK 17 to 21 in May 2024. This PR aligns ADOT with that change. Without this upgrade, merges with recent upstream changes will result in build failures.

Tests performed:

Local build with JDK 21 passes: ./gradlew build
Unit tests pass: ./gradlew test
Smoke/contract tests pass: ./gradlew appsignals-tests:contract-tests:contractTests
@lukeina2z lukeina2z requested a review from a team as a code owner August 19, 2025 21:00
@codecov-commenter
Copy link

codecov-commenter commented Aug 19, 2025

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 67.45%. Comparing base (09e6487) to head (8542b29).
⚠️ Report is 471 commits behind head on main.
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@              Coverage Diff              @@
##               main    #1157       +/-   ##
=============================================
- Coverage     85.71%   67.45%   -18.26%     
- Complexity       19      521      +502     
=============================================
  Files             3       54       +51     
  Lines            49     2649     +2600     
  Branches          5      368      +363     
=============================================
+ Hits             42     1787     +1745     
- Misses            3      729      +726     
- Partials          4      133      +129     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Contributor

@thpierce thpierce left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can only fully validate this by running E2E tests in main build, since they test the produced artifact against all supported versions of Java. Anyways, since the upstream did this already, should be acceptable.

@lukeina2z lukeina2z merged commit 4a42134 into aws-observability:main Aug 20, 2025
5 checks passed
@lukeina2z lukeina2z deleted the java-version-pr-foo branch August 22, 2025 23:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants