From e7737a269b752a6e869ba703a5d47089808caccc Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Mon, 10 Feb 2025 05:37:09 +0100 Subject: [PATCH 1/8] Update google http client to 1.46.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a418a17b548..32a79c0c223e 100644 --- a/pom.xml +++ b/pom.xml @@ -196,7 +196,7 @@ v22.13.1 11.1.0 4.5.4 - 1.45.3 + 1.46.1 5.3.3 1.7.1 5.16.0 From 0113b2cab5321af9750b7a1deda83c9ca299a210 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Mon, 10 Feb 2025 05:37:42 +0100 Subject: [PATCH 2/8] Update oauth2 oidc to 1.22.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32a79c0c223e..aea1e3172ddd 100644 --- a/pom.xml +++ b/pom.xml @@ -564,7 +564,7 @@ com.nimbusds oauth2-oidc-sdk - 11.22 + 11.22.1 jdk11 From 27bd5df8b41cda1e4a3651a59fc0ecf2f858b418 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Mon, 10 Feb 2025 05:38:00 +0100 Subject: [PATCH 3/8] Update airlift to 303 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aea1e3172ddd..7c5e4d24c8d8 100644 --- a/pom.xml +++ b/pom.xml @@ -182,7 +182,7 @@ ${air.test.jvm.additional-arguments.default} - 302 + 303 2.9.6 4.13.2 1.12.0 From 7ce314370162e90d34f3d0be48897c3d2ca1d70b Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Mon, 10 Feb 2025 05:43:44 +0100 Subject: [PATCH 4/8] Update AWS SDK v2 to 2.30.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c5e4d24c8d8..a9bde3b395b0 100644 --- a/pom.xml +++ b/pom.xml @@ -309,7 +309,7 @@ software.amazon.awssdk bom - 2.30.15 + 2.30.16 pom import From c69cd828a0121962cb5e2456340c6bded398ec92 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Mon, 10 Feb 2025 05:44:42 +0100 Subject: [PATCH 5/8] Update hudi to 1.0.1 --- plugin/trino-hudi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/trino-hudi/pom.xml b/plugin/trino-hudi/pom.xml index ae435bff6742..2a17dd97e11b 100644 --- a/plugin/trino-hudi/pom.xml +++ b/plugin/trino-hudi/pom.xml @@ -15,7 +15,7 @@ true - 1.0.0 + 1.0.1 From 1ad59c4cc1bdaf82b05a407c953bf6c59af7829d Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Mon, 10 Feb 2025 05:49:19 +0100 Subject: [PATCH 6/8] Update airbase to 216 --- core/trino-spi/pom.xml | 6 ++++++ plugin/trino-bigquery/pom.xml | 6 ++++++ plugin/trino-cassandra/pom.xml | 6 ++++++ plugin/trino-clickhouse/pom.xml | 6 ++++++ plugin/trino-delta-lake/pom.xml | 6 ++++++ plugin/trino-druid/pom.xml | 6 ++++++ plugin/trino-duckdb/pom.xml | 5 +++++ plugin/trino-example-jdbc/pom.xml | 6 ++++++ plugin/trino-exasol/pom.xml | 6 +++++- plugin/trino-exchange-filesystem/pom.xml | 6 ++++++ plugin/trino-exchange-hdfs/pom.xml | 6 ++++++ plugin/trino-hive/pom.xml | 6 ++++++ .../metastore/thrift/HttpThriftMetastoreClientFactory.java | 4 ++-- plugin/trino-hudi/pom.xml | 6 ++++++ plugin/trino-iceberg/pom.xml | 6 ++++++ plugin/trino-ignite/pom.xml | 6 ++++++ plugin/trino-kafka-event-listener/pom.xml | 6 ++++++ plugin/trino-mariadb/pom.xml | 6 ++++++ plugin/trino-mongodb/pom.xml | 6 ++++++ plugin/trino-mysql/pom.xml | 6 ++++++ plugin/trino-oracle/pom.xml | 6 ++++++ plugin/trino-phoenix5/pom.xml | 6 ++++++ plugin/trino-postgresql/pom.xml | 6 ++++++ plugin/trino-redshift/pom.xml | 6 ++++++ plugin/trino-singlestore/pom.xml | 6 ++++++ plugin/trino-snowflake/pom.xml | 6 ++++++ plugin/trino-spooling-filesystem/pom.xml | 6 ++++++ plugin/trino-sqlserver/pom.xml | 6 ++++++ plugin/trino-vertica/pom.xml | 6 ++++++ pom.xml | 2 +- 30 files changed, 169 insertions(+), 4 deletions(-) diff --git a/core/trino-spi/pom.xml b/core/trino-spi/pom.xml index c743fda6b90d..09f158f24265 100644 --- a/core/trino-spi/pom.xml +++ b/core/trino-spi/pom.xml @@ -46,6 +46,12 @@ true + + io.opentelemetry + opentelemetry-api-incubator + runtime + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-bigquery/pom.xml b/plugin/trino-bigquery/pom.xml index 07d3845181f3..1c7c428a5f39 100644 --- a/plugin/trino-bigquery/pom.xml +++ b/plugin/trino-bigquery/pom.xml @@ -351,6 +351,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-cassandra/pom.xml b/plugin/trino-cassandra/pom.xml index e0f5338b24a5..2f3c49513ee3 100644 --- a/plugin/trino-cassandra/pom.xml +++ b/plugin/trino-cassandra/pom.xml @@ -136,6 +136,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-clickhouse/pom.xml b/plugin/trino-clickhouse/pom.xml index d578ff7230f9..a86e58e963c9 100644 --- a/plugin/trino-clickhouse/pom.xml +++ b/plugin/trino-clickhouse/pom.xml @@ -77,6 +77,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-delta-lake/pom.xml b/plugin/trino-delta-lake/pom.xml index 5d2fe0d7cd8a..0ab4fb8c3df9 100644 --- a/plugin/trino-delta-lake/pom.xml +++ b/plugin/trino-delta-lake/pom.xml @@ -225,6 +225,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-druid/pom.xml b/plugin/trino-druid/pom.xml index fbaea6df7227..ae207f341602 100644 --- a/plugin/trino-druid/pom.xml +++ b/plugin/trino-druid/pom.xml @@ -60,6 +60,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-duckdb/pom.xml b/plugin/trino-duckdb/pom.xml index b0c4ba9f904f..465619999272 100644 --- a/plugin/trino-duckdb/pom.xml +++ b/plugin/trino-duckdb/pom.xml @@ -69,7 +69,12 @@ io.opentelemetry + opentelemetry-api-incubator + provided + + + io.opentelemetry opentelemetry-context provided diff --git a/plugin/trino-example-jdbc/pom.xml b/plugin/trino-example-jdbc/pom.xml index 72f5d1f7a381..c6912d86ecf1 100644 --- a/plugin/trino-example-jdbc/pom.xml +++ b/plugin/trino-example-jdbc/pom.xml @@ -51,6 +51,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-exasol/pom.xml b/plugin/trino-exasol/pom.xml index f80b2b679411..093e9bd3102f 100644 --- a/plugin/trino-exasol/pom.xml +++ b/plugin/trino-exasol/pom.xml @@ -18,7 +18,6 @@ - com.exasol exasol-jdbc @@ -69,7 +68,12 @@ io.opentelemetry + opentelemetry-api-incubator + provided + + + io.opentelemetry opentelemetry-context provided diff --git a/plugin/trino-exchange-filesystem/pom.xml b/plugin/trino-exchange-filesystem/pom.xml index 10710a5ba68f..9c7cf2ef2ab5 100644 --- a/plugin/trino-exchange-filesystem/pom.xml +++ b/plugin/trino-exchange-filesystem/pom.xml @@ -309,6 +309,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-exchange-hdfs/pom.xml b/plugin/trino-exchange-hdfs/pom.xml index 69d9269732f6..989a9cfb5cfe 100644 --- a/plugin/trino-exchange-hdfs/pom.xml +++ b/plugin/trino-exchange-hdfs/pom.xml @@ -91,6 +91,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-hive/pom.xml b/plugin/trino-hive/pom.xml index 361542ba541f..8b5a05da511e 100644 --- a/plugin/trino-hive/pom.xml +++ b/plugin/trino-hive/pom.xml @@ -314,6 +314,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/HttpThriftMetastoreClientFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/HttpThriftMetastoreClientFactory.java index ddd696fa9d54..e31559709fda 100644 --- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/HttpThriftMetastoreClientFactory.java +++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/HttpThriftMetastoreClientFactory.java @@ -17,7 +17,7 @@ import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.apachehttpclient.v5_2.ApacheHttpClient5Telemetry; +import io.opentelemetry.instrumentation.apachehttpclient.v5_2.ApacheHttpClientTelemetry; import io.trino.spi.NodeManager; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; @@ -94,7 +94,7 @@ public ThriftMetastoreClient create(URI uri, Optional delegationToken) private TTransport createHttpTransport(URI uri) throws TTransportException { - HttpClientBuilder httpClientBuilder = ApacheHttpClient5Telemetry.builder(openTelemetry).build().newHttpClientBuilder(); + HttpClientBuilder httpClientBuilder = ApacheHttpClientTelemetry.builder(openTelemetry).build().newHttpClientBuilder(); if ("https".equals(uri.getScheme().toLowerCase(ENGLISH))) { checkArgument(token.isPresent(), "'hive.metastore.http.client.bearer-token' must be set while using https metastore URIs in 'hive.metastore.uri'"); checkArgument(authenticationMode.isPresent(), "'hive.metastore.http.client.authentication.type' must be set while using http/https metastore URIs in 'hive.metastore.uri'"); diff --git a/plugin/trino-hudi/pom.xml b/plugin/trino-hudi/pom.xml index 2a17dd97e11b..ecb2d0b769ac 100644 --- a/plugin/trino-hudi/pom.xml +++ b/plugin/trino-hudi/pom.xml @@ -148,6 +148,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-iceberg/pom.xml b/plugin/trino-iceberg/pom.xml index 7207a8af07b1..ae17fb08ba38 100644 --- a/plugin/trino-iceberg/pom.xml +++ b/plugin/trino-iceberg/pom.xml @@ -315,6 +315,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-ignite/pom.xml b/plugin/trino-ignite/pom.xml index 93297f9e69fc..090f08e021aa 100644 --- a/plugin/trino-ignite/pom.xml +++ b/plugin/trino-ignite/pom.xml @@ -83,6 +83,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-kafka-event-listener/pom.xml b/plugin/trino-kafka-event-listener/pom.xml index a1300cf52756..abc1b889ded3 100644 --- a/plugin/trino-kafka-event-listener/pom.xml +++ b/plugin/trino-kafka-event-listener/pom.xml @@ -131,6 +131,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-mariadb/pom.xml b/plugin/trino-mariadb/pom.xml index 1d040776e57c..cf7e9701fe8d 100644 --- a/plugin/trino-mariadb/pom.xml +++ b/plugin/trino-mariadb/pom.xml @@ -77,6 +77,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-mongodb/pom.xml b/plugin/trino-mongodb/pom.xml index dc9f93dfe41b..293cf1afb55a 100644 --- a/plugin/trino-mongodb/pom.xml +++ b/plugin/trino-mongodb/pom.xml @@ -114,6 +114,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-mysql/pom.xml b/plugin/trino-mysql/pom.xml index d94504d2aea8..22b62b09786c 100644 --- a/plugin/trino-mysql/pom.xml +++ b/plugin/trino-mysql/pom.xml @@ -87,6 +87,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-oracle/pom.xml b/plugin/trino-oracle/pom.xml index e8c6a8ff0e5a..4787c073bb69 100644 --- a/plugin/trino-oracle/pom.xml +++ b/plugin/trino-oracle/pom.xml @@ -87,6 +87,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-phoenix5/pom.xml b/plugin/trino-phoenix5/pom.xml index 8d15336db712..a742c2e08bb4 100644 --- a/plugin/trino-phoenix5/pom.xml +++ b/plugin/trino-phoenix5/pom.xml @@ -118,6 +118,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-postgresql/pom.xml b/plugin/trino-postgresql/pom.xml index 638c02bdec75..ec97affa8926 100644 --- a/plugin/trino-postgresql/pom.xml +++ b/plugin/trino-postgresql/pom.xml @@ -92,6 +92,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-redshift/pom.xml b/plugin/trino-redshift/pom.xml index 3555935aa700..fb85246c3ca1 100644 --- a/plugin/trino-redshift/pom.xml +++ b/plugin/trino-redshift/pom.xml @@ -133,6 +133,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-singlestore/pom.xml b/plugin/trino-singlestore/pom.xml index ba668677547d..b6eb017ceda1 100644 --- a/plugin/trino-singlestore/pom.xml +++ b/plugin/trino-singlestore/pom.xml @@ -73,6 +73,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-snowflake/pom.xml b/plugin/trino-snowflake/pom.xml index b2cbe794fa26..be32c502d7ac 100644 --- a/plugin/trino-snowflake/pom.xml +++ b/plugin/trino-snowflake/pom.xml @@ -68,6 +68,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-spooling-filesystem/pom.xml b/plugin/trino-spooling-filesystem/pom.xml index 31088ca0e43a..6ebf17ff71ea 100644 --- a/plugin/trino-spooling-filesystem/pom.xml +++ b/plugin/trino-spooling-filesystem/pom.xml @@ -115,6 +115,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-sqlserver/pom.xml b/plugin/trino-sqlserver/pom.xml index 6c515c5b30e1..c17bcf1cb0e1 100644 --- a/plugin/trino-sqlserver/pom.xml +++ b/plugin/trino-sqlserver/pom.xml @@ -87,6 +87,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/plugin/trino-vertica/pom.xml b/plugin/trino-vertica/pom.xml index 95412867f633..a6abbd074f6b 100644 --- a/plugin/trino-vertica/pom.xml +++ b/plugin/trino-vertica/pom.xml @@ -94,6 +94,12 @@ provided + + io.opentelemetry + opentelemetry-api-incubator + provided + + io.opentelemetry opentelemetry-context diff --git a/pom.xml b/pom.xml index a9bde3b395b0..0aa5e8c00653 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.airlift airbase - 215 + 216 io.trino From dcdecfe5171826f5b40c950b43b9297462304b3c Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Mon, 10 Feb 2025 07:35:58 +0100 Subject: [PATCH 7/8] Use anonymous variables --- .../metastore/thrift/HttpThriftMetastoreClientFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/HttpThriftMetastoreClientFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/HttpThriftMetastoreClientFactory.java index e31559709fda..f0de3643f431 100644 --- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/HttpThriftMetastoreClientFactory.java +++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/HttpThriftMetastoreClientFactory.java @@ -109,12 +109,12 @@ private TTransport createHttpTransport(URI uri) .register("https", socketFactory) .build(); httpClientBuilder.setConnectionManager(new BasicHttpClientConnectionManager(registry)); - httpClientBuilder.addRequestInterceptorFirst((httpRequest, entityDetails, httpContext) -> httpRequest.addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + token.get())); + httpClientBuilder.addRequestInterceptorFirst((httpRequest, _, _) -> httpRequest.addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + token.get())); } else { checkArgument(token.isEmpty(), "'hive.metastore.http.client.bearer-token' must not be set while using http metastore URIs in 'hive.metastore.uri'"); } - httpClientBuilder.addRequestInterceptorFirst((httpRequest, entityDetails, httpContext) -> additionalHeaders.forEach(httpRequest::addHeader)); + httpClientBuilder.addRequestInterceptorFirst((httpRequest, _, _) -> additionalHeaders.forEach(httpRequest::addHeader)); httpClientBuilder.setDefaultRequestConfig(RequestConfig.custom().setResponseTimeout(readTimeoutMillis, TimeUnit.MILLISECONDS).build()); return new THttpClient(uri.toString(), httpClientBuilder.build()); } From e25b65160a44330366aad1b417ca18bb044ccee6 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Mon, 10 Feb 2025 07:38:57 +0100 Subject: [PATCH 8/8] Replace deprecated API usage --- .../thrift/HttpThriftMetastoreClientFactory.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/HttpThriftMetastoreClientFactory.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/HttpThriftMetastoreClientFactory.java index f0de3643f431..dbdc0590481d 100644 --- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/HttpThriftMetastoreClientFactory.java +++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/HttpThriftMetastoreClientFactory.java @@ -22,11 +22,11 @@ import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager; -import org.apache.hc.client5.http.socket.ConnectionSocketFactory; +import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy; import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier; -import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; +import org.apache.hc.client5.http.ssl.TlsSocketStrategy; import org.apache.hc.core5.http.HttpHeaders; -import org.apache.hc.core5.http.config.Registry; +import org.apache.hc.core5.http.config.Lookup; import org.apache.hc.core5.http.config.RegistryBuilder; import org.apache.thrift.transport.THttpClient; import org.apache.thrift.transport.TTransport; @@ -98,17 +98,15 @@ private TTransport createHttpTransport(URI uri) if ("https".equals(uri.getScheme().toLowerCase(ENGLISH))) { checkArgument(token.isPresent(), "'hive.metastore.http.client.bearer-token' must be set while using https metastore URIs in 'hive.metastore.uri'"); checkArgument(authenticationMode.isPresent(), "'hive.metastore.http.client.authentication.type' must be set while using http/https metastore URIs in 'hive.metastore.uri'"); - SSLConnectionSocketFactory socketFactory; + TlsSocketStrategy tlsStrategy; try { - socketFactory = new SSLConnectionSocketFactory(SSLContext.getDefault(), new DefaultHostnameVerifier()); + tlsStrategy = new DefaultClientTlsStrategy(SSLContext.getDefault(), new DefaultHostnameVerifier()); } catch (NoSuchAlgorithmException e) { throw new TTransportException(e); } - Registry registry = RegistryBuilder.create() - .register("https", socketFactory) - .build(); - httpClientBuilder.setConnectionManager(new BasicHttpClientConnectionManager(registry)); + Lookup registry = RegistryBuilder.create().register("https", tlsStrategy).build(); + httpClientBuilder.setConnectionManager(BasicHttpClientConnectionManager.create(registry)); httpClientBuilder.addRequestInterceptorFirst((httpRequest, _, _) -> httpRequest.addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + token.get())); } else {