configure exporter as extension

eclipse-edc · Mar 4, 2024 · 7d40f2a · 7d40f2a
1 parent b3602b3
commit 7d40f2a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/advanced/advanced-01-open-telemetry/docker-compose.yaml b/advanced/advanced-01-open-telemetry/docker-compose.yaml
@@ -15,7 +15,9 @@ services:
     environment:
       EDC_HOSTNAME: consumer
       OTEL_SERVICE_NAME: consumer
+      OTEL_JAVAAGENT_EXTENSIONS: /app/opentelemetry-exporter-jaeger.jar
       OTEL_TRACES_EXPORTER: jaeger
+      OTEL_LOGS_EXPORTER: none
       OTEL_EXPORTER_JAEGER_ENDPOINT: http://jaeger:14250
       OTEL_METRICS_EXPORTER: prometheus
       WEB_HTTP_PORT: 29191
@@ -54,6 +56,8 @@ services:
     environment:
       EDC_HOSTNAME: provider
       OTEL_SERVICE_NAME: provider
+      OTEL_LOGS_EXPORTER: none
+      OTEL_JAVAAGENT_EXTENSIONS: /app/opentelemetry-exporter-jaeger.jar
       OTEL_TRACES_EXPORTER: jaeger
       OTEL_EXPORTER_JAEGER_ENDPOINT: http://jaeger:14250
       WEB_HTTP_PORT: 19191

diff --git a/advanced/advanced-01-open-telemetry/open-telemetry-runtime/Dockerfile b/advanced/advanced-01-open-telemetry/open-telemetry-runtime/Dockerfile
@@ -8,4 +8,5 @@ FROM openjdk:17-slim
 
 WORKDIR /app
 COPY --from=build /home/gradle/project/advanced/advanced-01-open-telemetry/open-telemetry-runtime/build/libs/opentelemetry-javaagent-*.jar /app/opentelemetry-javaagent.jar
+COPY --from=build /home/gradle/project/advanced/advanced-01-open-telemetry/open-telemetry-runtime/build/libs/opentelemetry-exporter-jaeger-*.jar /app/opentelemetry-exporter-jaeger.jar
 COPY --from=build /home/gradle/project/advanced/advanced-01-open-telemetry/open-telemetry-runtime/build/libs/connector.jar /app/connector.jar
diff --git a/advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts b/advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts
@@ -40,7 +40,6 @@ dependencies {
 
     implementation(libs.edc.data.plane.selector.api)
     implementation(libs.edc.data.plane.selector.core)
-    implementation(libs.edc.data.plane.selector.client)
 
     implementation(libs.edc.data.plane.control.api)
     implementation(libs.edc.data.plane.public.api)
@@ -69,6 +68,7 @@ tasks.register("copyOpenTelemetryJar", Copy::class) {
 
     dependencies {
         openTelemetry(libs.opentelemetry.javaagent)
+        openTelemetry(libs.opentelemetry.exporter.jaeger)
     }
 
     from(openTelemetry)

diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/advanced/Advanced01openTelemetryTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/advanced/Advanced01openTelemetryTest.java
@@ -58,9 +58,6 @@ public class Advanced01openTelemetryTest {
     public static ComposeContainer environment =
             new ComposeContainer(getFileFromRelativePath(DOCKER_COMPOSE_YAML))
                     .withLocalCompose(true)
-                    .withLogConsumer("consumer", o -> {
-                        System.out.print(o.getUtf8String());
-                    })
                     .waitingFor("consumer", Wait.forLogMessage(".*ready.*", 1));
 
     @BeforeAll