diff --git a/bom/pom.xml b/bom/pom.xml
index 87f58caa7..2a362a192 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -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>
diff --git a/core/pom.xml b/core/pom.xml
index b02474da0..55e754200 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -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>
diff --git a/opentelemetry/src/main/java/tech/ydb/opentelemetry/OpenTelemetryTracer.java b/core/src/main/java/tech/ydb/core/tracing/OpenTelemetryTracer.java
similarity index 96%
rename from opentelemetry/src/main/java/tech/ydb/opentelemetry/OpenTelemetryTracer.java
rename to core/src/main/java/tech/ydb/core/tracing/OpenTelemetryTracer.java
index 373a98c3b..3c4b9c690 100644
--- a/opentelemetry/src/main/java/tech/ydb/opentelemetry/OpenTelemetryTracer.java
+++ b/core/src/main/java/tech/ydb/core/tracing/OpenTelemetryTracer.java
@@ -1,4 +1,4 @@
-package tech.ydb.opentelemetry;
+package tech.ydb.core.tracing;
 
 import java.util.Objects;
 
@@ -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";
diff --git a/opentelemetry/pom.xml b/opentelemetry/pom.xml
deleted file mode 100644
index a57e89472..000000000
--- a/opentelemetry/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>tech.ydb</groupId>
-        <artifactId>ydb-sdk-parent</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>ydb-sdk-opentelemetry</artifactId>
-    <name>OpenTelemetry Tracer</name>
-    <description>OpenTelemetry integration module for tracing and metrics in YDB SDK</description>
-
-    <properties>
-        <opentelemetry.version>1.59.0</opentelemetry.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>tech.ydb</groupId>
-            <artifactId>ydb-sdk-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-api</artifactId>
-            <version>${opentelemetry.version}</version>
-        </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>tech.ydb</groupId>
-            <artifactId>ydb-sdk-query</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>tech.ydb.test</groupId>
-            <artifactId>ydb-junit4-support</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j2-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/opentelemetry/src/test/resources/log4j2.xml b/opentelemetry/src/test/resources/log4j2.xml
deleted file mode 100644
index dae1cafa0..000000000
--- a/opentelemetry/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="[%level]\t%d{HH:mm:ss.SSS} [%t] %logger{36} - %msg%n"/>
-        </Console>
-    </Appenders>
-
-    <Loggers>
-        <Logger name="io.grpc" level="warn" additivity="false">
-            <AppenderRef ref="Console"/>
-        </Logger>
-        <Logger name="io.netty" level="warn" additivity="false">
-            <AppenderRef ref="Console"/>
-        </Logger>
-        <Logger name="tech.ydb" level="info" additivity="false">
-            <AppenderRef ref="Console"/>
-        </Logger>
-        <Logger name="tech.ydb.core.operation.OperationTray" level="warn" additivity="false">
-            <AppenderRef ref="Console"/>
-        </Logger>
-        <Logger name="tech.ydb.query" level="debug" additivity="false">
-            <AppenderRef ref="Console"/>
-        </Logger>
-
-        <!-- https://www.testcontainers.org/supported_docker_environment/logging_config/ -->
-        <Logger name="org.testcontainers" level="warn" />
-        <Logger name="com.github.dockerjava" level="warn"/>
-        <Logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="off"/>
-
-        <Root level="debug" >
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ebb757352..3ef8c961b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>
diff --git a/query/pom.xml b/query/pom.xml
index 66d2695ac..225a6f0ba 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -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>
diff --git a/opentelemetry/src/test/java/tech/ydb/opentelemetry/OpenTelemetryQueryTracingIntegrationTest.java b/query/src/test/java/tech/ydb/query/opentelemetry/OpenTelemetryQueryTracingIntegrationTest.java
similarity index 99%
rename from opentelemetry/src/test/java/tech/ydb/opentelemetry/OpenTelemetryQueryTracingIntegrationTest.java
rename to query/src/test/java/tech/ydb/query/opentelemetry/OpenTelemetryQueryTracingIntegrationTest.java
index 8daa59768..a134425aa 100644
--- a/opentelemetry/src/test/java/tech/ydb/opentelemetry/OpenTelemetryQueryTracingIntegrationTest.java
+++ b/query/src/test/java/tech/ydb/query/opentelemetry/OpenTelemetryQueryTracingIntegrationTest.java
@@ -1,4 +1,4 @@
-package tech.ydb.opentelemetry;
+package tech.ydb.query.opentelemetry;
 
 import java.time.Duration;
 import java.util.HashSet;
@@ -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;