smoke

Author: trask

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiOverrideSampler.java

@@ -60,7 +60,7 @@ public SamplingResult shouldSample(
     SpanContext parentSpanContext = Span.fromContext(parentContext).getSpanContext();
 
     SamplingOverrides samplingOverrides =
-        SpanDataMapper.isRequest(spanKind, parentSpanContext, attributes::get)
+        SpanDataMapper.isRequest(spanKind, parentSpanContext, null, attributes::get)
             ? requestSamplingOverrides
             : dependencySamplingOverrides;
 

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

@@ -37,8 +37,8 @@ void testRoundToNearest() {
     assertThat(roundToNearest(50)).isEqualTo(50);
     assertThat(roundToNearest(10)).isEqualTo(10);
     assertThat(roundToNearest(2)).isEqualTo(2);
-    assertThat(roundToNearest(0.1f)).isEqualTo(0.1f);
-    assertThat(roundToNearest(0.001f)).isEqualTo(0.001f);
+    assertThat(roundToNearest(0.1)).isEqualTo(0.1);
+    assertThat(roundToNearest(0.001)).isEqualTo(0.001);
     assertThat(roundToNearest(0)).isEqualTo(0);
 
     // imperfect

agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SpanDataMapper.java

@@ -43,6 +43,7 @@
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.api.trace.SpanId;
 import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.ReadableSpan;
 import io.opentelemetry.sdk.trace.data.EventData;
@@ -184,17 +185,34 @@ public TelemetryItem map(SpanData span, long itemCount) {
   }
 
   public static boolean isRequest(SpanData span) {
-    return isRequest(span.getKind(), span.getParentSpanContext(), span.getAttributes()::get);
+    return isRequest(
+        span.getKind(),
+        span.getParentSpanContext(),
+        span.getInstrumentationScopeInfo(),
+        span.getAttributes()::get);
   }
 
   public static boolean isRequest(ReadableSpan span) {
-    return isRequest(span.getKind(), span.getParentSpanContext(), span::getAttribute);
+    return isRequest(
+        span.getKind(),
+        span.getParentSpanContext(),
+        span.getInstrumentationScopeInfo(),
+        span::getAttribute);
   }
 
   public static boolean isRequest(
-      SpanKind kind, SpanContext parentSpanContext, Function<AttributeKey<String>, String> attrFn) {
+      SpanKind kind,
+      SpanContext parentSpanContext,
+      @Nullable InstrumentationScopeInfo scopeInfo,
+      Function<AttributeKey<String>, String> attrFn) {
+    String instrumentationName = scopeInfo == null ? null : scopeInfo.getName();
     if (kind == SpanKind.INTERNAL) {
-      return !parentSpanContext.isValid();
+      // TODO (trask) AI mapping: need semantic convention for determining whether to map INTERNAL
+      // to request or dependency (or need clarification to use SERVER for this)
+      return !parentSpanContext.isValid()
+          && instrumentationName != null
+          && (instrumentationName.startsWith("io.opentelemetry.spring-scheduling-")
+              || instrumentationName.equals("io.opentelemetry.methods"));
     } else if (kind == SpanKind.CLIENT || kind == SpanKind.PRODUCER) {
       return false;
     } else if (kind == SpanKind.CONSUMER

agent/azure-monitor-exporter/src/test/java/com/azure/monitor/opentelemetry/exporter/AzureMonitorExportersEndToEndTest.java

@@ -30,7 +30,7 @@
 import com.azure.core.http.policy.HttpPipelinePolicy;
 import com.azure.core.util.FluxUtil;
 import com.azure.monitor.opentelemetry.exporter.implementation.models.MetricsData;
-import com.azure.monitor.opentelemetry.exporter.implementation.models.RequestData;
+import com.azure.monitor.opentelemetry.exporter.implementation.models.RemoteDependencyData;
 import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem;
 import com.azure.monitor.opentelemetry.exporter.implementation.utils.MockLogData;
 import com.azure.monitor.opentelemetry.exporter.implementation.utils.TestUtils;
@@ -123,14 +123,15 @@ private static void validateTraceExporterEndToEnd(String testName) throws Except
     List<TelemetryItem> actualTelemetryItems = generateTraces(testName);
     assertThat(actualTelemetryItems.size()).isGreaterThan(0);
     TelemetryItem actualTelemetryItem = actualTelemetryItems.get(0);
-    assertThat(actualTelemetryItem.getName()).isEqualTo("Request");
+    assertThat(actualTelemetryItem.getName()).isEqualTo("RemoteDependency");
     assertThat(actualTelemetryItem.getInstrumentationKey()).isEqualTo(INSTRUMENTATION_KEY);
     assertThat(actualTelemetryItem.getTags())
         .containsEntry("ai.cloud.role", "unknown_service:java");
     assertThat(actualTelemetryItem.getTags())
         .hasEntrySatisfying("ai.internal.sdkVersion", v -> assertThat(v).contains("otel"));
-    assertThat(actualTelemetryItem.getData().getBaseType()).isEqualTo("RequestData");
-    RequestData actualData = (RequestData) actualTelemetryItem.getData().getBaseData();
+    assertThat(actualTelemetryItem.getData().getBaseType()).isEqualTo("RemoteDependencyData");
+    RemoteDependencyData actualData =
+        (RemoteDependencyData) actualTelemetryItem.getData().getBaseData();
     assertThat(actualData.getName()).isEqualTo(testName);
     assertThat(actualData.getProperties())
         .containsExactly(entry("color", "red"), entry("name", "apple"));

smoke-tests/apps/ActuatorMetrics/src/smokeTest/resources/applicationinsights.json

@@ -1,4 +1,11 @@
 {
+  "role": {
+    "name": "testrolename",
+    "instance": "testroleinstance"
+  },
+  "sampling": {
+    "percentage": 100
+  },
   "preview": {
     "metricIntervalSeconds": 5,
     "processors": [

smoke-tests/apps/ActuatorMetrics/src/smokeTest/resources/disabled_applicationinsights.json

@@ -1,4 +1,11 @@
 {
+  "role": {
+    "name": "testrolename",
+    "instance": "testroleinstance"
+  },
+  "sampling": {
+    "percentage": 100
+  },
   "instrumentation": {
     "micrometer": {
       "enabled": false

smoke-tests/apps/AutoPerfCounters/src/smokeTest/resources/applicationinsights.json

@@ -1,4 +1,11 @@
 {
+  "role": {
+    "name": "testrolename",
+    "instance": "testroleinstance"
+  },
+  "sampling": {
+    "percentage": 100
+  },
   "preview": {
     "metricIntervalSeconds": 5
   }

smoke-tests/apps/AzureSdk/src/smokeTest/resources/controller_spans_enabled_applicationinsights.json

@@ -1,4 +1,11 @@
 {
+  "role": {
+    "name": "testrolename",
+    "instance": "testroleinstance"
+  },
+  "sampling": {
+    "percentage": 100
+  },
   "preview": {
     "captureControllerSpans": true
   }

smoke-tests/apps/AzureSdk/src/smokeTest/resources/disabled_applicationinsights.json

@@ -1,5 +1,11 @@
 {
-  "connectionString": "InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://host.docker.internal:6060/",
+  "role": {
+    "name": "testrolename",
+    "instance": "testroleinstance"
+  },
+  "sampling": {
+    "percentage": 100
+  },
   "instrumentation": {
     "azureSdk": {
       "enabled": false

smoke-tests/apps/Cassandra/src/smokeTest/resources/disabled_applicationinsights.json

@@ -1,4 +1,11 @@
 {
+  "role": {
+    "name": "testrolename",
+    "instance": "testroleinstance"
+  },
+  "sampling": {
+    "percentage": 100
+  },
   "instrumentation": {
     "cassandra": {
       "enabled": false