Update to latest otel (#2246)

* Update instrumentation, pull in jboss mdc

* Update to new APIs

* Remove deprecated method usage:

* submodule

* more

* Remove redundant shutdown hook

* small

* fix

* spotless

* More instrumentation

* Updates

* Spotless

Author: trask

agent/agent-bootstrap/build.gradle.kts

@@ -17,8 +17,10 @@ dependencies {
   implementation("ch.qos.logback:logback-classic")
   implementation("ch.qos.logback.contrib:logback-json-classic")
 
+  implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-executors-bootstrap:$otelInstrumentationAlphaVersion")
   implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-jaxrs-common-bootstrap:$otelInstrumentationAlphaVersion")
   implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-kafka-clients-0.11-bootstrap:$otelInstrumentationAlphaVersion")
+  implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:$otelInstrumentationAlphaVersion")
   implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-undertow-1.4-bootstrap:$otelInstrumentationAlphaVersion")
 
   // not using gson because it has dependency on java.sql.*, which is not available in Java 9+ bootstrap class loader

agent/agent-bootstrap/gradle.lockfile

@@ -14,6 +14,7 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.13.
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.13.0+ai.patches-alpha=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-appender-api-internal:1.13.0+ai.patches-alpha=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.13.0+ai.patches-alpha=runtimeClasspath
+io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-executors-bootstrap:1.13.0+ai.patches-alpha=runtimeClasspath
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-jaxrs-common-bootstrap:1.13.0+ai.patches-alpha=runtimeClasspath
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-kafka-clients-0.11-bootstrap:1.13.0+ai.patches-alpha=runtimeClasspath
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap:1.13.0+ai.patches-alpha=runtimeClasspath

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AzureMonitorMetricExporter.java

@@ -119,7 +119,7 @@ private List<TelemetryItem> convertOtelMetricToAzureMonitorMetric(MetricData met
 
     for (PointData pointData : metricData.getData().getPoints()) {
       MetricTelemetryBuilder builder = telemetryClient.newMetricTelemetryBuilder();
-      builder.setTime(FormattedTime.offSetDateTimeFromEpochNanos(pointData.getStartEpochNanos()));
+      builder.setTime(FormattedTime.offSetDateTimeFromEpochNanos(pointData.getEpochNanos()));
       updateMetricPointBuilder(builder, metricData, pointData);
       telemetryItems.add(builder.build());
     }

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/LoggerExporter.java

@@ -136,7 +136,7 @@ private void trackMessage(LogData log) {
     // set message-specific properties
     setLoggerProperties(
         telemetryBuilder,
-        log.getInstrumentationLibraryInfo().getName(),
+        log.getInstrumentationScopeInfo().getName(),
         attributes.get(SemanticAttributes.THREAD_NAME),
         log.getSeverity());
 
@@ -160,7 +160,7 @@ private void trackMessageAsException(LogData log, String stack) {
     // set exception-specific properties
     setLoggerProperties(
         telemetryBuilder,
-        log.getInstrumentationLibraryInfo().getName(),
+        log.getInstrumentationScopeInfo().getName(),
         attributes.get(SemanticAttributes.THREAD_NAME),
         log.getSeverity());
 

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiComponentInstaller.java

@@ -21,8 +21,6 @@
 
 package com.microsoft.applicationinsights.agent.internal.init;
 
-import static java.util.concurrent.TimeUnit.SECONDS;
-
 import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings;
 import com.azure.monitor.opentelemetry.exporter.implementation.utils.TempDirs;
 import com.microsoft.applicationinsights.agent.bootstrap.BytecodeUtil;
@@ -53,7 +51,6 @@
 import com.microsoft.applicationinsights.profiler.config.ServiceProfilerServiceConfig;
 import io.opentelemetry.instrumentation.api.aisdk.AiAppId;
 import io.opentelemetry.instrumentation.api.aisdk.AiLazyConfiguration;
-import io.opentelemetry.sdk.common.CompletableResultCode;
 import java.io.File;
 import java.lang.instrument.Instrumentation;
 import java.net.URL;
@@ -168,7 +165,6 @@ private static AppIdSupplier start() {
 
     // this is currently used by Micrometer instrumentation in addition to 2.x SDK
     BytecodeUtil.setDelegate(new BytecodeUtilImpl());
-    Runtime.getRuntime().addShutdownHook(new ShutdownHook(telemetryClient));
 
     RpConfiguration rpConfiguration = MainEntryPoint.getRpConfiguration();
     if (rpConfiguration != null) {
@@ -239,41 +235,5 @@ private static boolean hasConnectionString(Configuration config) {
     return !Strings.isNullOrEmpty(config.connectionString);
   }
 
-  private static class ShutdownHook extends Thread {
-    private final TelemetryClient telemetryClient;
-
-    public ShutdownHook(TelemetryClient telemetryClient) {
-      this.telemetryClient = telemetryClient;
-    }
-
-    @Override
-    public void run() {
-      startupLogger.debug("running shutdown hook");
-      CompletableResultCode otelFlush = OpenTelemetryConfigurer.flush();
-      CompletableResultCode result = new CompletableResultCode();
-      otelFlush.whenComplete(
-          () -> {
-            CompletableResultCode batchingClientFlush = telemetryClient.forceFlush();
-            batchingClientFlush.whenComplete(
-                () -> {
-                  if (otelFlush.isSuccess() && batchingClientFlush.isSuccess()) {
-                    result.succeed();
-                  } else {
-                    result.fail();
-                  }
-                });
-          });
-      result.join(5, SECONDS);
-      if (result.isSuccess()) {
-        startupLogger.debug("flushing telemetry on shutdown completed successfully");
-      } else if (Thread.interrupted()) {
-        startupLogger.debug("interrupted while flushing telemetry on shutdown");
-      } else {
-        startupLogger.debug(
-            "flushing telemetry on shutdown has taken more than 5 seconds, shutting down anyways...");
-      }
-    }
-  }
-
   private AiComponentInstaller() {}
 }

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java

@@ -26,7 +26,6 @@
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration;
 import com.microsoft.applicationinsights.agent.internal.legacyheaders.DelegatingPropagatorProvider;
 import io.opentelemetry.instrumentation.api.config.Config;
-import io.opentelemetry.instrumentation.api.config.ConfigBuilder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -114,9 +113,10 @@ static Config getConfig(Configuration config) {
       properties.put("otel.instrumentation.jaxrs-annotations.enabled", "false");
     }
     if (!config.preview.captureControllerSpans) {
-      properties.put("otel.instrumentation.common.experimental.suppress-controller-spans", "true");
+      properties.put(
+          "otel.instrumentation.common.experimental.controller-telemetry.enabled", "false");
     }
-    properties.put("otel.instrumentation.common.experimental.suppress-view-spans", "true");
+    properties.put("otel.instrumentation.common.experimental.view-telemetry.enabled", "false");
     properties.put(
         "otel.instrumentation.common.experimental.suppress-messaging-receive-spans", "true");
     // this is needed to capture kafka.record.queue_time_ms
@@ -200,7 +200,7 @@ static Config getConfig(Configuration config) {
       properties.put("otel.service.name", config.role.name);
     }
 
-    return new ConfigBuilder().readProperties(properties).build();
+    return Config.builder().addProperties(properties).build();
   }
 
   private static void setHttpHeaderConfiguration(

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/MetricExporterCustomizer.java

@@ -25,6 +25,7 @@
 import com.google.auto.service.AutoService;
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration;
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.ProcessorConfig;
+import com.microsoft.applicationinsights.agent.internal.exporter.AzureMonitorMetricExporter;
 import com.microsoft.applicationinsights.agent.internal.exporter.Exporter;
 import com.microsoft.applicationinsights.agent.internal.exporter.LoggerExporter;
 import com.microsoft.applicationinsights.agent.internal.legacyheaders.AiLegacyHeaderSpanProcessor;
@@ -47,6 +48,8 @@
 import io.opentelemetry.sdk.logs.SdkLogEmitterProviderBuilder;
 import io.opentelemetry.sdk.logs.export.BatchLogProcessor;
 import io.opentelemetry.sdk.logs.export.LogExporter;
+import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
+import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
@@ -62,9 +65,6 @@
 @AutoService(AutoConfigurationCustomizerProvider.class)
 public class OpenTelemetryConfigurer implements AutoConfigurationCustomizerProvider {
 
-  private static volatile BatchSpanProcessor batchSpanProcessor;
-  private static volatile BatchLogProcessor batchLogProcessor;
-
   @Override
   public void customize(AutoConfigurationCustomizer autoConfiguration) {
     TelemetryClient telemetryClient = TelemetryClient.getActive();
@@ -75,28 +75,21 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
 
     Configuration configuration = MainEntryPoint.getConfiguration();
 
-    autoConfiguration.addTracerProviderCustomizer(
-        (builder, config) -> configureTracing(builder, config, configuration));
-    autoConfiguration.addLogEmitterProviderCustomizer(
-        (builder, config) -> configureLogging(builder, configuration));
-  }
-
-  public static CompletableResultCode flush() {
-    List<CompletableResultCode> results = new ArrayList<>();
-    if (batchSpanProcessor != null) {
-      results.add(batchSpanProcessor.forceFlush());
-    }
-    if (batchLogProcessor != null) {
-      results.add(batchLogProcessor.forceFlush());
-    }
-    return CompletableResultCode.ofAll(results);
+    autoConfiguration
+        .addTracerProviderCustomizer(
+            (builder, config) -> configureTracing(builder, telemetryClient, config, configuration))
+        .addLogEmitterProviderCustomizer(
+            (builder, config) -> configureLogging(builder, telemetryClient, configuration))
+        .addMeterProviderCustomizer(
+            (builder, config) -> configureMetrics(builder, telemetryClient, configuration));
   }
 
   @SuppressFBWarnings(
       value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD",
       justification = "this method is only called once during initialization")
   private static SdkTracerProviderBuilder configureTracing(
       SdkTracerProviderBuilder tracerProvider,
+      TelemetryClient telemetryClient,
       ConfigProperties config,
       Configuration configuration) {
 
@@ -151,25 +144,28 @@ private static SdkTracerProviderBuilder configureTracing(
     String tracesExporter = config.getString("otel.traces.exporter");
     if ("none".equals(tracesExporter)) { // "none" is the default set in ConfigOverride
       SpanExporter spanExporter =
-          createSpanExporter(configuration, configuration.preview.captureHttpServer4xxAsError);
+          createSpanExporter(
+              telemetryClient, configuration, configuration.preview.captureHttpServer4xxAsError);
 
       // using BatchSpanProcessor in order to get off of the application thread as soon as possible
-      batchSpanProcessor =
+      BatchSpanProcessor batchSpanProcessor =
           BatchSpanProcessor.builder(spanExporter)
               .setScheduleDelay(getBatchProcessorDelay())
               .build();
 
-      tracerProvider.addSpanProcessor(batchSpanProcessor);
+      tracerProvider.addSpanProcessor(
+          new TelemetryClientFlushingSpanProcessor(batchSpanProcessor, telemetryClient));
     }
 
     return tracerProvider;
   }
 
   private static SpanExporter createSpanExporter(
-      Configuration configuration, boolean captureHttpServer4xxAsError) {
+      TelemetryClient telemetryClient,
+      Configuration configuration,
+      boolean captureHttpServer4xxAsError) {
 
-    SpanExporter spanExporter =
-        new Exporter(TelemetryClient.getActive(), captureHttpServer4xxAsError);
+    SpanExporter spanExporter = new Exporter(telemetryClient, captureHttpServer4xxAsError);
     List<ProcessorConfig> processorConfigs = getSpanProcessorConfigs(configuration);
     // NOTE if changing the span processor to something async, flush it in the shutdown hook before
     // flushing TelemetryClient
@@ -208,27 +204,32 @@ private static List<ProcessorConfig> getSpanProcessorConfigs(Configuration confi
   }
 
   private static SdkLogEmitterProviderBuilder configureLogging(
-      SdkLogEmitterProviderBuilder builder, Configuration configuration) {
+      SdkLogEmitterProviderBuilder builder,
+      TelemetryClient telemetryClient,
+      Configuration configuration) {
 
-    LogExporter logExporter = createLogExporter(configuration);
+    LogExporter logExporter = createLogExporter(telemetryClient, configuration);
 
     // using BatchLogProcessor in order to get off of the application thread as soon as possible
-    batchLogProcessor =
+    BatchLogProcessor batchLogProcessor =
         BatchLogProcessor.builder(logExporter).setScheduleDelay(getBatchProcessorDelay()).build();
 
+    TelemetryClientFlushingLogProcessor telemetryClientFlushingLogProcessor =
+        new TelemetryClientFlushingLogProcessor(batchLogProcessor, telemetryClient);
+
     // inherited attributes log processor also handles operation name, ikey and role name attributes
     // and these all need access to Span.current(), so must be run before passing off to the
     // BatchLogProcessor
     return builder.addLogProcessor(
         new InheritedAttributesLogProcessor(
-            configuration.preview.inheritedAttributes, batchLogProcessor));
+            configuration.preview.inheritedAttributes, telemetryClientFlushingLogProcessor));
   }
 
-  private static LogExporter createLogExporter(Configuration configuration) {
+  private static LogExporter createLogExporter(
+      TelemetryClient telemetryClient, Configuration configuration) {
     LogExporter logExporter =
         new LoggerExporter(
-            TelemetryClient.getActive(),
-            configuration.preview.captureLoggingLevelAsCustomDimension);
+            telemetryClient, configuration.preview.captureLoggingLevelAsCustomDimension);
     List<ProcessorConfig> processorConfigs = getLogProcessorConfigs(configuration);
     if (!processorConfigs.isEmpty()) {
       // Reversing the order of processors before passing it Log processor
@@ -271,6 +272,16 @@ private static Duration getBatchProcessorDelay() {
     }
   }
 
+  private static SdkMeterProviderBuilder configureMetrics(
+      SdkMeterProviderBuilder builder,
+      TelemetryClient telemetryClient,
+      Configuration configuration) {
+    return builder.registerMetricReader(
+        PeriodicMetricReader.builder(new AzureMonitorMetricExporter(telemetryClient))
+            .setInterval(Duration.ofSeconds(configuration.preview.metricIntervalSeconds))
+            .build());
+  }
+
   private static class BackCompatHttpUrlProcessor implements SpanExporter {
 
     private final SpanExporter delegate;