From 29518575b70b0629eb2f582cd4a75e4c8d4de375 Mon Sep 17 00:00:00 2001
From: trett <roman@trett.ru>
Date: Sat, 6 Dec 2025 19:13:11 +0100
Subject: [PATCH] [server] fix otel dependencies

---
 build.sbt                               | 10 +++++++---
 scripts/local-docker/docker-compose.yml |  4 +---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.sbt b/build.sbt
index 3279bda..41a8b4c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,7 +4,7 @@ import org.scalajs.linker.interface.ModuleSplitStyle
 
 import scala.sys.process.*
 
-lazy val projectVersion = "2.3.0"
+lazy val projectVersion = "2.3.1"
 lazy val organizationName = "ru.trett"
 lazy val scala3Version = "3.7.4"
 lazy val circeVersion = "0.14.15"
@@ -77,7 +77,8 @@ lazy val server = project
         dockerRepository := sys.env.get("REGISTRY"),
         dockerExposedPorts := Seq(8080),
         watchSources ++= (client / Compile / watchSources).value,
-        Compile / compile := ((Compile / compile) dependsOn (client / Compile / fastLinkJS)).value,
+        Compile / compile := ((Compile / compile).dependsOn(client / Compile / fastLinkJS)).value,
+        javaOptions += "-Dotel.java.global-autoconfigure.enabled=true",
         libraryDependencies ++= Seq(
             "org.typelevel" %% "cats-effect" % "3.6.3",
             "org.slf4j" % "slf4j-api" % "2.0.17",
@@ -101,8 +102,11 @@ lazy val server = project
             "org.typelevel" %% "otel4s-instrumentation-metrics"
         ).map(_ % otel4sVersion),
         libraryDependencies ++= Seq(
+            "org.typelevel" %% "otel4s-oteljava" % "0.14.0",
             "io.opentelemetry.instrumentation" % "opentelemetry-runtime-telemetry-java17" % "2.22.0-alpha",
-            "io.opentelemetry" % "opentelemetry-exporter-prometheus" % "1.45.0-alpha"
+            "io.opentelemetry" % "opentelemetry-exporter-prometheus" % "1.45.0-alpha",
+            "io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.56.0" % Runtime,
+            "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "1.56.0" % Runtime
         ),
         libraryDependencies ++= Seq(
             "io.circe" %%% "circe-core",
diff --git a/scripts/local-docker/docker-compose.yml b/scripts/local-docker/docker-compose.yml
index f88b924..1acd04d 100644
--- a/scripts/local-docker/docker-compose.yml
+++ b/scripts/local-docker/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       - host.docker.internal:host-gateway
 
   server:
-    image: server:2.3.0
+    image: server:2.3.1
     container_name: rss_server
     restart: always
     depends_on:
@@ -42,8 +42,6 @@ services:
       GOOGLE_API_KEY: ${GOOGLE_API_KEY}
       OTEL_EXPORTER_PROMETHEUS_PORT: 9464
       OTEL_METRICS_EXPORTER: prometheus
-      OTEL_TRACES_EXPORTER: none
-      OTEL_LOGS_EXPORTER: none
 
   prometheus:
     image: prom/prometheus:latest