Support stable HTTP semconv

.github/workflows/build-common.yml

@@ -81,6 +81,15 @@ jobs:
           distribution: temurin
           java-version: 17
 
+      - run: |
+          mvn -version
+          # double quotes are needed on Windows (https://stackoverflow.com/a/16349133/295416)
+          mvn install:install-file -Dfile="azure-monitor-opentelemetry-exporter-1.0.0-beta.16.jar" \
+                                   -DpomFile="azure-monitor-opentelemetry-exporter-1.0.0-beta.16.pom" \
+                                   -DgroupId="com.azure" \
+                                   -DartifactId="azure-monitor-opentelemetry-exporter" \
+                                   -Dversion="1.0.0-beta.16"
+
       - name: Assemble
         uses: gradle/gradle-build-action@v2
         with:
@@ -129,6 +138,15 @@ jobs:
           distribution: temurin
           java-version: 17
 
+      - run: |
+          mvn -version
+          # double quotes are needed on Windows (https://stackoverflow.com/a/16349133/295416)
+          mvn install:install-file -Dfile="azure-monitor-opentelemetry-exporter-1.0.0-beta.16.jar" \
+                                   -DpomFile="azure-monitor-opentelemetry-exporter-1.0.0-beta.16.pom" \
+                                   -DgroupId="com.azure" \
+                                   -DartifactId="azure-monitor-opentelemetry-exporter" \
+                                   -Dversion="1.0.0-beta.16"
+
       - name: Test
         uses: gradle/gradle-build-action@v2
         with:
@@ -169,6 +187,15 @@ jobs:
           distribution: temurin
           java-version: 17
 
+      - run: |
+          mvn -version
+          # double quotes are needed on Windows (https://stackoverflow.com/a/16349133/295416)
+          mvn install:install-file -Dfile="azure-monitor-opentelemetry-exporter-1.0.0-beta.16.jar" \
+                                   -DpomFile="azure-monitor-opentelemetry-exporter-1.0.0-beta.16.pom" \
+                                   -DgroupId="com.azure" \
+                                   -DartifactId="azure-monitor-opentelemetry-exporter" \
+                                   -Dversion="1.0.0-beta.16"
+
       - name: Test
         uses: gradle/gradle-build-action@v2
         with:

agent/agent-bootstrap/build.gradle.kts

@@ -7,6 +7,5 @@ dependencies {
   // needed to access io.opentelemetry.instrumentation.api.aisdk.MicrometerUtil
   // TODO (heya) remove this when updating to upstream micrometer instrumentation
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
-  compileOnly("io.opentelemetry:opentelemetry-semconv")
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
 }

agent/agent-tooling/build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
   implementation(project(":agent:agent-profiler:agent-diagnostics"))
   implementation(project(":etw:java"))
 
-  implementation("com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.15")
+  implementation("com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.16")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
   compileOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap")

agent/agent-tooling/gradle.lockfile

@@ -9,7 +9,7 @@ com.azure:azure-core-http-netty:1.13.11=runtimeClasspath
 com.azure:azure-core:1.45.1=runtimeClasspath
 com.azure:azure-identity:1.11.1=runtimeClasspath
 com.azure:azure-json:1.1.0=runtimeClasspath
-com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.15=runtimeClasspath
+com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.16=runtimeClasspath
 com.azure:azure-sdk-bom:1.2.19=runtimeClasspath
 com.azure:azure-storage-blob:12.25.1=runtimeClasspath
 com.azure:azure-storage-common:12.24.1=runtimeClasspath
@@ -22,9 +22,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.16.1=runtimeClasspath
 com.fasterxml.woodstox:woodstox-core:6.5.1=runtimeClasspath
 com.github.oshi:oshi-core:6.4.10=runtimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.8.3=runtimeClasspath
 com.github.stephenc.jcip:jcip-annotations:1.0-1=runtimeClasspath
-com.google.code.findbugs:jsr305:3.0.2=runtimeClasspath
 com.google.errorprone:error_prone_annotations:2.24.1=runtimeClasspath
 com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
 com.microsoft.azure:msal4j-persistence-extension:1.2.0=runtimeClasspath

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

@@ -21,6 +21,8 @@ public Map<String, String> apply(ConfigProperties otelConfig) {
     Configuration configuration = FirstEntryPoint.getConfiguration();
 
     Map<String, String> properties = new HashMap<>();
+    properties.put("otel.semconv-stability.opt-in", "http,jvm");
+
     properties.put(
         "applicationinsights.internal.micrometer.step.millis",
         Long.toString(SECONDS.toMillis(configuration.metricIntervalSeconds)));

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

@@ -5,6 +5,7 @@
 
 import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes;
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration;
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
@@ -39,9 +40,11 @@ public Context onStart(Context context, R request, Attributes startAttributes) {
 
     Context newContext = context;
 
-    String target = startAttributes.get(SemanticAttributes.HTTP_TARGET);
+    String path =
+        getStableAttribute(
+            startAttributes, SemanticAttributes.URL_PATH, SemanticAttributes.HTTP_TARGET);
 
-    String connectionStringOverride = getConnectionStringOverride(target);
+    String connectionStringOverride = getConnectionStringOverride(path);
     if (connectionStringOverride != null) {
       newContext = newContext.with(AiContextKeys.CONNECTION_STRING, connectionStringOverride);
       // InheritedConnectionStringSpanProcessor will stamp connection string attribute from the
@@ -51,7 +54,7 @@ public Context onStart(Context context, R request, Attributes startAttributes) {
       span.setAttribute(AiSemanticAttributes.INTERNAL_CONNECTION_STRING, connectionStringOverride);
     }
 
-    String roleNameOverride = getRoleNameOverride(target);
+    String roleNameOverride = getRoleNameOverride(path);
     if (roleNameOverride != null) {
       newContext = newContext.with(AiContextKeys.ROLE_NAME, roleNameOverride);
       // InheritedRoleNameSpanProcessor will stamp role name attribute from the
@@ -89,4 +92,13 @@ private String getRoleNameOverride(String target) {
     }
     return null;
   }
+
+  private static <T> T getStableAttribute(
+      Attributes attributes, AttributeKey<T> stable, AttributeKey<T> old) {
+    T value = attributes.get(stable);
+    if (value != null) {
+      return value;
+    }
+    return attributes.get(old);
+  }
 }

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

@@ -39,16 +39,13 @@
 import com.microsoft.applicationinsights.agent.internal.processors.ExporterWithLogProcessor;
 import com.microsoft.applicationinsights.agent.internal.processors.ExporterWithSpanProcessor;
 import com.microsoft.applicationinsights.agent.internal.processors.LogExporterWithAttributeProcessor;
-import com.microsoft.applicationinsights.agent.internal.processors.MySpanData;
 import com.microsoft.applicationinsights.agent.internal.processors.SpanExporterWithAttributeProcessor;
 import com.microsoft.applicationinsights.agent.internal.profiler.triggers.AlertTriggerSpanProcessor;
 import com.microsoft.applicationinsights.agent.internal.sampling.SamplingOverrides;
 import com.microsoft.applicationinsights.agent.internal.telemetry.BatchItemProcessor;
 import com.microsoft.applicationinsights.agent.internal.telemetry.MetricFilter;
 import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient;
 import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryObservers;
-import io.opentelemetry.api.common.Attributes;
-import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdkBuilder;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
@@ -63,14 +60,11 @@
 import io.opentelemetry.sdk.metrics.export.PeriodicMetricReaderBuilder;
 import io.opentelemetry.sdk.metrics.internal.view.AiViewRegistry;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
-import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
-import io.opentelemetry.semconv.SemanticAttributes;
 import java.io.File;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -595,10 +589,6 @@ private static SpanExporter wrapSpanExporter(
                 "Not an expected ProcessorType: " + processorConfig.type);
         }
       }
-
-      // this is temporary until semantic attributes stabilize and we make breaking change
-      // then can use java.util.functions.Predicate<Attributes>
-      spanExporter = new BackCompatHttpUrlProcessor(spanExporter);
     }
 
     return spanExporter;
@@ -758,47 +748,4 @@ private static SdkMeterProviderBuilder configureMetrics(
     }
     return builder.registerMetricReader(metricReader);
   }
-
-  private static class BackCompatHttpUrlProcessor implements SpanExporter {
-
-    private final SpanExporter delegate;
-
-    private BackCompatHttpUrlProcessor(SpanExporter delegate) {
-      this.delegate = delegate;
-    }
-
-    @Override
-    public CompletableResultCode export(Collection<SpanData> spans) {
-      List<SpanData> copy = new ArrayList<>();
-      for (SpanData span : spans) {
-        copy.add(addBackCompatHttpUrl(span));
-      }
-      return delegate.export(copy);
-    }
-
-    private static SpanData addBackCompatHttpUrl(SpanData span) {
-      Attributes attributes = span.getAttributes();
-      if (attributes.get(SemanticAttributes.HTTP_URL) != null) {
-        // already has http.url
-        return span;
-      }
-      String httpUrl = SpanDataMapper.getHttpUrlFromServerSpan(attributes);
-      if (httpUrl == null) {
-        return span;
-      }
-      AttributesBuilder builder = attributes.toBuilder();
-      builder.put(SemanticAttributes.HTTP_URL, httpUrl);
-      return new MySpanData(span, builder.build());
-    }
-
-    @Override
-    public CompletableResultCode flush() {
-      return delegate.flush();
-    }
-
-    @Override
-    public CompletableResultCode shutdown() {
-      return delegate.shutdown();
-    }
-  }
 }

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

@@ -28,7 +28,7 @@ public CompletableResultCode export(Collection<SpanData> spans) {
       if (instrumentationScopeName.startsWith("azure-")) {
         instrumentationScopeName = AZURE_OPENTELEMETRY;
       }
-      statsbeatModule.getInstrumentationStatsbeat().addInstrumentation(instrumentationScopeName);
+      statsbeatModule.getInstrumentationStatsbeat().addInstrumentation(span);
     }
     return delegate.export(spans);
   }

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryClient.java

@@ -34,12 +34,10 @@
 import com.azure.monitor.opentelemetry.exporter.implementation.utils.TempDirs;
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration;
 import com.microsoft.applicationinsights.agent.internal.httpclient.LazyHttpClient;
-import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.resources.Resource;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -340,8 +338,7 @@ public void populateDefaults(AbstractTelemetryBuilder telemetryBuilder, Resource
     for (Map.Entry<String, String> entry : globalProperties.entrySet()) {
       telemetryBuilder.addProperty(entry.getKey(), entry.getValue());
     }
-    ResourceParser.updateRoleNameAndInstance(
-        telemetryBuilder, resource, DefaultConfigProperties.create(Collections.emptyMap()));
+    new ResourceParser().updateRoleNameAndInstance(telemetryBuilder, resource);
   }
 
   @Nullable

agent/agent-tooling/src/main/java/io/opentelemetry/sdk/metrics/internal/view/MetricView.java

@@ -9,8 +9,8 @@
 import java.util.Set;
 
 enum MetricView {
-  HTTP_CLIENT_VIEW("http.client.duration", httpClientDurationAttributeKeys(), false),
-  HTTP_SERVER_VIEW("http.server.duration", httpServerDurationAttributeKeys(), true),
+  HTTP_CLIENT_VIEW("http.client.request.duration", httpClientDurationAttributeKeys(), false),
+  HTTP_SERVER_VIEW("http.server.request.duration", httpServerDurationAttributeKeys(), true),
   RPC_CLIENT_VIEW("rpc.client.duration", rpcClientDurationAttributeKeys(), false),
   RPC_SERVER_VIEW("rpc.server.duration", rpcServerDurationAttributeKeys(), false);
 
@@ -41,23 +41,23 @@ boolean isCaptureSynthetic() {
 
   private static Set<AttributeKey<?>> httpClientDurationAttributeKeys() {
     Set<AttributeKey<?>> view = new HashSet<>(3);
-    view.add(SemanticAttributes.HTTP_STATUS_CODE);
-    view.add(SemanticAttributes.NET_PEER_NAME);
-    view.add(SemanticAttributes.NET_PEER_PORT);
+    view.add(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE);
+    view.add(SemanticAttributes.SERVER_ADDRESS);
+    view.add(SemanticAttributes.SERVER_PORT);
     return view;
   }
 
   private static Set<AttributeKey<?>> httpServerDurationAttributeKeys() {
     Set<AttributeKey<?>> view = new HashSet<>(1);
-    view.add(SemanticAttributes.HTTP_STATUS_CODE);
+    view.add(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE);
     return view;
   }
 
   private static Set<AttributeKey<?>> rpcClientDurationAttributeKeys() {
     Set<AttributeKey<?>> view = new HashSet<>(3);
     view.add(SemanticAttributes.RPC_SYSTEM);
-    view.add(SemanticAttributes.NET_PEER_NAME);
-    view.add(SemanticAttributes.NET_PEER_PORT);
+    view.add(SemanticAttributes.SERVER_ADDRESS);
+    view.add(SemanticAttributes.SERVER_PORT);
     return view;
   }
 

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/PreAggregatedMetricsTest.java

@@ -114,7 +114,7 @@ void generateHttpClientMetrics() {
         .satisfiesExactly(
             metric ->
                 assertThat(metric)
-                    .hasName("http.client.duration")
+                    .hasName("http.client.request.duration")
                     .hasUnit("ms")
                     .hasHistogramSatisfying(
                         histogram ->
@@ -123,9 +123,10 @@ void generateHttpClientMetrics() {
                                     point
                                         .hasSum(150 /* millis */)
                                         .hasAttributesSatisfying(
-                                            equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
-                                            equalTo(SemanticAttributes.NET_PEER_PORT, 1234),
-                                            equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200))
+                                            equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"),
+                                            equalTo(SemanticAttributes.SERVER_PORT, 1234),
+                                            equalTo(
+                                                SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200))
                                         .hasExemplarsSatisfying(
                                             exemplar ->
                                                 exemplar
@@ -158,10 +159,8 @@ void generateRpcClientMetrics() {
 
     Attributes responseAttributes1 =
         Attributes.builder()
-            .put(SemanticAttributes.NET_PEER_NAME, "example.com")
-            .put(SemanticAttributes.NET_PEER_IP, "127.0.0.1")
-            .put(SemanticAttributes.NET_PEER_PORT, 8080)
-            .put(SemanticAttributes.NET_TRANSPORT, "ip_tcp")
+            .put(SemanticAttributes.SERVER_ADDRESS, "example.com")
+            .put(SemanticAttributes.SERVER_PORT, 8080)
             .build();
 
     Context parent =
@@ -202,8 +201,8 @@ void generateRpcClientMetrics() {
                                         .hasAttributesSatisfying(
                                             equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
                                             equalTo(
-                                                SemanticAttributes.NET_PEER_NAME, "example.com"),
-                                            equalTo(SemanticAttributes.NET_PEER_PORT, 8080))
+                                                SemanticAttributes.SERVER_ADDRESS, "example.com"),
+                                            equalTo(SemanticAttributes.SERVER_PORT, 8080))
                                         .hasExemplarsSatisfying(
                                             exemplar ->
                                                 exemplar
@@ -259,7 +258,7 @@ void generateHttpServerMetrics() {
     Collection<MetricData> metricDataCollection = metricReader.collectAllMetrics();
     MetricData target = null;
     for (MetricData metricData : metricDataCollection) {
-      if ("http.server.duration".equals(metricData.getName())) {
+      if ("http.server.request.duration".equals(metricData.getName())) {
         target = metricData;
         System.out.println("metric: " + metricData);
       }
@@ -269,7 +268,7 @@ void generateHttpServerMetrics() {
         .satisfies(
             metric ->
                 assertThat(metric)
-                    .hasName("http.server.duration")
+                    .hasName("http.server.request.duration")
                     .hasUnit("ms")
                     .hasHistogramSatisfying(
                         histogram ->
@@ -278,7 +277,8 @@ void generateHttpServerMetrics() {
                                     point
                                         .hasSum(150 /* millis */)
                                         .hasAttributesSatisfying(
-                                            equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200),
+                                            equalTo(
+                                                SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200),
                                             equalTo(
                                                 AttributeKey.booleanKey(
                                                     "applicationinsights.internal.is_synthetic"),