From aa5f3a37b9532cfdb028670f7cd1d8bcb9df1679 Mon Sep 17 00:00:00 2001 From: Falko Modler Date: Mon, 31 Jan 2022 00:02:27 +0100 Subject: [PATCH] Update OpenTelemetry to 1.10.1 --- bom/application/pom.xml | 4 ++-- .../runtime/graal/RandomSupplier.java | 18 ++++++++++++++++++ .../runtime/graal/UnsafeRefArrayAccess.java | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/RandomSupplier.java diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 24db05dfba76a..73143e66ab9b5 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -28,8 +28,8 @@ 0.2.4 0.1.15 0.1.5 - 1.9.1 - 1.9.0-alpha + 1.10.1 + 1.10.1-alpha 1.8.0 4.1.4 1.8.2 diff --git a/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/RandomSupplier.java b/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/RandomSupplier.java new file mode 100644 index 0000000000000..923f51eef6f35 --- /dev/null +++ b/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/RandomSupplier.java @@ -0,0 +1,18 @@ +package io.quarkus.opentelemetry.runtime.graal; + +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; +import java.util.function.Supplier; + +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; + +@TargetClass(className = "io.opentelemetry.sdk.internal.RandomSupplier") +final class RandomSupplier { + + @Substitute + public static Supplier platformDefault() { + // removed delegation to AndroidFriendlyRandomHolder (which has a Random constant), making it effectively unreachable + return ThreadLocalRandom::current; + } +} diff --git a/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/UnsafeRefArrayAccess.java b/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/UnsafeRefArrayAccess.java index 661cd2032317a..5e23bba3484a6 100644 --- a/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/UnsafeRefArrayAccess.java +++ b/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/graal/UnsafeRefArrayAccess.java @@ -5,7 +5,7 @@ import com.oracle.svm.core.annotate.TargetClass; @TargetClass(className = "io.opentelemetry.internal.shaded.jctools.util.UnsafeRefArrayAccess") -public final class UnsafeRefArrayAccess { +final class UnsafeRefArrayAccess { @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.ArrayIndexShift, declClass = Object[].class)