diff --git a/javaagent/Dockerfile b/javaagent/Dockerfile index 98dd8d66e..a2107c123 100644 --- a/javaagent/Dockerfile +++ b/javaagent/Dockerfile @@ -3,4 +3,4 @@ FROM eclipse-temurin:11-jre ADD build/libs/app.jar /app.jar ADD build/agent/opentelemetry-javaagent.jar /opentelemetry-javaagent.jar -ENTRYPOINT java -jar -javaagent:/opentelemetry-javaagent.jar /app.jar +ENTRYPOINT java -javaagent:/opentelemetry-javaagent.jar -jar /app.jar diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts index c6d2ce523..2454fa884 100644 --- a/javaagent/build.gradle.kts +++ b/javaagent/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { //spring modules implementation("org.springframework.boot:spring-boot-starter-web") - agent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.8.0") + agent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.9.0") } val copyAgent = tasks.register("copyAgent") { diff --git a/javaagent/docker-compose.yml b/javaagent/docker-compose.yml index 34a9019b1..1cb62874c 100644 --- a/javaagent/docker-compose.yml +++ b/javaagent/docker-compose.yml @@ -8,14 +8,14 @@ services: # Logs are disabled by default OTEL_LOGS_EXPORTER: "otlp" # Optional specify file configuration instead of using environment variable scheme - # To use, call "export OTEL_CONFIG_FILE=/sdk-config.yaml" before calling docker compose up - OTEL_CONFIG_FILE: + OTEL_EXPERIMENTAL_CONFIG_FILE: /sdk-config.yaml ports: - "8080:8080" volumes: - ./sdk-config.yaml:/sdk-config.yaml depends_on: - collector + collector: image: otel/opentelemetry-collector-contrib:0.111.0 volumes: diff --git a/javaagent/sdk-config.yaml b/javaagent/sdk-config.yaml index b20c816a4..ac6fa9b75 100644 --- a/javaagent/sdk-config.yaml +++ b/javaagent/sdk-config.yaml @@ -2,14 +2,15 @@ file_format: "0.1" resource: attributes: - service.name: agent-example-app + - name: service.name + value: agent-example-app logger_provider: processors: - batch: exporter: otlp: - endpoint: http://collector:4318 + endpoint: http://collector:4318/v1/logs protocol: http/protobuf tracer_provider: @@ -17,7 +18,7 @@ tracer_provider: - batch: exporter: otlp: - endpoint: http://collector:4318 + endpoint: http://collector:4318/v1/traces protocol: http/protobuf meter_provider: @@ -25,7 +26,7 @@ meter_provider: - periodic: exporter: otlp: - endpoint: http://collector:4318 + endpoint: http://collector:4318/v1/metrics protocol: http/protobuf # Example of how to use view to drop a metric which isn't needed. # This configuration is not available with the environment variable configuration scheme.