Merge branch 'main' into heya/migrate-profiler-to-azure-json

heyams · web-flow · commit 72378db7ed80 · 2024-10-16T17:21:21.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## Version 3.6.1 GA (10/09/2024)
+
+### Bug fixes
+
+* Regression introduced in 3.6.0 where some exception telemetry records were missing a required field causing them to be rejected by the ingestion service
+  ([Azure/azure-sdk-for-java#42241](https://github.com/Azure/azure-sdk-for-java/pull/42241))
+
 ## Version 3.6.0 GA (10/03/2024)
 
 ### Enhancements
diff --git a/agent/agent-tooling/build.gradle.kts b/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.29")
+  implementation("com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.30")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
   compileOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap")
diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile
@@ -9,7 +9,7 @@ com.azure:azure-core-http-netty:1.15.4=runtimeClasspath
 com.azure:azure-core:1.52.0=runtimeClasspath
 com.azure:azure-identity:1.13.3=runtimeClasspath
 com.azure:azure-json:1.3.0=runtimeClasspath
-com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.29=runtimeClasspath
+com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.30=runtimeClasspath
 com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
 com.azure:azure-storage-blob:12.28.0=runtimeClasspath
 com.azure:azure-storage-common:12.27.0=runtimeClasspath
diff --git a/agent/instrumentation/applicationinsights-web-2.3/build.gradle.kts b/agent/instrumentation/applicationinsights-web-2.3/build.gradle.kts
@@ -12,12 +12,12 @@ muzzle {
 }
 
 val otelInstrumentationAlphaVersion: String by project
-val otelVersion: String by project
+val otelInstrumentationVersion: String by project
 
 dependencies {
   compileOnly("com.microsoft.azure:applicationinsights-web:2.3.0")
 
-  testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:$otelVersion")
+  testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:$otelInstrumentationVersion")
 
   testImplementation("com.microsoft.azure:applicationinsights-web:2.3.0")
   testImplementation("javax.servlet:javax.servlet-api:3.0.1")
diff --git a/agent/instrumentation/micrometer-1.0/src/test/java/MicrometerTest.java b/agent/instrumentation/micrometer-1.0/src/test/java/MicrometerTest.java
@@ -22,11 +22,12 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 class MicrometerTest {
 
-  private static final long SLEEP_MILLISECONDS = 1000;
+  private static final long SLEEP_MILLISECONDS = 6000;
 
   private static final AgentTestingMicrometerDelegate delegate =
       new AgentTestingMicrometerDelegate();
@@ -91,6 +92,7 @@ void shouldCaptureGauge() throws InterruptedException {
     assertThat(measurement.namespace).isNull();
   }
 
+  @Disabled
   @Test
   void shouldCaptureCounter() throws InterruptedException {
     // given
diff --git a/agent/runtime-attach/build.gradle.kts b/agent/runtime-attach/build.gradle.kts
@@ -6,7 +6,6 @@ plugins {
 base.archivesName.set("applicationinsights-runtime-attach")
 
 val otelContribAlphaVersion: String by project
-val otelVersion: String by project
 val agent: Configuration by configurations.creating
 
 dependencies {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -28,9 +28,8 @@ dependencies {
 
   // When updating, update above in plugins too
   implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
-  implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.24")
+  implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.25")
   implementation("com.github.johnrengelman:shadow:8.1.1")
-  implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18.1")
 
   implementation("org.owasp:dependency-check-gradle:10.0.4")
 
diff --git a/buildSrc/src/main/kotlin/ai.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/ai.java-conventions.gradle.kts
@@ -1,4 +1,3 @@
-import com.gradle.enterprise.gradleplugin.testretry.retry
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import java.time.Duration
 
@@ -114,13 +113,6 @@ tasks.withType<Test>().configureEach {
   // This value is quite big because with lower values (3 mins) we were experiencing large number of false positives
   timeout.set(Duration.ofMinutes(15))
 
-  retry {
-    // You can see tests that were retried by this mechanism in the collected test reports and build scans.
-    if (System.getenv().containsKey("CI")) {
-      maxRetries.set(5)
-    }
-  }
-
   reports {
     junitXml.isOutputPerTestCase = true
   }
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -11,18 +11,19 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
-val otelVersion = "1.42.1"
+val otelSdkVersion = "1.42.1"
 val otelInstrumentationAlphaVersion = "2.8.0-alpha"
 val otelInstrumentationVersion = "2.8.0"
 val byteBuddyVersion = "1.14.11"
 
-rootProject.extra["otelVersion"] = otelVersion
+rootProject.extra["otelSdkVersion"] = otelSdkVersion
 rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion
 rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaVersion
 
 val DEPENDENCY_BOMS = listOf(
-  "io.opentelemetry:opentelemetry-bom:${otelVersion}",
-  "io.opentelemetry:opentelemetry-bom-alpha:${otelVersion}-alpha",
+  "com.fasterxml.jackson:jackson-bom:2.17.2",
+  "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
+  "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkVersion}-alpha",
   "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${otelInstrumentationVersion}",
   "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationAlphaVersion}",
   "com.azure:azure-sdk-bom:1.2.28",
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 // Project properties
-version=3.6.0
+version=3.6.1
 
 org.gradle.parallel=true
 org.gradle.caching=true
diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md
@@ -362,7 +362,7 @@ _2024-10-08 14:01:52 PDT_
 > - **POM Project URL**: [https://github.com/Azure/azure-sdk-for-java](https://github.com/Azure/azure-sdk-for-java)
 > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
 
-**70** **Group:** `com.azure` **Name:** `azure-monitor-opentelemetry-exporter` **Version:** `1.0.0-beta.29` 
+**70** **Group:** `com.azure` **Name:** `azure-monitor-opentelemetry-exporter` **Version:** `1.0.0-beta.30` 
 > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
 
 **71** **Group:** `com.azure` **Name:** `azure-storage-blob` **Version:** `12.28.0` 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,30 +9,13 @@ pluginManagement {
   }
 }
 
-plugins {
-  id("com.gradle.enterprise") version "3.18.1"
-}
-
 dependencyResolutionManagement {
   repositories {
     mavenCentral()
     mavenLocal()
   }
 }
 
-val isCI = System.getenv("CI") != null
-gradleEnterprise {
-  buildScan {
-    termsOfServiceUrl = "https://gradle.com/terms-of-service"
-    termsOfServiceAgree = "yes"
-
-    if (isCI) {
-      publishAlways()
-      tag("CI")
-    }
-  }
-}
-
 rootProject.name = "ApplicationInsights-Java"
 
 val buildNative = System.getProperty("ai.etw.native.build") != null && Os.isFamily(Os.FAMILY_WINDOWS)
diff --git a/smoke-tests/apps/SpringBoot/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootControllerSpansEnabledTest.java b/smoke-tests/apps/SpringBoot/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootControllerSpansEnabledTest.java
@@ -10,8 +10,11 @@
 import com.microsoft.applicationinsights.smoketest.schemav2.Data;
 import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
 import com.microsoft.applicationinsights.smoketest.schemav2.EventData;
+import com.microsoft.applicationinsights.smoketest.schemav2.ExceptionData;
+import com.microsoft.applicationinsights.smoketest.schemav2.ExceptionDetails;
 import com.microsoft.applicationinsights.smoketest.schemav2.RemoteDependencyData;
 import com.microsoft.applicationinsights.smoketest.schemav2.RequestData;
+import com.microsoft.applicationinsights.smoketest.schemav2.SeverityLevel;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -71,6 +74,10 @@ void testResultCodeWhenRestControllerThrows() throws Exception {
     RequestData rd = testing.getTelemetryDataForType(0, "RequestData");
     RemoteDependencyData rdd1 =
         (RemoteDependencyData) ((Data<?>) rddEnvelope1.getData()).getBaseData();
+    ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope1.getData()).getBaseData();
+
+    List<ExceptionDetails> details = ed.getExceptions();
+    ExceptionDetails ex = details.get(0);
 
     assertThat(rd.getName()).isEqualTo("GET /SpringBoot/throwsException");
     assertThat(rd.getResponseCode()).isEqualTo("500");
@@ -85,6 +92,17 @@ void testResultCodeWhenRestControllerThrows() throws Exception {
     assertThat(rdd1.getProperties()).isEmpty();
     assertThat(rdd1.getSuccess()).isFalse();
 
+    assertThat(ex.getTypeName()).isEqualTo("javax.servlet.ServletException");
+    assertThat(ex.getMessage()).isEqualTo("This is an exception");
+    assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
+    assertThat(ed.getProperties())
+        .containsKey("Logger Message"); // specific message varies by app server
+    assertThat(ed.getProperties()).containsEntry("SourceType", "Logger");
+    assertThat(ed.getProperties())
+        .containsKey("LoggerName"); // specific logger varies by app server
+    assertThat(ed.getProperties()).containsKey("ThreadName");
+    assertThat(ed.getProperties()).hasSize(4);
+
     SmokeTestExtension.assertParentChild(
         rd, rdEnvelope, edEnvelope1, "GET /SpringBoot/throwsException");
     SmokeTestExtension.assertParentChild(
diff --git a/smoke-tests/apps/SpringBoot/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootTest.java b/smoke-tests/apps/SpringBoot/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootTest.java
@@ -17,8 +17,11 @@
 import com.microsoft.applicationinsights.smoketest.schemav2.Data;
 import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
 import com.microsoft.applicationinsights.smoketest.schemav2.EventData;
+import com.microsoft.applicationinsights.smoketest.schemav2.ExceptionData;
+import com.microsoft.applicationinsights.smoketest.schemav2.ExceptionDetails;
 import com.microsoft.applicationinsights.smoketest.schemav2.RemoteDependencyData;
 import com.microsoft.applicationinsights.smoketest.schemav2.RequestData;
+import com.microsoft.applicationinsights.smoketest.schemav2.SeverityLevel;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -63,17 +66,34 @@ void testResultCodeWhenRestControllerThrows() throws Exception {
 
     Envelope edEnvelope1 = exceptions.get(0);
 
+    // assert on edEnvelope1
+
     assertThat(rdEnvelope.getSampleRate()).isNull();
     assertThat(edEnvelope1.getSampleRate()).isNull();
 
     RequestData rd = testing.getTelemetryDataForType(0, "RequestData");
+    ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope1.getData()).getBaseData();
+
+    List<ExceptionDetails> details = ed.getExceptions();
+    ExceptionDetails ex = details.get(0);
 
     assertThat(rd.getName()).isEqualTo("GET /SpringBoot/throwsException");
     assertThat(rd.getResponseCode()).isEqualTo("500");
     assertThat(rd.getProperties())
         .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
     assertThat(rd.getSuccess()).isFalse();
 
+    assertThat(ex.getTypeName()).isEqualTo("javax.servlet.ServletException");
+    assertThat(ex.getMessage()).isEqualTo("This is an exception");
+    assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
+    assertThat(ed.getProperties())
+        .containsKey("Logger Message"); // specific message varies by app server
+    assertThat(ed.getProperties()).containsEntry("SourceType", "Logger");
+    assertThat(ed.getProperties())
+        .containsKey("LoggerName"); // specific logger varies by app server
+    assertThat(ed.getProperties()).containsKey("ThreadName");
+    assertThat(ed.getProperties()).hasSize(4);
+
     SmokeTestExtension.assertParentChild(
         rd, rdEnvelope, edEnvelope1, "GET /SpringBoot/throwsException");
   }
diff --git a/smoke-tests/apps/SpringScheduling/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringSchedulingApp.java b/smoke-tests/apps/SpringScheduling/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringSchedulingApp.java
@@ -22,4 +22,9 @@ protected SpringApplicationBuilder configure(SpringApplicationBuilder applicatio
   public void fixedRateScheduler() {
     System.out.println("Hello world.");
   }
+
+  @Scheduled(fixedRate = 100)
+  public void exceptional() {
+    throw new RuntimeException("exceptional");
+  }
 }
diff --git a/smoke-tests/apps/SpringScheduling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringSchedulingTest.java b/smoke-tests/apps/SpringScheduling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringSchedulingTest.java
@@ -15,7 +15,11 @@
 
 import com.microsoft.applicationinsights.smoketest.schemav2.Data;
 import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
+import com.microsoft.applicationinsights.smoketest.schemav2.ExceptionData;
+import com.microsoft.applicationinsights.smoketest.schemav2.ExceptionDetails;
 import com.microsoft.applicationinsights.smoketest.schemav2.RequestData;
+import com.microsoft.applicationinsights.smoketest.schemav2.SeverityLevel;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import org.junit.jupiter.api.Test;
@@ -68,6 +72,41 @@ public boolean test(Envelope input) {
         2,
         10,
         TimeUnit.SECONDS);
+
+    List<Envelope> exceptionEnvelopes =
+        testing.mockedIngestion.getItemsEnvelopeDataType("ExceptionData");
+
+    assertThat(exceptionEnvelopes)
+        .anySatisfy(
+            envelope -> {
+              ExceptionData ed = (ExceptionData) ((Data<?>) envelope.getData()).getBaseData();
+              List<ExceptionDetails> details = ed.getExceptions();
+              ExceptionDetails ex = details.get(0);
+              assertThat(ex.getTypeName()).isEqualTo("java.lang.RuntimeException");
+              assertThat(ex.getMessage()).isEqualTo("exceptional");
+              assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
+              assertThat(ed.getProperties())
+                  .containsEntry("Logger Message", "Unexpected error occurred in scheduled task");
+              assertThat(ed.getProperties()).containsEntry("SourceType", "Logger");
+              assertThat(ed.getProperties())
+                  .containsEntry(
+                      "LoggerName",
+                      "org.springframework.scheduling.support.TaskUtils$LoggingErrorHandler");
+              assertThat(ed.getProperties()).containsKey("ThreadName");
+              assertThat(ed.getProperties()).hasSize(4);
+            });
+
+    assertThat(exceptionEnvelopes)
+        .anySatisfy(
+            envelope -> {
+              ExceptionData ed = (ExceptionData) ((Data<?>) envelope.getData()).getBaseData();
+              List<ExceptionDetails> details = ed.getExceptions();
+              ExceptionDetails ex = details.get(0);
+              assertThat(ex.getTypeName()).isEqualTo("java.lang.RuntimeException");
+              assertThat(ex.getMessage()).isEqualTo("exceptional");
+              assertThat(ed.getSeverityLevel()).isNull();
+              assertThat(ed.getProperties()).isEmpty();
+            });
   }
 
   @Environment(TOMCAT_8_JAVA_8)
