chore: bump Elastic agent distributions (open-telemetry#59)

* chore: bump Elastic otel-node to 0.3.0 * chore: bump Elastic Otel dotnet * chore: use latest Otel Java Agent
smith · Aug 29, 2024 · c5cfd5c · c5cfd5c
1 parent efc3186
commit c5cfd5c
Show file tree

Hide file tree

Showing 6 changed files with 618 additions and 305 deletions.
diff --git a/src/adservice/Dockerfile.elastic b/src/adservice/Dockerfile.elastic
@@ -16,13 +16,13 @@ RUN ./gradlew installDist -PprotoSourceDir=./proto
 
 FROM eclipse-temurin:21-jre
 
-ARG version=0.4.0
+# ARG version=0.4.0
 WORKDIR /usr/src/app/
 
 COPY --from=builder /usr/src/app/ ./
-ADD --chmod=644 https://repo1.maven.org/maven2/co/elastic/otel/elastic-otel-javaagent/$version/elastic-otel-javaagent-$version.jar /usr/src/app/opentelemetry-javaagent.jar
+ADD --chmod=644 https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=co.elastic.otel&a=elastic-otel-javaagent&v=LATEST /usr/src/app/opentelemetry-javaagent.jar
 ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar
-ENV ELASTIC_OTEL_INFERRED_SPANS_ENABLED=true
+ENV OTEL_INFERRED_SPANS_ENABLED=true
 ENV ELASTIC_OTEL_SPAN_STACK_TRACE_MIN_DURATION=2
 
 EXPOSE ${AD_SERVICE_PORT}

diff --git a/src/cartservice/src/Directory.Build.props b/src/cartservice/src/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="Elastic.OpenTelemetry" Version="1.0.0-alpha.3" />
+    <PackageReference Include="Elastic.OpenTelemetry" Version="1.0.0-alpha.4" />
   </ItemGroup>
 </Project>
diff --git a/src/frauddetectionservice/Dockerfile.elastic b/src/frauddetectionservice/Dockerfile.elastic
@@ -10,11 +10,11 @@ RUN gradle shadowJar
 
 FROM gcr.io/distroless/java17-debian11
 
-ARG version=0.4.0
+# ARG version=0.4.0
 WORKDIR /usr/src/app/
 
 COPY --from=builder /usr/src/app/build/libs/frauddetectionservice-1.0-all.jar ./
-ADD --chmod=644 https://repo1.maven.org/maven2/co/elastic/otel/elastic-otel-javaagent/$version/elastic-otel-javaagent-$version.jar /app/opentelemetry-javaagent.jar
+ADD --chmod=644 https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=co.elastic.otel&a=elastic-otel-javaagent&v=LATEST /app/opentelemetry-javaagent.jar
 ENV JAVA_TOOL_OPTIONS=-javaagent:/app/opentelemetry-javaagent.jar
 ENV ELASTIC_OTEL_INFERRED_SPANS_ENABLED=true
 ENV ELASTIC_OTEL_SPAN_STACK_TRACE_MIN_DURATION=2

diff --git a/src/kafka/Dockerfile.elastic b/src/kafka/Dockerfile.elastic
@@ -5,13 +5,13 @@
 FROM apache/kafka:3.7.0
 
 USER root
-ARG version=0.4.0
+# ARG version=0.4.0
 
 USER appuser
 
-ADD --chown=appuser:appuser https://repo1.maven.org/maven2/co/elastic/otel/elastic-otel-javaagent/$version/elastic-otel-javaagent-$version.jar /tmp/opentelemetry-javaagent.jar
+ADD --chown=appuser:appuser https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=co.elastic.otel&a=elastic-otel-javaagent&v=LATEST /tmp/opentelemetry-javaagent.jar
 
-ENV ELASTIC_OTEL_INFERRED_SPANS_ENABLED=true
+ENV OTEL_INFERRED_SPANS_ENABLED=true
 ENV ELASTIC_OTEL_SPAN_STACK_TRACE_MIN_DURATION=2
 ENV KAFKA_LISTENERS=PLAINTEXT://0.0.0.0:9092,CONTROLLER://0.0.0.0:9093
 ENV KAFKA_CONTROLLER_QUORUM_VOTERS='1@0.0.0.0:9093'