Merge branch 'master' into more-tracing

Author: skykanin

.nais/test/nais.yaml

@@ -66,7 +66,7 @@ spec:
   observability:
     autoInstrumentation:
       enabled: true
-      runtime: sdk
+      runtime: java
 
   env:
     - name: MICRONAUT_CONFIG_FILES

conf/application.yml

@@ -35,13 +35,3 @@ logger:
   levels:
     io.micronaut.security: INFO
     no.ssb.dlp.pseudo.service: DEBUG
-
-otel.service.name: ${OTEL_SERVICE_NAME}
-otel.traces.exporter: otlp
-otel.metrics.exporter: otlp
-otel.logs.exporter: otlp
-otel:
-  exporter:
-    otlp:
-      url:
-        ${OTEL_EXPORTER_OTLP_ENDPOINT}

pom.xml

@@ -128,13 +128,9 @@
       <version>5.10.1</version>
     </dependency>
     <dependency>
-      <groupId>io.micronaut.tracing</groupId>
-      <artifactId>micronaut-tracing-annotation</artifactId>
-      <version>${micronaut.tracing.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-exporter-otlp</artifactId>
+        <groupId>io.micronaut.tracing</groupId>
+        <artifactId>micronaut-tracing-annotation</artifactId>
+        <version>7.2.0</version>
     </dependency>
     <dependency>
       <groupId>io.micronaut.cache</groupId>