From 32a0838173cd9c1ada7eaf2f53c26227ccb7af51 Mon Sep 17 00:00:00 2001
From: Yuya Ebihara <ebyhry@gmail.com>
Date: Tue, 19 Sep 2023 10:35:38 +0900
Subject: [PATCH] Update OpenTelemetry to 1.30.1

This requires version up of dep.opentelemetry-instrumentation.version.
---
 lib/trino-filesystem/pom.xml                                  | 2 +-
 .../src/main/java/io/trino/filesystem/tracing/Tracing.java    | 2 +-
 .../java/io/trino/plugin/jdbc/DriverConnectionFactory.java    | 4 +---
 pom.xml                                                       | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/trino-filesystem/pom.xml b/lib/trino-filesystem/pom.xml
index b76593855e08b..d506953bd474e 100644
--- a/lib/trino-filesystem/pom.xml
+++ b/lib/trino-filesystem/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
 
         <dependency>
-            <groupId>io.opentelemetry</groupId>
+            <groupId>io.opentelemetry.semconv</groupId>
             <artifactId>opentelemetry-semconv</artifactId>
         </dependency>
 
diff --git a/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/Tracing.java b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/Tracing.java
index a205c52d65868..3c9237206a201 100644
--- a/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/Tracing.java
+++ b/lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/Tracing.java
@@ -17,7 +17,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.StatusCode;
-import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import io.opentelemetry.semconv.SemanticAttributes;
 
 import java.util.Optional;
 
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DriverConnectionFactory.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DriverConnectionFactory.java
index 2f9eee9ba4f25..4c6bcae53c869 100644
--- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DriverConnectionFactory.java
+++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DriverConnectionFactory.java
@@ -75,9 +75,7 @@ public Connection openConnection(ConnectorSession session)
             throws SQLException
     {
         Properties properties = getCredentialProperties(session.getIdentity());
-        // TODO: Telemetry is disabled due to NPE being thrown on null connection
-        // Connection connection = dataSource.getConnection(properties);
-        Connection connection = driver.connect(connectionUrl, properties);
+        Connection connection = dataSource.getConnection(properties);
         checkState(connection != null, "Driver returned null connection, make sure the connection URL '%s' is valid for the driver %s", connectionUrl, driver);
         return connection;
     }
diff --git a/pom.xml b/pom.xml
index 271c98b3c66aa..c2ba22c2dbe76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,8 +179,8 @@
         <dep.iceberg.version>1.3.1</dep.iceberg.version>
         <dep.protobuf.version>3.23.2</dep.protobuf.version>
         <dep.wire.version>4.5.0</dep.wire.version>
-        <dep.opentelemetry.version>1.29.0</dep.opentelemetry.version>
-        <dep.opentelemetry-instrumentation.version>1.29.0</dep.opentelemetry-instrumentation.version>
+        <dep.opentelemetry.version>1.30.1</dep.opentelemetry.version>
+        <dep.opentelemetry-instrumentation.version>1.30.0</dep.opentelemetry-instrumentation.version>
         <dep.netty.version>4.1.97.Final</dep.netty.version>
         <dep.jna.version>5.13.0</dep.jna.version>
         <dep.okio.version>3.3.0</dep.okio.version>