Enable auto-instrumentation

nais · Feb 26, 2024 · 099b2a0 · 099b2a0
1 parent 652975b
commit 099b2a0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/sentiment-api/.nais/nais.yaml b/sentiment-api/.nais/nais.yaml
@@ -12,8 +12,9 @@ spec:
   image: {{image}}
   port: 8080
   observability:
-    tracing:
+    autoInstrumentation:
       enabled: true
+      runtime: "java"
   env:
     - name: SPRING_PROFILES_ACTIVE
       value: nais

diff --git a/sentiment-api/Dockerfile b/sentiment-api/Dockerfile
@@ -18,8 +18,8 @@ ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/release
 
 # Final image
 FROM gcr.io/distroless/java17:nonroot
-COPY --from=javaagent --chown=nonroot:nonroot /instrumentations/java/javaagent.jar /app/javaagent.jar
+#COPY --from=javaagent --chown=nonroot:nonroot /instrumentations/java/javaagent.jar /app/javaagent.jar
 COPY --from=build --chown=nonroot:nonroot /home/gradle/src/build/libs/sentiment-api-*.jar /app/sentiment-api.jar
 WORKDIR /app
 # TLS Config works around an issue in OpenJDK... See: https://github.com/kubernetes-client/java/issues/854
-ENTRYPOINT [ "java", "-javaagent:/app/javaagent.jar", "-Djdk.tls.client.protocols=TLSv1.2", "-jar", "/app/sentiment-api.jar" ]
+ENTRYPOINT [ "java", "-Djdk.tls.client.protocols=TLSv1.2", "-jar", "/app/sentiment-api.jar" ]
diff --git a/shop-backend/.nais/nais.yaml b/shop-backend/.nais/nais.yaml
@@ -12,8 +12,9 @@ spec:
   image: {{image}}
   port: 8080
   observability:
-    tracing:
+    autoInstrumentation:
       enabled: true
+      runtime: "java"
   env:
     - name: SPRING_PROFILES_ACTIVE
       value: nais

diff --git a/shop-backend/Dockerfile b/shop-backend/Dockerfile
@@ -18,8 +18,8 @@ ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/release
 
 # Final image
 FROM gcr.io/distroless/java17:nonroot
-COPY --from=javaagent --chown=nonroot:nonroot /instrumentations/java/javaagent.jar /app/javaagent.jar
+# COPY --from=javaagent --chown=nonroot:nonroot /instrumentations/java/javaagent.jar /app/javaagent.jar
 COPY --from=build --chown=nonroot:nonroot /home/gradle/src/build/libs/shop-backend-*.jar /app/shop-backend.jar
 WORKDIR /app
 # TLS Config works around an issue in OpenJDK... See: https://github.com/kubernetes-client/java/issues/854
-ENTRYPOINT [ "java", "-javaagent:/app/javaagent.jar", "-Djdk.tls.client.protocols=TLSv1.2", "-jar", "/app/shop-backend.jar" ]
+ENTRYPOINT [ "java", "-Djdk.tls.client.protocols=TLSv1.2", "-jar", "/app/shop-backend.jar" ]
diff --git a/shop-frontend/.nais/nais.yaml b/shop-frontend/.nais/nais.yaml
@@ -12,8 +12,9 @@ spec:
   image: {{image}}
   port: 3000
   observability:
-    tracing:
+    autoInstrumentation:
       enabled: true
+      runtime: sdk
   env:
     - name: "NODE_ENV"
       value: "production"