Fix setup

comet-ml · Sep 17, 2024 · 4c5b43f · 4c5b43f
1 parent e965f58
commit 4c5b43f
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 53 deletions.
diff --git a/apps/opik-backend/config.yml b/apps/opik-backend/config.yml
@@ -65,6 +65,3 @@ server:
   enableVirtualThreads: ${ENABLE_VIRTUAL_THREADS:-false}
   gzip:
     enabled: true
-
-openTelemetry:
-  disabled: ${OTEL_SDK_DISABLED:-true}
diff --git a/apps/opik-backend/entrypoint.sh b/apps/opik-backend/entrypoint.sh
@@ -5,10 +5,10 @@ echo $(pwd)
 jwebserver -d /opt/opik/redoc -b 0.0.0.0 -p 3003 &
 
 echo "OPIK_VERSION=$OPIK_VERSION"
-echo "OTEL_SDK_DISABLED=$OTEL_SDK_DISABLED"
+echo "OPIK_OTEL_SDK_ENABLED=$OPIK_OTEL_SDK_ENABLED"
 echo "OTEL_VERSION=$OTEL_VERSION"
 
-if [[ "${OTEL_SDK_DISABLED}" == "false" ]];then
+if [[ "${OPIK_OTEL_SDK_ENABLED}" == "true" ]];then
     curl -L -o /tmp/opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v${OTEL_VERSION}/opentelemetry-javaagent.jar
     JAVA_OPTS="$JAVA_OPTS -javaagent:/tmp/opentelemetry-javaagent.jar"
 fi

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/OpikApplication.java b/apps/opik-backend/src/main/java/com/comet/opik/OpikApplication.java
@@ -5,7 +5,6 @@
 import com.comet.opik.infrastructure.bundle.LiquibaseBundle;
 import com.comet.opik.infrastructure.db.DatabaseAnalyticsModule;
 import com.comet.opik.infrastructure.db.IdGeneratorModule;
-import com.comet.opik.infrastructure.instrumentation.OpenTelemetryModule;
 import com.comet.opik.infrastructure.redis.RedisModule;
 import com.comet.opik.utils.JsonBigDecimalDeserializer;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -59,7 +58,7 @@ public void initialize(Bootstrap<OpikConfiguration> bootstrap) {
         bootstrap.addBundle(GuiceBundle.builder()
                 .bundles(JdbiBundle.<OpikConfiguration>forDatabase((conf, env) -> conf.getDatabase())
                         .withPlugins(new SqlObjectPlugin(), new Jackson2Plugin()))
-                .modules(new DatabaseAnalyticsModule(), new IdGeneratorModule(), new AuthModule(), new RedisModule(), new OpenTelemetryModule())
+                .modules(new DatabaseAnalyticsModule(), new IdGeneratorModule(), new AuthModule(), new RedisModule())
                 .enableAutoConfig()
                 .build());
     }

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/SpanDAO.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/SpanDAO.java
@@ -748,7 +748,7 @@ public Mono<Void> deleteByTraceId(@NonNull UUID traceId, @NonNull Connection con
         return deleteByTraceIds(Set.of(traceId), connection);
     }
 
-    @Trace(dispatcher = true)
+    @WithSpan
     public Mono<Void> deleteByTraceIds(Set<UUID> traceIds, @NonNull Connection connection) {
         Preconditions.checkArgument(
                 CollectionUtils.isNotEmpty(traceIds), "Argument 'traceIds' must not be empty");

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/TraceDAO.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/TraceDAO.java
@@ -811,7 +811,7 @@ private String getOrDefault(JsonNode value) {
         return value != null ? value.toString() : "";
     }
 
-    @com.newrelic.api.agent.Trace(dispatcher = true)
+    @WithSpan
     public Flux<TraceCountResponse.WorkspaceTraceCount> countTracesPerWorkspace(Connection connection) {
 
         var statement = connection.createStatement(TRACE_COUNT_BY_WORKSPACE_ID);

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/TraceService.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/TraceService.java
@@ -291,7 +291,6 @@ public Mono<Void> delete(@NonNull UUID id) {
 
     @Override
     @WithSpan
-    @com.newrelic.api.agent.Trace(dispatcher = true)
     public Mono<Void> delete(Set<UUID> ids) {
         Preconditions.checkArgument(CollectionUtils.isNotEmpty(ids), "Argument 'ids' must not be empty");
         log.info("Deleting traces, count '{}'", ids.size());

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/infrastructure/OpenTelemetryConfig.java b/apps/opik-backend/src/main/java/com/comet/opik/infrastructure/OpenTelemetryConfig.java
diff --git a/apps/opik-backend/src/main/java/com/comet/opik/infrastructure/OpikConfiguration.java b/apps/opik-backend/src/main/java/com/comet/opik/infrastructure/OpikConfiguration.java
@@ -34,7 +34,4 @@ public class OpikConfiguration extends Configuration {
     @NotNull @JsonProperty
     private DistributedLockConfig distributedLock = new DistributedLockConfig();
 
-    @Valid
-    @NotNull @JsonProperty
-    private OpenTelemetryConfig openTelemetry = new OpenTelemetryConfig();
 }
diff --git a/...kend/src/main/java/com/comet/opik/infrastructure/instrumentation/OpenTelemetryModule.java b/...kend/src/main/java/com/comet/opik/infrastructure/instrumentation/OpenTelemetryModule.java
diff --git a/apps/opik-backend/src/test/resources/config-test.yml b/apps/opik-backend/src/test/resources/config-test.yml
@@ -65,6 +65,3 @@ server:
   enableVirtualThreads: ${ENABLE_VIRTUAL_THREADS:-false}
   gzip:
     enabled: true
-
-openTelemetry:
-  disabled: ${OTEL_SDK_DISABLED:-true}
diff --git a/deployment/docker-compose/docker-compose.yaml b/deployment/docker-compose/docker-compose.yaml
@@ -81,6 +81,10 @@ services:
         JAVA_OPTS: "-Dliquibase.propertySubstitutionEnabled=true"
         REDIS_URL: redis://:opik@redis:6379/
         ANALYTICS_DB_PASS: opik
+        OTEL_RESOURCE_ATTRIBUTES: "service.name=opik-backend,service.version=$OPIK_VERSION"
+        OTEL_TRACES_EXPORTER: otlp
+        OPIK_OTEL_SDK_ENABLED: false
+        OTEL_VERSION: 2.8.0
     ports:
       - "8080:8080"
       - "3003:3003"

diff --git a/deployment/helm_chart/opik/values.yaml b/deployment/helm_chart/opik/values.yaml
@@ -57,7 +57,7 @@ component:
       STATE_DB_PASS: opik
       OTEL_RESOURCE_ATTRIBUTES: "service.name=opik-backend,service.version=$OPIK_VERSION"
       OTEL_TRACES_EXPORTER: otlp
-      OTEL_SDK_DISABLED: true
+      OPIK_OTEL_SDK_ENABLED: false
       OTEL_VERSION: 2.8.0
     envFrom:
       - configMapRef: