Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update OpenTelemetry to 1.30.1 #19081

Merged
merged 1 commit into from
Sep 19, 2023
Merged

Update OpenTelemetry to 1.30.1 #19081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/trino-filesystem/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</dependency>

<dependency>
<groupId>io.opentelemetry</groupId>
<groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion lib/trino-filesystem/src/main/java/io/trino/filesystem/tracing/Tracing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Member Author

@ebyhr ebyhr Sep 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

io.opentelemetry.semconv.trace.attributes.SemanticAttributes is deprecated and caused build failure.

import io.opentelemetry.semconv.SemanticAttributes;

import java.util.Optional;

Expand Down
4 changes: 1 addition & 3 deletions plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DriverConnectionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.30.0 contains

Return default DbInfo when connection is null (open-telemetry/opentelemetry-java-instrumentation#9413)

checkState(connection != null, "Driver returned null connection, make sure the connection URL '%s' is valid for the driver %s", connectionUrl, driver);
return connection;
}
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading