Change to OTEL Nais Autoinstrumentation

Author: eirikmol

Dockerfile

@@ -8,8 +8,6 @@ RUN apt-get update && apt-get install -y \
 
 WORKDIR /app
 
-RUN curl -L -O https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
-
 ENV TZ="Europe/Oslo"
 
 ENV MAIN_CLASS=no.nav.pensjon.pen_app.PenApplication

java-opts.sh

@@ -1,9 +1,5 @@
 #!/usr/bin/env sh
 
-if [ ! -z "${OTEL_EXPORTER_OTLP_ENDPOINT}" ]; then
-    JAVA_OPTS="${JAVA_OPTS} -javaagent:/app/opentelemetry-javaagent.jar"
-fi
-
 if test -r "${NAV_TRUSTSTORE_PATH}";
 then
     if ! keytool -list -keystore ${NAV_TRUSTSTORE_PATH} -storepass "${NAV_TRUSTSTORE_PASSWORD}" > /dev/null;

nais/nais-dev.yml

@@ -97,18 +97,15 @@ spec:
       value: "https://norg2.intern.dev.nav.no/norg2"
     - name: "STS_WELL_KNOWN_URL"
       value: "https://security-token-service.nais.preprod.local/.well-known/openid-configuration"
-
-    # Manual setup of OpenTelemetry because it's not "natively" supported on FSS yet.
-    - name: "OTEL_EXPORTER_OTLP_ENDPOINT"
-      value: "https://elastic-apm.adeo.no"
-    - name: "OTEL_METRICS_EXPORTER"
-      value: "otlp"
-    - name: "OTEL_LOGS_EXPORTER"
-      value: "otlp"
     - name: "OTEL_RESOURCE_ATTRIBUTES"
-      value: "service.name=navansatt,service.version=navansatt,deployment.environment=q2"
-    - name: "OTEL_TRACES_EXPORTER"
-      value: "otlp"
+      value: "deployment.environment.name=q2"
+  observability:
+    autoInstrumentation:
+      enabled: true
+      runtime: java
+      destinations:
+        - id: grafana-lgtm
+        - id: elastic-apm
   vault:
     enabled: true
     paths:

nais/nais-prod.yml

@@ -66,18 +66,15 @@ spec:
       value: "https://norg2.intern.nav.no/norg2"
     - name: "STS_WELL_KNOWN_URL"
       value: "https://security-token-service.nais.adeo.no/.well-known/openid-configuration"
-
-    # Manual setup of OpenTelemetry because it's not "natively" supported on FSS yet.
-    - name: "OTEL_EXPORTER_OTLP_ENDPOINT"
-      value: "https://elastic-apm.adeo.no"
-    - name: "OTEL_METRICS_EXPORTER"
-      value: "otlp"
-    - name: "OTEL_LOGS_EXPORTER"
-      value: "otlp"
     - name: "OTEL_RESOURCE_ATTRIBUTES"
-      value: "service.name=navansatt,service.version=navansatt,deployment.environment=p"
-    - name: "OTEL_TRACES_EXPORTER"
-      value: "otlp"
+      value: "deployment.environment.name=p"
+  observability:
+    autoInstrumentation:
+      enabled: true
+      runtime: java
+      destinations:
+        - id: grafana-lgtm
+        - id: elastic-apm
   vault:
     enabled: true
     paths: