diff --git a/agent/agent-bootstrap/build.gradle.kts b/agent/agent-bootstrap/build.gradle.kts index 4246c0f0ab5..e149bc1f6d3 100644 --- a/agent/agent-bootstrap/build.gradle.kts +++ b/agent/agent-bootstrap/build.gradle.kts @@ -8,4 +8,5 @@ dependencies { // TODO (heya) remove this when updating to upstream micrometer instrumentation compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api") compileOnly("io.opentelemetry:opentelemetry-semconv") + compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv") } diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/agent-bootstrap/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java b/agent/agent-bootstrap/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java index 49433e6da6a..1d2ee457541 100644 --- a/agent/agent-bootstrap/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java +++ b/agent/agent-bootstrap/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java @@ -12,12 +12,15 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; +import io.opentelemetry.instrumentation.api.instrumenter.http.internal.HttpAttributes; +import io.opentelemetry.instrumentation.api.instrumenter.network.internal.NetworkAttributes; +import io.opentelemetry.instrumentation.api.instrumenter.url.internal.UrlAttributes; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.util.HashSet; import java.util.Set; import java.util.function.BiConsumer; -// copied from OpenTelemetry Instrumentation 1.18.0 +// copied from OpenTelemetry Instrumentation 1.29.0 // this is temporary, see // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/3962#issuecomment-906606325 @@ -35,7 +38,13 @@ private static Set buildDurationAlwaysInclude() { Set view = new HashSet<>(); view.add(SemanticAttributes.HTTP_METHOD); view.add(SemanticAttributes.HTTP_STATUS_CODE); // Optional - view.add(SemanticAttributes.HTTP_FLAVOR); // Optional + view.add(SemanticAttributes.NET_PROTOCOL_NAME); // Optional + view.add(SemanticAttributes.NET_PROTOCOL_VERSION); // Optional + // stable semconv + view.add(HttpAttributes.HTTP_REQUEST_METHOD); + view.add(HttpAttributes.HTTP_RESPONSE_STATUS_CODE); + view.add(NetworkAttributes.NETWORK_PROTOCOL_NAME); + view.add(NetworkAttributes.NETWORK_PROTOCOL_VERSION); return view; } @@ -47,6 +56,10 @@ private static Set buildDurationClientView() { view.add(SemanticAttributes.NET_PEER_NAME); view.add(SemanticAttributes.NET_PEER_PORT); view.add(SemanticAttributes.NET_SOCK_PEER_ADDR); + // stable semconv + view.add(NetworkAttributes.SERVER_SOCKET_ADDRESS); + view.add(NetworkAttributes.SERVER_ADDRESS); + view.add(NetworkAttributes.SERVER_PORT); return view; } @@ -61,6 +74,8 @@ private static Set buildDurationServerView() { view.add(SemanticAttributes.NET_HOST_NAME); view.add(SemanticAttributes.NET_HOST_PORT); view.add(SemanticAttributes.HTTP_ROUTE); + // stable semconv + view.add(UrlAttributes.URL_SCHEME); // START APPLICATION INSIGHTS MODIFICATIONS view.add(SemanticAttributes.USER_AGENT_ORIGINAL); // END APPLICATION INSIGHTS MODIFICATIONS @@ -73,9 +88,11 @@ private static Set buildActiveRequestsView() { Set view = new HashSet<>(); view.add(SemanticAttributes.HTTP_METHOD); view.add(SemanticAttributes.HTTP_SCHEME); - view.add(SemanticAttributes.HTTP_FLAVOR); view.add(SemanticAttributes.NET_HOST_NAME); view.add(SemanticAttributes.NET_HOST_PORT); + // stable semconv + view.add(HttpAttributes.HTTP_REQUEST_METHOD); + view.add(UrlAttributes.URL_SCHEME); return view; } diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/agent-for-testing/gradle.lockfile +++ b/agent/agent-for-testing/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=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 d33159798b1..39d7c0f08c1 100644 --- a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile @@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.errorprone:error_prone_annotations:2.21.1=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.slf4j:slf4j-api:2.0.7=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index d33159798b1..39d7c0f08c1 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile @@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.errorprone:error_prone_annotations:2.21.1=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.slf4j:slf4j-api:2.0.7=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/agent-profiler/agent-alerting-api/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting-api/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index 048df657d73..17e31aa7626 100644 --- a/agent/agent-profiler/agent-alerting/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.slf4j:slf4j-api:2.0.7=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics-serialization/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-serialization/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/agent-profiler/agent-diagnostics-serialization/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-serialization/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics/gradle.lockfile b/agent/agent-profiler/agent-diagnostics/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/agent-profiler/agent-diagnostics/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index f0a3de2d5b1..1b57d34d3d5 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -57,21 +57,21 @@ io.netty:netty-transport-native-epoll:4.1.97.Final=runtimeClasspath io.netty:netty-transport-native-kqueue:4.1.97.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.1.97.Final=runtimeClasspath io.netty:netty-transport:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-api-events:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-api:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-context:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-extension-incubator:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-common:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-metrics:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-trace:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-semconv:1.28.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-api-events:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-api:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-context:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-extension-incubator:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-semconv:1.29.0-alpha=runtimeClasspath io.projectreactor.netty:reactor-netty-core:1.1.10=runtimeClasspath io.projectreactor.netty:reactor-netty-http:1.1.10=runtimeClasspath io.projectreactor:reactor-core:3.5.9=runtimeClasspath diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java index 7e779be8654..a9c3bd191e1 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java @@ -139,7 +139,7 @@ private static void enableInstrumentations( properties.put("otel.instrumentation.apache-httpasyncclient.enabled", "true"); properties.put("otel.instrumentation.apache-httpclient.enabled", "true"); properties.put("otel.instrumentation.async-http-client.enabled", "true"); - properties.put("otel.instrumentation.executor.enabled", "true"); + properties.put("otel.instrumentation.executors.enabled", "true"); properties.put("otel.instrumentation.google-http-client.enabled", "true"); properties.put("otel.instrumentation.grpc.enabled", "true"); properties.put("otel.instrumentation.guava.enabled", "true"); diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/PreAggregatedMetricsTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/PreAggregatedMetricsTest.java index 8e26e07b6b5..85642fb12d3 100644 --- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/PreAggregatedMetricsTest.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/PreAggregatedMetricsTest.java @@ -110,8 +110,6 @@ void generateHttpClientMetrics() { System.out.println("metric: " + metricData); } - assertThat(metricDataCollection.size()).isEqualTo(3); - assertThat(metricDataCollection) .satisfiesExactly( metric -> @@ -132,9 +130,7 @@ void generateHttpClientMetrics() { exemplar -> exemplar .hasTraceId("ff01020304050600ff0a0b0c0d0e0f00") - .hasSpanId("090a0b0c0d0e0f00")))), - metric -> assertThat(metric).hasName("http.client.request.size"), - metric -> assertThat(metric).hasName("http.client.response.size")); + .hasSpanId("090a0b0c0d0e0f00"))))); MetricTelemetryBuilder builder = MetricTelemetryBuilder.create(); MetricData metricData = metricDataCollection.iterator().next(); diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/agent/gradle.lockfile +++ b/agent/agent/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile +++ b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile +++ b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/instrumentation/azure-functions/gradle.lockfile +++ b/agent/instrumentation/azure-functions/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/instrumentation/methods/gradle.lockfile +++ b/agent/instrumentation/methods/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/agent/instrumentation/micrometer-1.0/gradle.lockfile +++ b/agent/instrumentation/micrometer-1.0/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile index 4f563c8307d..24a731cecd9 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.18.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath net.bytebuddy:byte-buddy-agent:1.11.18=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/classic-sdk/core/gradle.lockfile +++ b/classic-sdk/core/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile index 64c4600e357..680563550b2 100644 --- a/classic-sdk/web/gradle.lockfile +++ b/classic-sdk/web/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath empty= diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index b03afb5058e..f6c0fc0a9d4 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -11,9 +11,9 @@ data class DependencySet(val group: String, val version: String, val modules: Li val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions -val otelVersion = "1.28.0" -val otelInstrumentationAlphaVersion = "1.28.0-alpha" -val otelInstrumentationVersion = "1.28.0" +val otelVersion = "1.29.0" +val otelInstrumentationAlphaVersion = "1.29.0-alpha" +val otelInstrumentationVersion = "1.29.0" val otelContribAlphaVersion = "1.18.0-alpha" rootProject.extra["otelVersion"] = otelVersion diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index 048df657d73..17e31aa7626 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.16=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=runtimeClasspath com.google.guava:guava-bom:32.1.2-jre=runtimeClasspath io.netty:netty-bom:4.1.97.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.28.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.28.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.28.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.29.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.29.0=runtimeClasspath org.junit:junit-bom:5.10.0=runtimeClasspath org.slf4j:slf4j-api:2.0.7=runtimeClasspath org.testcontainers:testcontainers-bom:1.19.0=runtimeClasspath diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 809de77db01..55ed3946de7 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2023-08-24 15:22:21 UTC_ +_2023-08-25 14:44:53 PDT_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.15.2` @@ -182,47 +182,47 @@ _2023-08-24 15:22:21 UTC_ > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**34** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.28.0` +**34** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.29.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**35** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-events` **Version:** `1.28.0-alpha` +**35** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-events` **Version:** `1.29.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**36** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.28.0` +**36** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.29.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**37** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-incubator` **Version:** `1.28.0-alpha` +**37** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-incubator` **Version:** `1.29.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**38** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.28.0` +**38** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.29.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**39** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.28.0` +**39** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.29.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**40** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.28.0` +**40** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.29.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**41** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.28.0` +**41** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.29.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**42** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.28.0` +**42** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.29.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**43** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.28.0` +**43** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.29.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**44** **Group:** `io.opentelemetry` **Name:** `opentelemetry-semconv` **Version:** `1.28.0-alpha` +**44** **Group:** `io.opentelemetry` **Name:** `opentelemetry-semconv` **Version:** `1.29.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **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/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java b/smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java index 8241dbce1f2..d62554c45c8 100644 --- 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 @@ -3,7 +3,6 @@ package com.microsoft.applicationinsights.smoketest; -import static java.util.Collections.singleton; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; @@ -29,7 +28,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; @@ -47,7 +45,6 @@ import org.testcontainers.containers.FixedHostPortGenericContainer; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; -import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy; import org.testcontainers.utility.DockerImageName; @SuppressWarnings({"SystemOut", "InterruptedExceptionSwallowed"}) @@ -379,15 +376,7 @@ private void startTestApplicationContainer() throws Exception { container = new FixedHostPortGenericContainer<>(currentImageName) .withFixedExposedPort(5005, 5005) - .waitingFor( - new HostPortWaitStrategy() { - @Override - protected Set getLivenessCheckPorts() { - // this prevents ping to 5005 which causes the JVM to log a warning - // "Debugger failed to attach: handshake failed" - return singleton(8080); - } - }.withStartupTimeout(Duration.ofMinutes(5))); + .withStartupTimeout(Duration.ofMinutes(5)); } else { container = new GenericContainer<>(currentImageName); } @@ -416,7 +405,8 @@ protected Set getLivenessCheckPorts() { "-Dapplicationinsights.testing.global-ingestion-endpoint=" + FAKE_INGESTION_ENDPOINT); } if (REMOTE_DEBUG) { - javaToolOptions.add("-agentlib:jdwp=transport=dt_socket,address=*:5005,server=y,suspend=y"); + javaToolOptions.add( + "-agentlib:jdwp=transport=dt_socket,address=0.0.0.0:5005,server=y,suspend=y"); } if (useAgent) { javaToolOptions.add("-javaagent:/applicationinsights-agent.jar");