Merge pull request #42 from navikt/feature/setup-telemetry

Setup telemetry

Author: eirslett

Dockerfile

@@ -1,2 +1,24 @@
-FROM navikt/java:14
+# FROM navikt/java:14
+FROM eclipse-temurin:17-jre
+
+RUN apt-get update && apt-get install -y \
+  curl \
+  dumb-init \
+  && rm -rf /var/lib/apt/lists/*
+
+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
+ENV LOGGING_CONFIG=classpath:logback-nais.xml
+ENV SECRET_BASEDIR=/
+
+COPY java-opts.sh /app
+
 COPY target/navansatt-1-SNAPSHOT-jar-with-dependencies.jar app.jar
+
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+CMD ["bash", "-c", "source java-opts.sh && exec java ${DEFAULT_JVM_OPTS} ${JAVA_OPTS} -jar app.jar $@"]

java-opts.sh

@@ -0,0 +1,21 @@
+#!/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;
+    then
+        echo Truststore is corrupt, or bad password
+        exit 1
+    fi
+
+    JAVA_OPTS="${JAVA_OPTS} -Djavax.net.ssl.trustStore=${NAV_TRUSTSTORE_PATH}"
+    JAVA_OPTS="${JAVA_OPTS} -Djavax.net.ssl.trustStorePassword=${NAV_TRUSTSTORE_PASSWORD}"
+    export JAVA_OPTS
+fi
+
+# inject proxy settings set by the nais platform
+export JAVA_OPTS="${JAVA_OPTS} ${JAVA_PROXY_OPTIONS}"

nais/nais-dev.yml

@@ -81,10 +81,11 @@ spec:
       allowAllUsers: true
   webproxy: true
   # TODO: Enable observability when it's supported in dev-fss
+  # For now, this is set up manually.
   # observability:
   #   autoInstrumentation:
   #     enabled: true
-  #     runtime: java
+  #     runtime: sdk
   env:
     - name: "LDAP_URL"
       value: "ldaps://ldapgw.preprod.local"
@@ -96,6 +97,18 @@ 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-dev,service.version=navansatt-dev,deployment.environment=dev"
+    - name: "OTEL_TRACES_EXPORTER"
+      value: "otlp"
   vault:
     enabled: true
     paths: