Skip to content

Commit 1f4e437

Browse files
Updated CHANGELOG.md
# Conflicts: # exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java
1 parent c0a6159 commit 1f4e437

3 files changed

Lines changed: 11 additions & 7 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## Unreleased
44

5+
### SDK
6+
7+
#### Exporters
8+
9+
* OTLP: Fix OkHttp HTTP sender dropping client certificates when client TLS is configured without custom trusted certificates.
10+
511
## Version 1.63.0 (2026-06-05)
612

713
### API

exporters/common/src/main/java/io/opentelemetry/exporter/internal/TlsUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,8 @@ public static X509KeyManager keyManager(byte[] privateKeyPem, byte[] certificate
9595
throw new SSLException("Could not build KeyManagerFactory from clientKeysPem.", e);
9696
}
9797
}
98-
/**
99-
* Returns the platform default {@link X509TrustManager}.
100-
*/
98+
99+
/** Returns the platform default {@link X509TrustManager}. */
101100
public static X509TrustManager defaultTrustManager() throws SSLException {
102101
try {
103102
TrustManagerFactory tmf =
@@ -117,6 +116,7 @@ public static X509TrustManager defaultTrustManager() throws SSLException {
117116
throw new SSLException("Could not build default TrustManager.", e);
118117
}
119118
}
119+
120120
// Visible for testing
121121
static PrivateKey generatePrivateKey(PKCS8EncodedKeySpec keySpec, List<KeyFactory> keyFactories)
122122
throws SSLException {

exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import io.opentelemetry.api.impl.InstrumentationUtil;
99
import io.opentelemetry.exporter.internal.RetryUtil;
1010
import io.opentelemetry.exporter.internal.TlsUtil;
11-
import javax.net.ssl.SSLException;
1211
import io.opentelemetry.sdk.common.CompletableResultCode;
1312
import io.opentelemetry.sdk.common.export.Compressor;
1413
import io.opentelemetry.sdk.common.export.HttpResponse;
@@ -30,6 +29,7 @@
3029
import java.util.logging.Logger;
3130
import javax.annotation.Nullable;
3231
import javax.net.ssl.SSLContext;
32+
import javax.net.ssl.SSLException;
3333
import javax.net.ssl.X509TrustManager;
3434
import okhttp3.Call;
3535
import okhttp3.Callback;
@@ -120,9 +120,7 @@ public OkHttpHttpSender(
120120
throw new IllegalStateException("Unable to initialize default trust manager", e);
121121
}
122122
}
123-
builder.sslSocketFactory(
124-
sslContext.getSocketFactory(),
125-
effectiveTrustManager);
123+
builder.sslSocketFactory(sslContext.getSocketFactory(), effectiveTrustManager);
126124
}
127125

128126
this.client = builder.build();

0 commit comments

Comments
 (0)