Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,6 @@
<artifactId>ydb-sdk-query</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>tech.ydb</groupId>
<artifactId>ydb-sdk-opentelemetry</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>tech.ydb.test</groupId>
Expand Down
12 changes: 12 additions & 0 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@
<groupId>tech.ydb</groupId>
<artifactId>ydb-auth-api</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>${opentelemetry.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-context</artifactId>
<version>${opentelemetry.version}</version>
<optional>true</optional>
</dependency>

<!-- Netty is used only for special helper NettyChannelFactory -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tech.ydb.opentelemetry;
package tech.ydb.core.tracing;

import java.util.Objects;

Expand All @@ -11,10 +11,6 @@

import tech.ydb.core.Status;
import tech.ydb.core.UnexpectedResultException;
import tech.ydb.core.tracing.Scope;
import tech.ydb.core.tracing.Span;
import tech.ydb.core.tracing.SpanKind;
import tech.ydb.core.tracing.Tracer;

public final class OpenTelemetryTracer implements Tracer {
private static final String DEFAULT_SCOPE = "tech.ydb.sdk";
Expand Down
67 changes: 0 additions & 67 deletions opentelemetry/pom.xml

This file was deleted.

35 changes: 0 additions & 35 deletions opentelemetry/src/test/resources/log4j2.xml

This file was deleted.

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<module>scheme</module>
<module>topic</module>
<module>query</module>
<module>opentelemetry</module>
<module>coordination</module>
<module>export</module>
<module>tests/common</module>
Expand All @@ -44,6 +43,7 @@
<testcontainers.version>2.0.3</testcontainers.version>
<!-- last version with JDK8 compability -->
<apache.arrow.version>17.0.0</apache.arrow.version>
<opentelemetry.version>1.59.0</opentelemetry.version>
</properties>

<licenses>
Expand Down
12 changes: 12 additions & 0 deletions query/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
<version>${opentelemetry.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-testing</artifactId>
<version>${opentelemetry.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package tech.ydb.opentelemetry;
package tech.ydb.query.opentelemetry;

import java.time.Duration;
import java.util.HashSet;
Expand Down Expand Up @@ -31,6 +31,7 @@
import tech.ydb.core.StatusCode;
import tech.ydb.core.UnexpectedResultException;
import tech.ydb.core.grpc.GrpcTransport;
import tech.ydb.core.tracing.OpenTelemetryTracer;
import tech.ydb.query.QueryClient;
import tech.ydb.query.QuerySession;
import tech.ydb.query.QueryTransaction;
Expand Down
Loading