Skip to content

Make the OTel starter work with GraalVM native 22 and 23 #13500

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 12, 2025
Merged

Make the OTel starter work with GraalVM native 22 and 23 #13500

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a4a2dc
Make the OTel starter works with GraalVM native 22 and 23
jeanbisutti Mar 12, 2025
4aae10f
Add comment
jeanbisutti Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/reusable-native-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,19 @@ jobs:
graalvm-native-tests:
if: "!inputs.skip-native-tests"
runs-on: ubuntu-latest
strategy:
matrix:
test-java-version:
- 22
- 23
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- id: read-java
run: echo "version=$(cat .java-version)" >> "$GITHUB_OUTPUT"
- uses: graalvm/setup-graalvm@01ed653ac833fe80569f1ef9f25585ba2811baab # v1.3.3.1
with:
version: "latest"
java-version: "${{ steps.read-java.outputs.version }}"
java-version: ${{ matrix.test-java-version }}
components: "native-image"
- name: Running test
env:
Expand Down
4 changes: 0 additions & 4 deletions ...o.opentelemetry.instrumentation/opentelemetry-instrumentation-api/native-image.properties
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ....opentelemetry.instrumentation/opentelemetry-logback-appender-1.0/native-image.properties
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions ...n/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,12 @@ void shouldSendTelemetry() {

// JMX based metrics - test one per JMX bean
List<String> jmxMetrics =
new ArrayList<>(
Arrays.asList(
"jvm.thread.count",
"jvm.memory.used",
"jvm.system.cpu.load_1m",
"jvm.memory.init"));
new ArrayList<>(Arrays.asList("jvm.thread.count", "jvm.memory.used", "jvm.memory.init"));

double javaVersion = Double.parseDouble(System.getProperty("java.specification.version"));
if (javaVersion < 23) {
jmxMetrics.add("jvm.system.cpu.load_1m");
}

boolean noNative = System.getProperty("org.graalvm.nativeimage.imagecode") == null;
if (noNative) {
Expand Down
Loading