More

microsoft · Feb 20, 2023 · 48fc707 · 48fc707
1 parent 7c980ee
commit 48fc707
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/...src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SpanDataMapper.java b/...src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SpanDataMapper.java
@@ -178,16 +178,7 @@ private TelemetryItem exportRemoteDependency(SpanData span, boolean inProc, long
 
   private static final Set<String> DEFAULT_HTTP_SPAN_NAMES =
       new HashSet<>(
-          asList(
-              "HTTP OPTIONS",
-              "HTTP GET",
-              "HTTP HEAD",
-              "HTTP POST",
-              "HTTP PUT",
-              "HTTP DELETE",
-              "HTTP TRACE",
-              "HTTP CONNECT",
-              "HTTP PATCH"));
+          asList("OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "CONNECT", "PATCH"));
 
   // the backend product prefers more detailed (but possibly infinite cardinality) name for http
   // dependencies

diff --git a/...src/main/java/io/opentelemetry/javaagent/instrumentation/methods/ai/MethodSingletons.java b/...src/main/java/io/opentelemetry/javaagent/instrumentation/methods/ai/MethodSingletons.java
@@ -33,6 +33,7 @@ public final class MethodSingletons {
                 GlobalOpenTelemetry.get(),
                 INSTRUMENTATION_NAME,
                 CodeSpanNameExtractor.create(codeAttributesGetter))
+            .setInstrumentationVersion("1.23.0-alpha-applicationinsights")
             .addAttributesExtractor(CodeAttributesExtractor.create(codeAttributesGetter))
             // START APPLICATION INSIGHTS MODIFICATIONS
             .buildInstrumenter(new MethodSpanKindExtractor());

diff --git a/...rc/smokeTest/java/com/microsoft/applicationinsights/smoketest/JettyNativeHandlerTest.java b/...rc/smokeTest/java/com/microsoft/applicationinsights/smoketest/JettyNativeHandlerTest.java
@@ -28,7 +28,7 @@ abstract class JettyNativeHandlerTest {
   void doSimpleTest() throws Exception {
     Telemetry telemetry = testing.getTelemetry(0);
 
-    assertThat(telemetry.rd.getName()).isEqualTo("HTTP GET");
+    assertThat(telemetry.rd.getName()).isEqualTo("GET");
     assertThat(telemetry.rd.getUrl()).matches("http://localhost:[0-9]+/path");
     assertThat(telemetry.rd.getResponseCode()).isEqualTo("200");
     assertThat(telemetry.rd.getSuccess()).isTrue();