From 3ad1a07cde1b60f98e44632d8233e247b93cf275 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 15 Sep 2025 10:28:00 -0700 Subject: [PATCH 1/5] Update otel --- dependencyManagement/build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 8ec35c24b29..94e458979b1 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -7,9 +7,9 @@ data class DependencySet(val group: String, val version: String, val modules: Li val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions -val otelSdkVersion = "1.53.0" -val otelInstrumentationAlphaVersion = "2.19.0-alpha" -val otelInstrumentationVersion = "2.19.0" +val otelSdkVersion = "1.54.0" +val otelInstrumentationAlphaVersion = "2.20.0-alpha" +val otelInstrumentationVersion = "2.20.0" val otelContribVersion = "1.48.0" rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion From 328e4c29292e37509aa0ff07eedef1891d7e0a3c Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 15 Oct 2025 15:59:29 -0700 Subject: [PATCH 2/5] fix --- .../SpringBootControllerSpansEnabledTest.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) 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 index 1a4ea537690..36b0d5ae59e 100644 --- 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 @@ -117,25 +117,21 @@ void testAsyncDependencyCall() throws Exception { Envelope rdEnvelope = rdList.get(0); String operationId = rdEnvelope.getTags().get("ai.operation.id"); List rddList = - testing.mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 3, operationId); + testing.mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 2, operationId); assertThat(testing.mockedIngestion.getCountForType("EventData")).isZero(); Envelope rddEnvelope1 = rddList.get(0); Envelope rddEnvelope2 = rddList.get(1); - Envelope rddEnvelope3 = rddList.get(2); assertThat(rdEnvelope.getSampleRate()).isNull(); assertThat(rddEnvelope1.getSampleRate()).isNull(); assertThat(rddEnvelope2.getSampleRate()).isNull(); - assertThat(rddEnvelope3.getSampleRate()).isNull(); RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData(); RemoteDependencyData rdd1 = (RemoteDependencyData) ((Data) rddEnvelope1.getData()).getBaseData(); RemoteDependencyData rdd2 = (RemoteDependencyData) ((Data) rddEnvelope2.getData()).getBaseData(); - RemoteDependencyData rdd3 = - (RemoteDependencyData) ((Data) rddEnvelope3.getData()).getBaseData(); assertThat(rd.getName()).isEqualTo("GET /SpringBoot/asyncDependencyCall"); assertThat(rd.getResponseCode()).isEqualTo("200"); @@ -157,22 +153,9 @@ void testAsyncDependencyCall() throws Exception { .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True")); assertThat(rdd2.getSuccess()).isTrue(); - // TODO (trask): why is spring-webmvc instrumentation capturing this twice? - assertThat(rdd3.getName()).isEqualTo("TestController.asyncDependencyCall"); - assertThat(rdd3.getProperties()).isEmpty(); - assertThat(rdd3.getSuccess()).isTrue(); - SmokeTestExtension.assertParentChild( rd, rdEnvelope, rddEnvelope1, "GET /SpringBoot/asyncDependencyCall"); SmokeTestExtension.assertParentChild( rdd1, rddEnvelope1, rddEnvelope2, "GET /SpringBoot/asyncDependencyCall"); - try { - SmokeTestExtension.assertParentChild( - rdd1, rddEnvelope1, rddEnvelope3, "GET /SpringBoot/asyncDependencyCall"); - } catch (AssertionError e) { - // on wildfly the duplicate controller spans is nested under the request span for some reason - SmokeTestExtension.assertParentChild( - rd, rdEnvelope, rddEnvelope3, "GET /SpringBoot/asyncDependencyCall"); - } } } From e3476c09f91739bf0887287dcb6e0d3a313660c5 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 20 Oct 2025 13:10:56 -0700 Subject: [PATCH 3/5] Update lock files --- agent/agent-bootstrap/gradle.lockfile | 8 +++--- agent/agent-for-testing/gradle.lockfile | 8 +++--- .../gc-monitor-api/gradle.lockfile | 8 +++--- .../gc-monitor-core/gradle.lockfile | 8 +++--- .../gc-monitor-tests/gradle.lockfile | 8 +++--- .../agent-alerting-api/gradle.lockfile | 8 +++--- .../agent-alerting/gradle.lockfile | 8 +++--- .../agent-diagnostics-api/gradle.lockfile | 8 +++--- .../agent-diagnostics-jfr/gradle.lockfile | 8 +++--- .../agent-diagnostics/gradle.lockfile | 8 +++--- agent/agent-tooling/gradle.lockfile | 28 +++++++++---------- agent/agent/gradle.lockfile | 8 +++--- .../gradle.lockfile | 8 +++--- .../gradle.lockfile | 8 +++--- .../azure-functions/gradle.lockfile | 8 +++--- agent/instrumentation/methods/gradle.lockfile | 8 +++--- .../micrometer-1.0/gradle.lockfile | 8 +++--- agent/runtime-attach/gradle.lockfile | 8 +++--- classic-sdk/core/gradle.lockfile | 8 +++--- classic-sdk/web/gradle.lockfile | 8 +++--- etw/java/gradle.lockfile | 8 +++--- 21 files changed, 94 insertions(+), 94 deletions(-) diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/agent/agent-for-testing/gradle.lockfile +++ b/agent/agent-for-testing/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile index 15f88624535..f990373d986 100644 --- a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath com.google.errorprone:error_prone_annotations:2.42.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index 15f88624535..f990373d986 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath com.google.errorprone:error_prone_annotations:2.42.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/agent/agent-profiler/agent-alerting-api/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting-api/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index bfa9c0d6865..d73bbbb15ef 100644 --- a/agent/agent-profiler/agent-alerting/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-json:1.5.0=runtimeClasspath com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics/gradle.lockfile b/agent/agent-profiler/agent-diagnostics/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/agent/agent-profiler/agent-diagnostics/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index 814ae987f38..4a31cfc2a78 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -52,20 +52,20 @@ io.netty:netty-transport-native-kqueue:4.2.7.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.2.7.Final=runtimeClasspath io.netty:netty-transport:4.2.7.Final=runtimeClasspath io.opentelemetry.contrib:opentelemetry-jfr-connection:1.48.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-api:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-common:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-context:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-common:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-metrics:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-trace:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-api:1.54.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath +io.opentelemetry:opentelemetry-common:1.54.0=runtimeClasspath +io.opentelemetry:opentelemetry-context:1.54.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.54.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.54.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.54.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.54.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.54.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.54.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk:1.54.0=runtimeClasspath io.projectreactor.netty:reactor-netty-core:1.2.9=runtimeClasspath io.projectreactor.netty:reactor-netty-http:1.2.9=runtimeClasspath io.projectreactor:reactor-core:3.7.9=runtimeClasspath diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/agent/agent/gradle.lockfile +++ b/agent/agent/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile +++ b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile +++ b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/agent/instrumentation/azure-functions/gradle.lockfile +++ b/agent/instrumentation/azure-functions/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/agent/instrumentation/methods/gradle.lockfile +++ b/agent/instrumentation/methods/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/agent/instrumentation/micrometer-1.0/gradle.lockfile +++ b/agent/instrumentation/micrometer-1.0/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile index e52457fabfe..68e88f046f7 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.48.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath net.bytebuddy:byte-buddy-agent:1.17.6=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/classic-sdk/core/gradle.lockfile +++ b/classic-sdk/core/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile index 7d09b62c490..aa4da04b353 100644 --- a/classic-sdk/web/gradle.lockfile +++ b/classic-sdk/web/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index bd050697037..71692f872b3 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.7.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.20.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.54.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.54.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath From 4cc302f8e73495dc458da834d66662546b50305e Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 23 Oct 2025 14:08:47 -0700 Subject: [PATCH 4/5] WORK IN PROGRESS --- smoke-tests/apps/SpringBoot/build.gradle.kts | 6 +- .../smoketestapp/SpringBootApp.java | 20 ++-- .../smoketestapp/TestController.java | 6 -- .../smoketest/SpringBootTest.java | 100 ------------------ 4 files changed, 11 insertions(+), 121 deletions(-) diff --git a/smoke-tests/apps/SpringBoot/build.gradle.kts b/smoke-tests/apps/SpringBoot/build.gradle.kts index 50dbe4b807d..161f3d8de25 100644 --- a/smoke-tests/apps/SpringBoot/build.gradle.kts +++ b/smoke-tests/apps/SpringBoot/build.gradle.kts @@ -3,13 +3,9 @@ plugins { } dependencies { - implementation("com.microsoft.azure:applicationinsights-spring-boot-starter:2.6.4") - - implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") { + implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") { exclude("org.springframework.boot", "spring-boot-starter-tomcat") } - // this dependency is needed to make wildfly happy - implementation("org.reactivestreams:reactive-streams:1.0.3") implementation("org.apache.httpcomponents:httpclient:4.5.13") } diff --git a/smoke-tests/apps/SpringBoot/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java b/smoke-tests/apps/SpringBoot/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java index ba06b8b9e6e..351065eacaa 100644 --- a/smoke-tests/apps/SpringBoot/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java +++ b/smoke-tests/apps/SpringBoot/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java @@ -35,14 +35,14 @@ public static void main(String[] args) { SpringApplication.run(SpringBootApp.class, args); } - @Bean - public Executor taskExecutor() { - ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - executor.setCorePoolSize(2); - executor.setMaxPoolSize(2); - executor.setQueueCapacity(500); - executor.setThreadNamePrefix("AsyncTaskExecutor-"); - executor.initialize(); - return executor; - } + // @Bean + // public Executor taskExecutor() { + // ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); + // executor.setCorePoolSize(2); + // executor.setMaxPoolSize(2); + // executor.setQueueCapacity(500); + // executor.setThreadNamePrefix("AsyncTaskExecutor-"); + // executor.initialize(); + // return executor; + // } } diff --git a/smoke-tests/apps/SpringBoot/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java b/smoke-tests/apps/SpringBoot/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java index bfda47a1ba0..cec199cbf62 100644 --- a/smoke-tests/apps/SpringBoot/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java +++ b/smoke-tests/apps/SpringBoot/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java @@ -3,7 +3,6 @@ package com.microsoft.applicationinsights.smoketestapp; -import com.microsoft.applicationinsights.TelemetryClient; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -16,8 +15,6 @@ @RestController public class TestController { - private static final TelemetryClient client = new TelemetryClient(); - @Autowired private TestBean testBean; @GetMapping("/") @@ -40,9 +37,6 @@ public String trackEventSpringBoot() { } }; - // Event - client.trackEvent("EventDataTest"); - client.trackEvent("EventDataPropertyTest", properties, metrics); return "hello"; } 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 index 0d79753d4ce..e06cdba6ff0 100644 --- 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 @@ -35,73 +35,6 @@ abstract class SpringBootTest { @RegisterExtension static final SmokeTestExtension testing = SmokeTestExtension.create(); - @Test - @TargetUri("/basic/trackEvent") - void trackEvent() throws Exception { - List rdList = testing.mockedIngestion.waitForItems("RequestData", 1); - Envelope rdEnvelope = rdList.get(0); - String operationId = rdEnvelope.getTags().get("ai.operation.id"); - - testing.mockedIngestion.waitForItemsInOperation("EventData", 2, operationId); - - // TODO get event data envelope and verify value - List data = testing.mockedIngestion.getTelemetryDataByTypeInRequest("EventData"); - - assertThat(data).anySatisfy(ed -> assertThat(ed.getName()).isEqualTo("EventDataTest")); - - assertThat(data) - .anySatisfy( - ed -> { - assertThat(ed.getName()).isEqualTo("EventDataPropertyTest"); - assertThat(ed.getProperties()).containsEntry("key", "value"); - assertThat(ed.getMeasurements()).containsEntry("key", 1.0); - }); - } - - @Test - @TargetUri("/throwsException") - void testResultCodeWhenRestControllerThrows() throws Exception { - List rdList = testing.mockedIngestion.waitForItems("RequestData", 1); - - Envelope rdEnvelope = rdList.get(0); - List exceptions = testing.mockedIngestion.waitForItems("ExceptionData", 1); - assertThat(exceptions).hasSize(1); - assertThat(testing.mockedIngestion.getCountForType("EventData")).isZero(); - - 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 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"); - } - @Test @TargetUri("/asyncDependencyCall") void testAsyncDependencyCall() throws Exception { @@ -141,37 +74,4 @@ void testAsyncDependencyCall() throws Exception { @Environment(TOMCAT_8_JAVA_8) static class Tomcat8Java8Test extends SpringBootTest {} - - @Environment(TOMCAT_8_JAVA_8_OPENJ9) - static class Tomcat8Java8OpenJ9Test extends SpringBootTest {} - - @Environment(TOMCAT_8_JAVA_11) - static class Tomcat8Java11Test extends SpringBootTest {} - - @Environment(TOMCAT_8_JAVA_11_OPENJ9) - static class Tomcat8Java11OpenJ9Test extends SpringBootTest {} - - @Environment(TOMCAT_8_JAVA_17) - static class Tomcat8Java17Test extends SpringBootTest {} - - @Environment(TOMCAT_8_JAVA_17_OPENJ9) - static class Tomcat8Java17OpenJ9Test extends SpringBootTest {} - - @Environment(TOMCAT_8_JAVA_21) - static class Tomcat8Java21Test extends SpringBootTest {} - - @Environment(TOMCAT_8_JAVA_21_OPENJ9) - static class Tomcat8Java21OpenJ9Test extends SpringBootTest {} - - @Environment(TOMCAT_8_JAVA_25) - static class Tomcat8Java23Test extends SpringBootTest {} - - @Environment(TOMCAT_8_JAVA_25_OPENJ9) - static class Tomcat8Java23OpenJ9Test extends SpringBootTest {} - - @Environment(WILDFLY_13_JAVA_8) - static class Wildfly13Java8Test extends SpringBootTest {} - - @Environment(WILDFLY_13_JAVA_8_OPENJ9) - static class Wildfly13Java8OpenJ9Test extends SpringBootTest {} } From ca74f50c2a3615e8aba63e8c0e6a4f7b3e3addbd Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 23 Oct 2025 14:09:26 -0700 Subject: [PATCH 5/5] wip --- WORK_IN_PROGRESS.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 WORK_IN_PROGRESS.txt diff --git a/WORK_IN_PROGRESS.txt b/WORK_IN_PROGRESS.txt new file mode 100644 index 00000000000..77d319e45e0 --- /dev/null +++ b/WORK_IN_PROGRESS.txt @@ -0,0 +1 @@ +./gradlew :smoke-tests:apps:SpringBoot:smokeTest --tests "*SpringBootTest\$Tomcat8Java8Test"