Merge branch 'main' into copilot/fix-4251

trask · web-flow · commit 5bddd893cb36 · 2025-07-09T07:09:28.000-07:00
diff --git a/agent/agent-profiler/agent-alerting/src/test/java/com/microsoft/applicationinsights/alerting/AlertingSubsystemTest.java b/agent/agent-profiler/agent-alerting/src/test/java/com/microsoft/applicationinsights/alerting/AlertingSubsystemTest.java
@@ -30,14 +30,14 @@ private static AlertingSubsystem getAlertMonitor(
             AlertConfiguration.builder()
                 .setType(AlertMetricType.CPU)
                 .setEnabled(true)
-                .setThreshold((float) 80)
+                .setThreshold(80.0f)
                 .setProfileDurationSeconds(30)
                 .setCooldownSeconds(14400)
                 .build(),
             AlertConfiguration.builder()
                 .setType(AlertMetricType.MEMORY)
                 .setEnabled(true)
-                .setThreshold((float) 20)
+                .setThreshold(20.0f)
                 .setProfileDurationSeconds(120)
                 .setCooldownSeconds(14400)
                 .build(),
@@ -89,14 +89,14 @@ void manualAlertWorks() {
             AlertConfiguration.builder()
                 .setType(AlertMetricType.CPU)
                 .setEnabled(true)
-                .setThreshold((float) 80)
+                .setThreshold(80.0f)
                 .setProfileDurationSeconds(30)
                 .setCooldownSeconds(14400)
                 .build(),
             AlertConfiguration.builder()
                 .setType(AlertMetricType.MEMORY)
                 .setEnabled(true)
-                .setThreshold((float) 20)
+                .setThreshold(20.0f)
                 .setProfileDurationSeconds(120)
                 .setCooldownSeconds(14400)
                 .build(),
@@ -130,14 +130,14 @@ void manualAlertDoesNotTriggerAfterExpired() {
             AlertConfiguration.builder()
                 .setType(AlertMetricType.CPU)
                 .setEnabled(true)
-                .setThreshold((float) 80)
+                .setThreshold(80.0f)
                 .setProfileDurationSeconds(30)
                 .setCooldownSeconds(14400)
                 .build(),
             AlertConfiguration.builder()
                 .setType(AlertMetricType.MEMORY)
                 .setEnabled(true)
-                .setThreshold((float) 20)
+                .setThreshold(20.0f)
                 .setProfileDurationSeconds(120)
                 .setCooldownSeconds(14400)
                 .build(),
diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertConfigParserTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertConfigParserTest.java
@@ -43,7 +43,7 @@ void saneDataIsParsed() {
             AlertConfiguration.builder()
                 .setType(AlertMetricType.CPU)
                 .setEnabled(true)
-                .setThreshold((float) 80)
+                .setThreshold(80.0f)
                 .setProfileDurationSeconds(30)
                 .setCooldownSeconds(14400)
                 .build());
@@ -53,7 +53,7 @@ void saneDataIsParsed() {
             AlertConfiguration.builder()
                 .setType(AlertMetricType.MEMORY)
                 .setEnabled(true)
-                .setThreshold((float) 20)
+                .setThreshold(20.0f)
                 .setProfileDurationSeconds(120)
                 .setCooldownSeconds(14400)
                 .build());
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -30,7 +30,7 @@ dependencies {
   implementation(gradleApi())
 
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.1.0")
   implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.2.1")
   implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.8")
 
diff --git a/buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts b/buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts
@@ -54,7 +54,6 @@ tasks {
 
         // Don't support Android without desugar
         disable("AndroidJdkLibsChecker")
-        disable("Java7ApiChecker")
         disable("StaticOrDefaultInterfaceMethod")
 
         // needed temporarily while hosting azure-monitor-opentelemetry-exporter in this repo
@@ -70,6 +69,9 @@ tasks {
         // cognitive load is dubious.
         disable("YodaCondition")
 
+        // Requires adding compile dependency to JSpecify
+        disable("AddNullMarkedToPackageInfo")
+
         if (name.contains("Jmh")) {
           disable("MemberName")
         }
diff --git a/classic-sdk/core/src/main/java/com/microsoft/applicationinsights/telemetry/ExceptionTelemetry.java b/classic-sdk/core/src/main/java/com/microsoft/applicationinsights/telemetry/ExceptionTelemetry.java
@@ -56,6 +56,7 @@ public void setException(Throwable throwable, int stackSize) {
     this.throwable = throwable;
   }
 
+  @SuppressWarnings("EnumOrdinal")
   public void setSeverityLevel(SeverityLevel severityLevel) {
     data.setSeverityLevel(
         severityLevel == null
@@ -65,6 +66,7 @@ public void setSeverityLevel(SeverityLevel severityLevel) {
   }
 
   @Nullable
+  @SuppressWarnings("EnumOrdinal")
   public SeverityLevel getSeverityLevel() {
     return data.getSeverityLevel() == null
         ? null
diff --git a/classic-sdk/core/src/main/java/com/microsoft/applicationinsights/telemetry/TraceTelemetry.java b/classic-sdk/core/src/main/java/com/microsoft/applicationinsights/telemetry/TraceTelemetry.java
@@ -47,6 +47,7 @@ public void setMessage(String message) {
     data.setMessage(message);
   }
 
+  @SuppressWarnings("EnumOrdinal")
   public void setSeverityLevel(SeverityLevel severityLevel) {
     data.setSeverityLevel(
         severityLevel == null
@@ -56,6 +57,7 @@ public void setSeverityLevel(SeverityLevel severityLevel) {
   }
 
   @Nullable
+  @SuppressWarnings("EnumOrdinal")
   public SeverityLevel getSeverityLevel() {
     return data.getSeverityLevel() == null
         ? null
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -33,7 +33,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.0"
-val errorProneVersion = "2.36.0"
+val errorProneVersion = "2.38.0"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"
 val slf4jVersion = "2.0.17"
diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md
@@ -36,7 +36,7 @@ _2025-07-08 14:53:50 UTC_
 > - **POM Project URL**: [http://stephenc.github.com/jcip-annotations](http://stephenc.github.com/jcip-annotations)
 > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
 
-**6** **Group:** `com.google.errorprone` **Name:** `error_prone_annotations` **Version:** `2.36.0` 
+**6** **Group:** `com.google.errorprone` **Name:** `error_prone_annotations` **Version:** `2.38.0` 
 > - **Manifest Project URL**: [https://errorprone.info/error_prone_annotations](https://errorprone.info/error_prone_annotations)
 > - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
 > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
diff --git a/smoke-tests/apps/AzureSdk/build.gradle.kts b/smoke-tests/apps/AzureSdk/build.gradle.kts
@@ -7,6 +7,5 @@ dependencies {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // want to test with one of the earliest version supported, and not managed version used in agent
-  implementation(enforcedPlatform("com.azure:azure-sdk-bom:1.2.13"))
-  implementation("com.azure:azure-core")
+  implementation("com.azure:azure-core:1.39.0")
 }
diff --git a/smoke-tests/apps/LiveMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LiveMetricsTest.java b/smoke-tests/apps/LiveMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LiveMetricsTest.java
@@ -17,20 +17,10 @@
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
-import com.azure.json.JsonProviders;
-import com.azure.json.JsonReader;
-import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.DocumentIngress;
-import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.DocumentType;
-import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.Exception;
-import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.MetricPoint;
-import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.MonitoringDataPoint;
-import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.Trace;
-import java.io.IOException;
+import com.microsoft.applicationinsights.smoketest.fakeingestion.LiveMetricsVerifier;
 import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import org.awaitility.Awaitility;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -41,135 +31,25 @@ abstract class LiveMetricsTest {
 
   @Test
   @TargetUri("/test")
-  void testTelemetryDataFlow() throws java.lang.Exception {
-    Awaitility.await()
+  void testTelemetryDataFlow() {
+    await()
         .atMost(Duration.ofSeconds(60))
         .until(() -> testing.mockedIngestion.getCountForType("RequestData") == 1);
 
-    PostBodyVerifier postBodyVerifier = new PostBodyVerifier();
+    await()
+        .untilAsserted(
+            () -> {
+              LiveMetricsVerifier verifier = testing.mockedIngestion.getLiveMetrics();
 
-    assertThat(testing.mockedIngestion.isPingReceived()).isTrue();
+              verifier.confirmDocsAreFiltered();
+              verifier.confirmPerfCountersNonZero();
 
-    List<String> postBodies = testing.mockedIngestion.getPostBodies();
-    assertThat(postBodies).hasSizeGreaterThan(0); // should post at least once
-
-    for (String postBody : postBodies) {
-      postBodyVerifier.searchPostBody(postBody);
-    }
-
-    assertThat(postBodyVerifier.hasExceptionDoc()).isTrue();
-    assertThat(postBodyVerifier.hasTraceDoc()).isTrue();
-    assertThat(postBodyVerifier.hasDependency()).isTrue();
-    assertThat(postBodyVerifier.hasRequest()).isTrue();
-  }
-
-  class PostBodyVerifier {
-    boolean foundExceptionDoc = false;
-    boolean foundTraceDoc = false;
-    boolean foundDependency = false;
-    boolean foundRequest = false;
-
-    public void searchPostBody(String postBody) {
-      // Each post body is a list with a singular MonitoringDataPoint
-      List<MonitoringDataPoint> dataPoints = new ArrayList<>();
-      try {
-        JsonReader reader = JsonProviders.createReader(postBody);
-        dataPoints = reader.readArray(MonitoringDataPoint::fromJson);
-      } catch (IOException e) {
-        throw new IllegalStateException("Failed to parse post request body", e);
-      }
-
-      // Because the mock ping/posts should succeed, we should only have one MonitoringDataPoint per
-      // post
-      assertThat(dataPoints).hasSize(1);
-      MonitoringDataPoint dataPoint = dataPoints.get(0);
-
-      List<DocumentIngress> docs = dataPoint.getDocuments();
-      List<MetricPoint> metrics = dataPoint.getMetrics();
-
-      confirmDocsAreFiltered(docs);
-      confirmPerfCountersNonZero(metrics);
-      foundExceptionDoc = foundExceptionDoc || hasException(docs);
-      foundTraceDoc = foundTraceDoc || hasTrace(docs);
-      foundDependency = foundDependency || hasDependency(metrics);
-      foundRequest = foundRequest || hasRequest(metrics);
-    }
-
-    public boolean hasExceptionDoc() {
-      return foundExceptionDoc;
-    }
-
-    public boolean hasTraceDoc() {
-      return foundTraceDoc;
-    }
-
-    public boolean hasDependency() {
-      return foundDependency;
-    }
-
-    public boolean hasRequest() {
-      return foundRequest;
-    }
-
-    private void confirmDocsAreFiltered(List<DocumentIngress> docs) {
-      for (DocumentIngress doc : docs) {
-        assertThat(doc.getDocumentType()).isNotEqualTo(DocumentType.REMOTE_DEPENDENCY);
-        assertThat(doc.getDocumentType()).isNotEqualTo(DocumentType.REQUEST);
-      }
-    }
-
-    private boolean hasException(List<DocumentIngress> docs) {
-      for (DocumentIngress doc : docs) {
-        if (doc.getDocumentType().equals(DocumentType.EXCEPTION)
-            && ((Exception) doc).getExceptionMessage().equals("Fake Exception")) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    private boolean hasTrace(List<DocumentIngress> docs) {
-      for (DocumentIngress doc : docs) {
-        if (doc.getDocumentType().equals(DocumentType.TRACE)
-            && ((Trace) doc).getMessage().equals("This message should generate a trace")) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    private boolean hasDependency(List<MetricPoint> metrics) {
-      for (MetricPoint metric : metrics) {
-        String name = metric.getName();
-        double value = metric.getValue();
-        if (name.equals("\\ApplicationInsights\\Dependency Calls/Sec")) {
-          return value == 1;
-        }
-      }
-      return false;
-    }
-
-    private boolean hasRequest(List<MetricPoint> metrics) {
-      for (MetricPoint metric : metrics) {
-        String name = metric.getName();
-        double value = metric.getValue();
-        if (name.equals("\\ApplicationInsights\\Requests/Sec")) {
-          return value == 1;
-        }
-      }
-      return false;
-    }
-
-    private void confirmPerfCountersNonZero(List<MetricPoint> metrics) {
-      for (MetricPoint metric : metrics) {
-        String name = metric.getName();
-        double value = metric.getValue();
-        if (name.equals("\\Process\\Physical Bytes")
-            || name.equals("\\% Process\\Processor Time Normalized")) {
-          assertThat(value).isNotEqualTo(0);
-        }
-      }
-    }
+              assertThat(verifier.getExceptionCount("Fake Exception")).isEqualTo(1);
+              assertThat(verifier.getTraceCount("This message should generate a trace"))
+                  .isEqualTo(1);
+              assertThat(verifier.getDependencyCountFromMetric()).isEqualTo(1);
+              assertThat(verifier.getRequestCountFromMetric()).isEqualTo(1);
+            });
   }
 
   @Environment(TOMCAT_8_JAVA_8)
diff --git a/smoke-tests/framework/build.gradle.kts b/smoke-tests/framework/build.gradle.kts
@@ -29,4 +29,7 @@ dependencies {
   implementation("ch.qos.logback:logback-classic")
 
   implementation("org.assertj:assertj-core")
+
+  implementation("com.azure:azure-json:1.5.0")
+  implementation("com.azure:azure-monitor-opentelemetry-autoconfigure:1.2.0")
 }
diff --git a/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java b/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java
@@ -39,6 +39,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
+import org.awaitility.core.ConditionTimeoutException;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -75,8 +76,7 @@ public class SmokeTestExtension
   private static final File appFile = new File(System.getProperty("ai.smoke-test.test-app-file"));
 
   // TODO (trask) make private and expose methods on AiSmokeTest(?)
-  protected final MockedAppInsightsIngestionServer mockedIngestion =
-      new MockedAppInsightsIngestionServer();
+  protected final MockedAppInsightsIngestionServer mockedIngestion;
 
   protected final MockedOtlpIngestionServer mockedOtlpIngestion = new MockedOtlpIngestionServer();
 
@@ -167,6 +167,8 @@ public static SmokeTestExtensionBuilder builder() {
     this.jvmArgs = jvmArgs;
     this.useDefaultHttpPort = useDefaultHttpPort;
     this.useOtlpEndpoint = useOtlpEndpoint;
+
+    mockedIngestion = new MockedAppInsightsIngestionServer(useOld3xAgent);
   }
 
   private static String getProfilerEndpoint(ProfilerState profilerState) {
@@ -281,9 +283,24 @@ protected String getAppContext() {
 
   private void clearOutAnyInitLogs() throws Exception {
     if (!skipHealthCheck) {
+      if (!useOld3xAgent) {
+        await().until(mockedIngestion::isReceivingLiveMetrics);
+      }
       String contextRootUrl = getBaseUrl() + "/";
       HttpHelper.getResponseCodeEnsuringSampled(contextRootUrl);
       waitForHealthCheckTelemetry(contextRootUrl);
+      if (!useOld3xAgent) {
+        try {
+          await()
+              .untilAsserted(
+                  () ->
+                      assertThat(mockedIngestion.getLiveMetrics().getRequestCount(contextRootUrl))
+                          .isEqualTo(1));
+        } catch (ConditionTimeoutException e) {
+          // TODO (trask) need to fix race condition in live metrics
+          //  where sometimes it loses telemetry
+        }
+      }
       System.out.println("Clearing any RequestData from health check.");
       mockedIngestion.resetData();
     }
diff --git a/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/fakeingestion/LiveMetricsVerifier.java b/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/fakeingestion/LiveMetricsVerifier.java
diff --git a/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/fakeingestion/MockedAppInsightsIngestionServer.java b/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/fakeingestion/MockedAppInsightsIngestionServer.java
diff --git a/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/fakeingestion/MockedProfilerSettingsServlet.java b/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/fakeingestion/MockedProfilerSettingsServlet.java
diff --git a/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/fakeingestion/MockedQuickPulseServlet.java b/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/fakeingestion/MockedQuickPulseServlet.java

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ public void setException(Throwable throwable, int stackSize) {`
`56`	`56`	`this.throwable = throwable;`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ @SuppressWarnings("EnumOrdinal")`
`59`	`60`	`public void setSeverityLevel(SeverityLevel severityLevel) {`
`60`	`61`	`data.setSeverityLevel(`
`61`	`62`	`severityLevel == null`
`@@ -65,6 +66,7 @@ public void setSeverityLevel(SeverityLevel severityLevel) {`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`@Nullable`
	`69`	`+ @SuppressWarnings("EnumOrdinal")`
`68`	`70`	`public SeverityLevel getSeverityLevel() {`
`69`	`71`	`return data.getSeverityLevel() == null`
`70`	`72`	`? null`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public void setMessage(String message) {`
`47`	`47`	`data.setMessage(message);`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ @SuppressWarnings("EnumOrdinal")`
`50`	`51`	`public void setSeverityLevel(SeverityLevel severityLevel) {`
`51`	`52`	`data.setSeverityLevel(`
`52`	`53`	`severityLevel == null`
`@@ -56,6 +57,7 @@ public void setSeverityLevel(SeverityLevel severityLevel) {`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`@Nullable`
	`60`	`+ @SuppressWarnings("EnumOrdinal")`
`59`	`61`	`public SeverityLevel getSeverityLevel() {`
`60`	`62`	`return data.getSeverityLevel() == null`
`61`	`63`	`? null`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,5 @@ dependencies {`
`7`	`7`	`exclude("org.springframework.boot", "spring-boot-starter-tomcat")`
`8`	`8`	`}`
`9`	`9`	`// want to test with one of the earliest version supported, and not managed version used in agent`
`10`		`- implementation(enforcedPlatform("com.azure:azure-sdk-bom:1.2.13"))`
`11`		`- implementation("com.azure:azure-core")`
	`10`	`+ implementation("com.azure:azure-core:1.39.0")`
`12`	`11`	`}`