Update otel (#2923)

microsoft · Feb 22, 2023 · 63e52a8 · 63e52a8
1 parent 78a0fa7
commit 63e52a8
Show file tree

Hide file tree

Showing 27 changed files with 552 additions and 215 deletions.
diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile
@@ -11,10 +11,10 @@ com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 com.squareup.moshi:moshi:1.11.0=runtimeClasspath
 com.squareup.okio:okio:1.17.5=runtimeClasspath
 io.netty:netty-bom:4.1.89.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
 org.junit:junit-bom:5.9.2=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath

diff --git a/...ain/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java b/...ain/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java
@@ -46,6 +46,7 @@ private static Set<AttributeKey> buildDurationClientView() {
     Set<AttributeKey> view = new HashSet<>(durationAlwaysInclude);
     view.add(SemanticAttributes.NET_PEER_NAME);
     view.add(SemanticAttributes.NET_PEER_PORT);
+    view.add(SemanticAttributes.NET_SOCK_PEER_ADDR);
     return view;
   }
 
@@ -57,7 +58,8 @@ private static Set<AttributeKey> buildDurationServerView() {
     // - we prefer http.route (which is scrubbed) over http.target (which is not scrubbed).
     Set<AttributeKey> view = new HashSet<>(durationAlwaysInclude);
     view.add(SemanticAttributes.HTTP_SCHEME);
-    view.add(SemanticAttributes.HTTP_HOST);
+    view.add(SemanticAttributes.NET_HOST_NAME);
+    view.add(SemanticAttributes.NET_HOST_PORT);
     view.add(SemanticAttributes.HTTP_ROUTE);
     // START APPLICATION INSIGHTS MODIFICATIONS
     view.add(SemanticAttributes.HTTP_USER_AGENT);
@@ -70,10 +72,10 @@ private static Set<AttributeKey> buildActiveRequestsView() {
     // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/http-metrics.md#attributes
     Set<AttributeKey> view = new HashSet<>();
     view.add(SemanticAttributes.HTTP_METHOD);
-    view.add(SemanticAttributes.HTTP_HOST);
     view.add(SemanticAttributes.HTTP_SCHEME);
     view.add(SemanticAttributes.HTTP_FLAVOR);
-    view.add(SemanticAttributes.HTTP_SERVER_NAME);
+    view.add(SemanticAttributes.NET_HOST_NAME);
+    view.add(SemanticAttributes.NET_HOST_PORT);
     return view;
   }
 

diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.89.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
 org.junit:junit-bom:5.9.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
@@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
 com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.89.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
 org.junit:junit-bom:5.9.2=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath

diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
@@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
 com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.89.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
 org.junit:junit-bom:5.9.2=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath

diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.89.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
 org.junit:junit-bom:5.9.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.89.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
 org.junit:junit-bom:5.9.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.89.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
 org.junit:junit-bom:5.9.2=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath

diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.89.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
 org.junit:junit-bom:5.9.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile
@@ -50,13 +50,13 @@ io.netty:netty-transport-native-epoll:4.1.89.Final=runtimeClasspath
 io.netty:netty-transport-native-kqueue:4.1.89.Final=runtimeClasspath
 io.netty:netty-transport-native-unix-common:4.1.89.Final=runtimeClasspath
 io.netty:netty-transport:4.1.89.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
-io.projectreactor.netty:reactor-netty-core:1.1.2=runtimeClasspath
-io.projectreactor.netty:reactor-netty-http:1.1.2=runtimeClasspath
-io.projectreactor:reactor-core:3.5.2=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.projectreactor.netty:reactor-netty-core:1.1.3=runtimeClasspath
+io.projectreactor.netty:reactor-netty-http:1.1.3=runtimeClasspath
+io.projectreactor:reactor-core:3.5.3=runtimeClasspath
 net.java.dev.jna:jna-platform:5.12.1=runtimeClasspath
 net.java.dev.jna:jna:5.12.1=runtimeClasspath
 net.minidev:accessors-smart:2.4.8=runtimeClasspath

diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.9=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.89.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
 org.junit:junit-bom:5.9.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/azure-monitor-exporter/gradle.lockfile b/agent/azure-monitor-exporter/gradle.lockfile
@@ -40,13 +40,13 @@ io.netty:netty-transport-native-epoll:4.1.89.Final=runtimeClasspath
 io.netty:netty-transport-native-kqueue:4.1.89.Final=runtimeClasspath
 io.netty:netty-transport-native-unix-common:4.1.89.Final=runtimeClasspath
 io.netty:netty-transport:4.1.89.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.1-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.1=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath
-io.projectreactor.netty:reactor-netty-core:1.1.2=runtimeClasspath
-io.projectreactor.netty:reactor-netty-http:1.1.2=runtimeClasspath
-io.projectreactor:reactor-core:3.5.2=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.23.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.23.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.projectreactor.netty:reactor-netty-core:1.1.3=runtimeClasspath
+io.projectreactor.netty:reactor-netty-http:1.1.3=runtimeClasspath
+io.projectreactor:reactor-core:3.5.3=runtimeClasspath
 net.java.dev.jna:jna-platform:5.6.0=runtimeClasspath
 net.java.dev.jna:jna:5.6.0=runtimeClasspath
 net.minidev:accessors-smart:2.4.8=runtimeClasspath

diff --git a/...src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/OperationNames.java b/...src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/OperationNames.java
@@ -12,13 +12,7 @@ public static String getOperationName(ReadableSpan span) {
     if (operationName != null) {
       return operationName;
     }
-
-    String spanName = span.getName();
-    String httpMethod = span.getAttribute(SemanticAttributes.HTTP_METHOD);
-    if (httpMethod != null && !httpMethod.isEmpty() && spanName.startsWith("/")) {
-      return httpMethod + " " + spanName;
-    }
-    return spanName;
+    return span.getName();
   }
 
   private OperationNames() {}