Skip to content

[server] fix otel dependencies #130

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

Merged
trett merged 1 commit into from
Dec 6, 2025
Merged

[server] fix otel dependencies #130

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
10 changes: 7 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions scripts/local-docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down