diff --git a/fleet/reporting/api/BUILD.bazel b/fleet/reporting/api/BUILD.bazel
index bc9570f2e56d..1f11d439a0ad 100644
--- a/fleet/reporting/api/BUILD.bazel
+++ b/fleet/reporting/api/BUILD.bazel
@@ -13,13 +13,11 @@ jvm_library(
name = "api",
module_name = "fleet.reporting.api",
visibility = ["//visibility:public"],
- srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java", "srcCommonMain/**/*.form", "srcJvmMain/**/*.kt", "srcJvmMain/**/*.java", "srcJvmMain/**/*.form"], allow_empty = True, exclude = ["**/module-info.java"]),
+ srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java", "srcCommonMain/**/*.form"], allow_empty = True, exclude = ["**/module-info.java"]),
kotlinc_opts = ":custom_api",
deps = [
"@lib//:kotlin-stdlib",
"@lib//:kotlinx-coroutines-core",
- "@lib//:opentelemetry",
- "@lib//:opentelemetry-semconv",
]
)
### auto-generated section `build fleet.reporting.api` end
\ No newline at end of file
diff --git a/fleet/reporting/api/fleet.reporting.api.iml b/fleet/reporting/api/fleet.reporting.api.iml
index c3576d14081a..3eb85d3bee7e 100644
--- a/fleet/reporting/api/fleet.reporting.api.iml
+++ b/fleet/reporting/api/fleet.reporting.api.iml
@@ -20,14 +20,11 @@
-
-
-
\ No newline at end of file
diff --git a/fleet/reporting/api/gradlebuild/build.gradle.kts b/fleet/reporting/api/gradlebuild/build.gradle.kts
index 642a059da01d..6243e1883033 100644
--- a/fleet/reporting/api/gradlebuild/build.gradle.kts
+++ b/fleet/reporting/api/gradlebuild/build.gradle.kts
@@ -58,8 +58,6 @@ kotlin {
implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) {
isTransitive = false
}
- implementation(jps.io.opentelemetry.opentelemetry.sdk966255575.get())
- implementation(jps.io.opentelemetry.semconv.opentelemetry.semconv489456914.get())
}
// KOTLIN__MARKER_END
}
\ No newline at end of file
diff --git a/fleet/reporting/api/srcJvmMain/fleet/tracing/OpenTelemetry.kt b/fleet/reporting/api/srcJvmMain/fleet/tracing/OpenTelemetry.kt
deleted file mode 100644
index fdeb921e3412..000000000000
--- a/fleet/reporting/api/srcJvmMain/fleet/tracing/OpenTelemetry.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package fleet.tracing
-
-import io.opentelemetry.api.GlobalOpenTelemetry
-import io.opentelemetry.api.OpenTelemetry
-import io.opentelemetry.api.metrics.Meter
-import io.opentelemetry.api.trace.Tracer
-
-private const val FLEET_INSTRUMENTER_NAME = "fleet"
-
-//this is a single instance that they recommend to use in OTel docs
-private val opentelemetry: OpenTelemetry by lazy { GlobalOpenTelemetry.get() }
-
-val tracer: Tracer
- get() = opentelemetry.getTracer(FLEET_INSTRUMENTER_NAME)
-
-val meter: Meter
- get() = opentelemetry.getMeter(FLEET_INSTRUMENTER_NAME)
-
-//@fleet.kernel.plugins.InternalInPluginModules(where = ["fleet.reporting.opentelemetry"])
-const val CANCELLED_SPAN_ATTR = "Cancelled"
diff --git a/fleet/reporting/api/srcJvmMain/fleet/tracing/TracingCoroutineElement.kt b/fleet/reporting/api/srcJvmMain/fleet/tracing/TracingCoroutineElement.kt
deleted file mode 100644
index 1db190112eb8..000000000000
--- a/fleet/reporting/api/srcJvmMain/fleet/tracing/TracingCoroutineElement.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package fleet.tracing
-
-import io.opentelemetry.api.trace.Span
-import io.opentelemetry.context.Context
-import io.opentelemetry.context.Scope
-import kotlinx.coroutines.ThreadContextElement
-import kotlin.coroutines.AbstractCoroutineContextElement
-import kotlin.coroutines.CoroutineContext
-
-class TracingCoroutineElement(private val otelContext: Context) : ThreadContextElement, AbstractCoroutineContextElement(
- TracingCoroutineElement) {
- companion object Key : CoroutineContext.Key
-
- override fun restoreThreadContext(context: CoroutineContext, oldState: Scope) {
- oldState.close()
- }
-
- override fun updateThreadContext(context: CoroutineContext): Scope {
- return otelContext.makeCurrent()
- }
-}
-
-fun Span.asContextElement(): CoroutineContext.Element {
- return TracingCoroutineElement(Context.current().with(this))
-}
\ No newline at end of file
diff --git a/fleet/reporting/api/srcJvmMain/fleet/tracing/runtime/AttributeKeys.kt b/fleet/reporting/api/srcJvmMain/fleet/tracing/runtime/AttributeKeys.kt
deleted file mode 100644
index 362e8c136cb6..000000000000
--- a/fleet/reporting/api/srcJvmMain/fleet/tracing/runtime/AttributeKeys.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-@file:JvmName("SpanKt")
-@file:JvmMultifileClass
-
-package fleet.tracing.runtime
-
-import io.opentelemetry.api.common.AttributeKey
-import kotlin.jvm.JvmMultifileClass
-import kotlin.jvm.JvmName
-
-//@fleet.kernel.plugins.InternalInPluginModules(where = ["fleet.reporting.opentelemetry"])
-val THREAD_ID_KEY: AttributeKey = AttributeKey.longKey("threadId")
-
diff --git a/fleet/rpc.server/BUILD.bazel b/fleet/rpc.server/BUILD.bazel
index d0797e9565aa..c726efa3ed42 100644
--- a/fleet/rpc.server/BUILD.bazel
+++ b/fleet/rpc.server/BUILD.bazel
@@ -25,8 +25,6 @@ jvm_library(
"//fleet/reporting/shared",
"//fleet/multiplatform.shims",
"//fleet/util/core",
- "@lib//:opentelemetry",
- "@lib//:opentelemetry-semconv",
]
)
### auto-generated section `build fleet.rpc.server` end
\ No newline at end of file
diff --git a/fleet/rpc.server/fleet.rpc.server.iml b/fleet/rpc.server/fleet.rpc.server.iml
index 1515fd1877a4..de1c1efdb685 100644
--- a/fleet/rpc.server/fleet.rpc.server.iml
+++ b/fleet/rpc.server/fleet.rpc.server.iml
@@ -34,7 +34,5 @@
-
-
\ No newline at end of file
diff --git a/fleet/rpc.server/gradlebuild/build.gradle.kts b/fleet/rpc.server/gradlebuild/build.gradle.kts
index c814eaaf3195..1e804f4ff934 100644
--- a/fleet/rpc.server/gradlebuild/build.gradle.kts
+++ b/fleet/rpc.server/gradlebuild/build.gradle.kts
@@ -63,8 +63,6 @@ kotlin {
implementation(jps.org.jetbrains.kotlinx.kotlinx.serialization.json.jvm231489733.get().let { "${it.group}:kotlinx-serialization-json:${it.version}" }) {
isTransitive = false
}
- implementation(jps.io.opentelemetry.opentelemetry.sdk966255575.get())
- implementation(jps.io.opentelemetry.semconv.opentelemetry.semconv489456914.get())
implementation(project(":fleet.rpc"))
implementation(project(":fleet.reporting.api"))
implementation(project(":fleet.reporting.shared"))