Merge pull request #35870 from geoand/#35866

Use default Vert.x client settings in OTel exporters
quarkusio · Sep 12, 2023 · 583ef4a · 583ef4a
2 parents 983f283 + ec7d2a4
commit 583ef4a
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/...ry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OtlpRecorder.java b/...ry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OtlpRecorder.java
@@ -219,8 +219,12 @@ private void configureTLS(HttpClientOptions options) {
         }
 
         private KeyCertOptions toPemKeyCertOptions() {
-            PemKeyCertOptions pemKeyCertOptions = new PemKeyCertOptions();
             OtlpExporterTracesConfig.KeyCert keyCert = tracesConfig.keyCert();
+            if (keyCert.certs().isEmpty() && keyCert.keys().isEmpty()) {
+                return null;
+            }
+
+            PemKeyCertOptions pemKeyCertOptions = new PemKeyCertOptions();
             if (keyCert.certs().isPresent()) {
                 for (String cert : keyCert.certs().get()) {
                     pemKeyCertOptions.addCertPath(cert);
@@ -235,14 +239,18 @@ private KeyCertOptions toPemKeyCertOptions() {
         }
 
         private PemTrustOptions toPemTrustOptions() {
-            PemTrustOptions pemTrustOptions = new PemTrustOptions();
             OtlpExporterTracesConfig.TrustCert trustCert = tracesConfig.trustCert();
             if (trustCert.certs().isPresent()) {
-                for (String cert : trustCert.certs().get()) {
-                    pemTrustOptions.addCertPath(cert);
+                List<String> certs = trustCert.certs().get();
+                if (!certs.isEmpty()) {
+                    PemTrustOptions pemTrustOptions = new PemTrustOptions();
+                    for (String cert : trustCert.certs().get()) {
+                        pemTrustOptions.addCertPath(cert);
+                    }
+                    return pemTrustOptions;
                 }
             }
-            return pemTrustOptions;
+            return null;
         }
     }
 }