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

Author: trask

.github/workflows/build-common.yml

@@ -117,7 +117,8 @@ jobs:
           - 8
           - 11
           - 17
-          - 18
+          - 21
+          - 23
         vm:
           - hotspot
           # TODO (trask) enable once profiler supports OpenJ9

CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## Version 3.6.2 GA (10/23/2024)
+
+### Enhancements
+
+* Update to OpenTelemetry Java Instrumentation [2.9.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.9.0)
+  ([#3917](https://github.com/microsoft/ApplicationInsights-Java/pull/3917))
+
+* Update azure-monitor-opentelemetry-exporter to [1.0.0-beta.31](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md#100-beta31-2024-10-23)
+  ([#3917](https://github.com/microsoft/ApplicationInsights-Java/pull/3932))
+  Note: This version of the exporter includes a fix for [restoring self-diagnostic logging](https://github.com/Azure/azure-sdk-for-java/pull/42451)
+
 ## Version 3.6.1 GA (10/09/2024)
 
 ### Bug fixes

agent/agent-bootstrap/gradle.lockfile

@@ -1,7 +1,8 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
+com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
+com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
 io.netty:netty-bom:4.1.114.Final=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath

agent/agent-for-testing/gradle.lockfile

@@ -1,7 +1,8 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
+com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
+com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
 io.netty:netty-bom:4.1.114.Final=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath

agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile

@@ -1,7 +1,8 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
+com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
+com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
 com.google.errorprone:error_prone_annotations:2.34.0=runtimeClasspath
 io.netty:netty-bom:4.1.114.Final=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath

agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile

@@ -1,7 +1,8 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
+com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
+com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
 com.google.errorprone:error_prone_annotations:2.34.0=runtimeClasspath
 io.netty:netty-bom:4.1.114.Final=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath

agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile

@@ -1,7 +1,8 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
+com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
+com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
 io.netty:netty-bom:4.1.114.Final=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath

agent/agent-gc-monitor/gc-monitor-tests/src/test/java/com/microsoft/gcmonitortests/VariousCollectorsTest.java

@@ -6,6 +6,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.condition.JRE.JAVA_11;
 import static org.junit.jupiter.api.condition.JRE.JAVA_13;
+import static org.junit.jupiter.api.condition.JRE.JAVA_17;
 import static org.junit.jupiter.api.condition.OS.LINUX;
 
 import com.microsoft.gcmonitor.GcCollectionEvent;
@@ -19,6 +20,7 @@
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.api.condition.EnabledOnOs;
 
+@Disabled // TODO (trask) too flaky since we stopped re-running tests automatically on failure
 class VariousCollectorsTest {
 
   @Test
@@ -33,6 +35,8 @@ void testParallel() throws Exception {
   }
 
   @Test
+  // see https://github.com/microsoft/ApplicationInsights-Java/pull/3878#issuecomment-2431980712
+  @EnabledForJreRange(max = JAVA_17)
   void testG1() throws Exception {
     testGc("-XX:+UseG1GC", 50);
   }
@@ -42,7 +46,7 @@ void testSerial() throws Exception {
     testGc("-XX:+UseSerialGC", 50);
   }
 
-  @Disabled
+  @Disabled // see https://github.com/microsoft/ApplicationInsights-Java/pull/3083
   @Test
   @EnabledForJreRange(min = JAVA_11)
   void testShenandoah() throws Exception {

agent/agent-profiler/agent-alerting-api/gradle.lockfile

@@ -1,7 +1,8 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
+com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
+com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
 io.netty:netty-bom:4.1.114.Final=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath

agent/agent-profiler/agent-alerting/gradle.lockfile

@@ -2,7 +2,8 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.azure:azure-json:1.3.0=runtimeClasspath
-com.azure:azure-sdk-bom:1.2.28=runtimeClasspath
+com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
+com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
 io.netty:netty-bom:4.1.114.Final=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath