Skip to content

Commit 17c4623

Browse files
sureshbabu-areekarasureshbabu-areekara
committed
OSS Presto OTel Tracing changes
OSS Presto OTel Tracing changes
1 parent 81e31fe commit 17c4623

File tree

157 files changed

+5479
-2866
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+5479
-2866
lines changed

‎pom.xml

+24-10
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dep.slice.version>0.38</dep.slice.version>
5050
<dep.testing-mysql-server-5.version>0.6</dep.testing-mysql-server-5.version>
5151
<dep.aws-sdk.version>1.12.560</dep.aws-sdk.version>
52-
<dep.okhttp.version>3.9.0</dep.okhttp.version>
52+
<dep.okhttp.version>4.12.0</dep.okhttp.version>
5353
<dep.jdbi3.version>3.4.0</dep.jdbi3.version>
5454
<dep.oracle.version>19.3.0.0</dep.oracle.version>
5555
<dep.drift.version>1.40</dep.drift.version>
@@ -105,6 +105,9 @@
105105
<grpc.version>1.68.0</grpc.version>
106106

107107
<air.javadoc.lint>-missing</air.javadoc.lint>
108+
<opentelemetry.version>1.38.0</opentelemetry.version>
109+
<opentelemetry-alpha.version>1.38.0-alpha</opentelemetry-alpha.version>
110+
<kotlin-stdlib-jdk8.version>1.9.10</kotlin-stdlib-jdk8.version>
108111
</properties>
109112

110113
<modules>
@@ -2329,19 +2332,19 @@
23292332
<dependency>
23302333
<groupId>io.opentelemetry</groupId>
23312334
<artifactId>opentelemetry-api</artifactId>
2332-
<version>1.19.0</version>
2335+
<version>${opentelemetry.version}</version>
23332336
</dependency>
23342337

23352338
<dependency>
23362339
<groupId>io.opentelemetry</groupId>
23372340
<artifactId>opentelemetry-context</artifactId>
2338-
<version>1.19.0</version>
2341+
<version>${opentelemetry.version}</version>
23392342
</dependency>
23402343

23412344
<dependency>
23422345
<groupId>io.opentelemetry</groupId>
23432346
<artifactId>opentelemetry-exporter-otlp</artifactId>
2344-
<version>1.19.0</version>
2347+
<version>${opentelemetry.version}</version>
23452348
<exclusions>
23462349
<exclusion>
23472350
<groupId>com.squareup.okhttp3</groupId>
@@ -2353,31 +2356,37 @@
23532356
<dependency>
23542357
<groupId>io.opentelemetry</groupId>
23552358
<artifactId>opentelemetry-extension-trace-propagators</artifactId>
2356-
<version>1.19.0</version>
2359+
<version>${opentelemetry.version}</version>
23572360
</dependency>
23582361

23592362
<dependency>
23602363
<groupId>io.opentelemetry</groupId>
23612364
<artifactId>opentelemetry-sdk</artifactId>
2362-
<version>1.19.0</version>
2365+
<version>${opentelemetry.version}</version>
2366+
</dependency>
2367+
2368+
<dependency>
2369+
<groupId>io.opentelemetry</groupId>
2370+
<artifactId>opentelemetry-sdk-testing</artifactId>
2371+
<version>${opentelemetry.version}</version>
23632372
</dependency>
23642373

23652374
<dependency>
23662375
<groupId>io.opentelemetry</groupId>
23672376
<artifactId>opentelemetry-sdk-common</artifactId>
2368-
<version>1.19.0</version>
2377+
<version>${opentelemetry.version}</version>
23692378
</dependency>
23702379

23712380
<dependency>
23722381
<groupId>io.opentelemetry</groupId>
23732382
<artifactId>opentelemetry-sdk-trace</artifactId>
2374-
<version>1.19.0</version>
2383+
<version>${opentelemetry.version}</version>
23752384
</dependency>
23762385

23772386
<dependency>
23782387
<groupId>io.opentelemetry</groupId>
23792388
<artifactId>opentelemetry-semconv</artifactId>
2380-
<version>1.19.0-alpha</version>
2389+
<version>${opentelemetry-alpha.version}</version>
23812390
</dependency>
23822391

23832392
<dependency>
@@ -2475,7 +2484,12 @@
24752484
<artifactId>flight-core</artifactId>
24762485
<version>${dep.arrow.version}</version>
24772486
</dependency>
2478-
2487+
2488+
<dependency>
2489+
<groupId>org.jetbrains.kotlin</groupId>
2490+
<artifactId>kotlin-stdlib-jdk8</artifactId>
2491+
<version>${kotlin-stdlib-jdk8.version}</version>
2492+
</dependency>
24792493
</dependencies>
24802494
</dependencyManagement>
24812495

‎presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkDriverOptions.java

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ public ClientSession getClientSession()
9494
parseServer(server),
9595
user,
9696
"presto-benchmark",
97-
Optional.empty(),
9897
ImmutableSet.of(),
9998
null,
10099
catalog,

‎presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraConnector.java

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ public class TestCassandraConnector
8282
"user",
8383
new ConnectorIdentity("user", Optional.empty(), Optional.empty()),
8484
Optional.of("test"),
85-
Optional.empty(),
8685
UTC_KEY,
8786
ENGLISH,
8887
System.currentTimeMillis(),

‎presto-cli/src/main/java/com/facebook/presto/cli/ClientOptions.java

-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ public ClientSession toClientSession()
180180
parseServer(server),
181181
user,
182182
source,
183-
Optional.empty(),
184183
parseClientTags(clientTags),
185184
clientInfo,
186185
catalog,

‎presto-cli/src/test/java/com/facebook/presto/cli/AbstractCliTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ protected ClientSession createMockClientSession()
6868
server.url("/").uri(),
6969
"user",
7070
"source",
71-
Optional.empty(),
7271
ImmutableSet.of(),
7372
"clientInfo",
7473
"catalog",

‎presto-client/src/main/java/com/facebook/presto/client/ClientSession.java

-13
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Locale;
2525
import java.util.Map;
2626
import java.util.Map.Entry;
27-
import java.util.Optional;
2827
import java.util.Set;
2928

3029
import static com.google.common.base.MoreObjects.toStringHelper;
@@ -37,7 +36,6 @@ public class ClientSession
3736
private final URI server;
3837
private final String user;
3938
private final String source;
40-
private final Optional<String> traceToken;
4139
private final Set<String> clientTags;
4240
private final String clientInfo;
4341
private final String catalog;
@@ -72,7 +70,6 @@ public ClientSession(
7270
URI server,
7371
String user,
7472
String source,
75-
Optional<String> traceToken,
7673
Set<String> clientTags,
7774
String clientInfo,
7875
String catalog,
@@ -94,7 +91,6 @@ public ClientSession(
9491
this.server = requireNonNull(server, "server is null");
9592
this.user = user;
9693
this.source = source;
97-
this.traceToken = requireNonNull(traceToken, "traceToken is null");
9894
this.clientTags = ImmutableSet.copyOf(requireNonNull(clientTags, "clientTags is null"));
9995
this.clientInfo = clientInfo;
10096
this.catalog = catalog;
@@ -165,11 +161,6 @@ public String getSource()
165161
return source;
166162
}
167163

168-
public Optional<String> getTraceToken()
169-
{
170-
return traceToken;
171-
}
172-
173164
public Set<String> getClientTags()
174165
{
175166
return clientTags;
@@ -273,7 +264,6 @@ public String toString()
273264
.add("clientInfo", clientInfo)
274265
.add("catalog", catalog)
275266
.add("schema", schema)
276-
.add("traceToken", traceToken.orElse(null))
277267
.add("timeZone", timeZone)
278268
.add("locale", locale)
279269
.add("properties", properties)
@@ -287,7 +277,6 @@ public static final class Builder
287277
private URI server;
288278
private String user;
289279
private String source;
290-
private Optional<String> traceToken;
291280
private Set<String> clientTags;
292281
private String clientInfo;
293282
private String catalog;
@@ -312,7 +301,6 @@ private Builder(ClientSession clientSession)
312301
server = clientSession.getServer();
313302
user = clientSession.getUser();
314303
source = clientSession.getSource();
315-
traceToken = clientSession.getTraceToken();
316304
clientTags = clientSession.getClientTags();
317305
clientInfo = clientSession.getClientInfo();
318306
catalog = clientSession.getCatalog();
@@ -410,7 +398,6 @@ public ClientSession build()
410398
server,
411399
user,
412400
source,
413-
traceToken,
414401
clientTags,
415402
clientInfo,
416403
catalog,

‎presto-client/src/main/java/com/facebook/presto/client/OkHttpUtil.java

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package com.facebook.presto.client;
1515

1616
import com.facebook.airlift.security.pem.PemReader;
17+
import com.facebook.presto.client.okhttp3.internal.tls.LegacyHostnameVerifier;
1718
import com.google.common.base.CharMatcher;
1819
import com.google.common.net.HostAndPort;
1920
import okhttp3.Call;
@@ -237,6 +238,7 @@ public static void setupSsl(
237238
sslContext.init(keyManagers, new TrustManager[] {trustManager}, null);
238239

239240
clientBuilder.sslSocketFactory(sslContext.getSocketFactory(), trustManager);
241+
clientBuilder.hostnameVerifier(LegacyHostnameVerifier.INSTANCE);
240242
}
241243
catch (GeneralSecurityException | IOException e) {
242244
throw new ClientException("Error setting up SSL: " + e.getMessage(), e);

‎presto-client/src/main/java/com/facebook/presto/client/PrestoHeaders.java

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public final class PrestoHeaders
2121
public static final String PRESTO_SCHEMA = "X-Presto-Schema";
2222
public static final String PRESTO_TIME_ZONE = "X-Presto-Time-Zone";
2323
public static final String PRESTO_LANGUAGE = "X-Presto-Language";
24-
public static final String PRESTO_TRACE_TOKEN = "X-Presto-Trace-Token";
2524
public static final String PRESTO_SESSION = "X-Presto-Session";
2625
public static final String PRESTO_SET_CATALOG = "X-Presto-Set-Catalog";
2726
public static final String PRESTO_SET_SCHEMA = "X-Presto-Set-Schema";

‎presto-client/src/main/java/com/facebook/presto/client/StatementClientV1.java

-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
import static com.facebook.presto.client.PrestoHeaders.PRESTO_SOURCE;
7070
import static com.facebook.presto.client.PrestoHeaders.PRESTO_STARTED_TRANSACTION_ID;
7171
import static com.facebook.presto.client.PrestoHeaders.PRESTO_TIME_ZONE;
72-
import static com.facebook.presto.client.PrestoHeaders.PRESTO_TRACE_TOKEN;
7372
import static com.facebook.presto.client.PrestoHeaders.PRESTO_TRANSACTION_ID;
7473
import static com.facebook.presto.client.PrestoHeaders.PRESTO_USER;
7574
import static com.google.common.base.MoreObjects.firstNonNull;
@@ -163,8 +162,6 @@ private Request buildQueryRequest(ClientSession session, String query)
163162
builder.addHeader(PRESTO_SOURCE, session.getSource());
164163
}
165164

166-
session.getTraceToken().ifPresent(token -> builder.addHeader(PRESTO_TRACE_TOKEN, token));
167-
168165
if (session.getClientTags() != null && !session.getClientTags().isEmpty()) {
169166
builder.addHeader(PRESTO_CLIENT_TAGS, Joiner.on(",").join(session.getClientTags()));
170167
}

0 commit comments

Comments
 (0)