Bump opentelemetry-bom from 1.12.0 to 1.13.0

Bumps [opentelemetry-bom](https://github.com/open-telemetry/opentelemetry-java) from 1.12.0 to 1.13.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-java@v1.12.0...v1.13.0) --- updated-dependencies: - dependency-name: io.opentelemetry:opentelemetry-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
quarkusio · Apr 19, 2022 · 3bb015e · 3bb015e
1 parent a8d5279
commit 3bb015e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -24,7 +24,7 @@
         <opentracing-jdbc.version>0.2.4</opentracing-jdbc.version>
         <opentracing-kafka.version>0.1.15</opentracing-kafka.version>
         <opentracing-mongo.version>0.1.5</opentracing-mongo.version>
-        <opentelemetry.version>1.12.0</opentelemetry.version>
+        <opentelemetry.version>1.13.0</opentelemetry.version>
         <opentelemetry-alpha.version>1.12.0-alpha</opentelemetry-alpha.version>
         <jaeger.version>1.8.0</jaeger.version>
         <quarkus-http.version>4.1.8</quarkus-http.version>

diff --git a/.../java/io/quarkus/opentelemetry/exporter/otlp/runtime/graal/OtlpExporterSubstitutions.java b/.../java/io/quarkus/opentelemetry/exporter/otlp/runtime/graal/OtlpExporterSubstitutions.java
@@ -3,6 +3,7 @@
 import static java.util.Objects.requireNonNull;
 
 import javax.net.ssl.SSLException;
+import javax.net.ssl.X509KeyManager;
 import javax.net.ssl.X509TrustManager;
 
 import com.oracle.svm.core.annotate.Substitute;
@@ -11,6 +12,7 @@
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.netty.GrpcSslContexts;
 import io.grpc.netty.NettyChannelBuilder;
+import io.opentelemetry.exporter.internal.TlsUtil;
 
 /**
  * Replace the {@code setTrustedCertificatesPem()} method in native because the upstream code supports using
@@ -20,26 +22,31 @@
 final class Target_io_opentelemetry_exporter_otlp_internal_grpc_ManagedChannelUtil {
 
     @Substitute
-    public static void setTrustedCertificatesPem(
-            ManagedChannelBuilder<?> managedChannelBuilder, byte[] trustedCertificatesPem)
+    public static void setClientKeysAndTrustedCertificatesPem(
+            ManagedChannelBuilder<?> managedChannelBuilder,
+            byte[] privateKeyPem,
+            byte[] certificatePem,
+            byte[] trustedCertificatesPem)
             throws SSLException {
         requireNonNull(managedChannelBuilder, "managedChannelBuilder");
         requireNonNull(trustedCertificatesPem, "trustedCertificatesPem");
 
-        X509TrustManager tm = io.opentelemetry.exporter.internal.TlsUtil.trustManager(trustedCertificatesPem);
+        X509TrustManager tmf = TlsUtil.trustManager(trustedCertificatesPem);
+        X509KeyManager kmf = null;
+        if (privateKeyPem != null && certificatePem != null) {
+            kmf = TlsUtil.keyManager(privateKeyPem, certificatePem);
+        }
 
         // gRPC does not abstract TLS configuration so we need to check the implementation and act
         // accordingly.
         if (managedChannelBuilder.getClass().getName().equals("io.grpc.netty.NettyChannelBuilder")) {
             NettyChannelBuilder nettyBuilder = (NettyChannelBuilder) managedChannelBuilder;
-            nettyBuilder.sslContext(GrpcSslContexts.forClient().trustManager(tm).build());
+            nettyBuilder.sslContext(
+                    GrpcSslContexts.forClient().keyManager(kmf).trustManager(tmf).build());
         } else {
             throw new SSLException(
                     "TLS certificate configuration not supported for unrecognized ManagedChannelBuilder "
                             + managedChannelBuilder.getClass().getName());
         }
     }
 }
-
-class OtlpExporterSubstitutions {
-}