diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 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.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=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 38681186323..d03d888fdaf 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.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath com.google.errorprone:error_prone_annotations:2.46.0=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index 38681186323..d03d888fdaf 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.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath com.google.errorprone:error_prone_annotations:2.46.0=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 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.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 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.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index b97762e5650..1c05ef1bdcb 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.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 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.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 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.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics/gradle.lockfile b/agent/agent-profiler/agent-diagnostics/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 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.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index 03cc3888238..f337269b73d 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -51,21 +51,21 @@ io.netty:netty-transport-native-epoll:4.2.9.Final=runtimeClasspath io.netty:netty-transport-native-kqueue:4.2.9.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.2.9.Final=runtimeClasspath io.netty:netty-transport:4.2.9.Final=runtimeClasspath -io.opentelemetry.contrib:opentelemetry-jfr-connection:1.52.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-api:1.57.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath -io.opentelemetry:opentelemetry-common:1.57.0=runtimeClasspath -io.opentelemetry:opentelemetry-context:1.57.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-common:1.57.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.57.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.57.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.57.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-metrics:1.57.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-trace:1.57.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk:1.57.0=runtimeClasspath +io.opentelemetry.contrib:opentelemetry-jfr-connection:1.53.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-api:1.58.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath +io.opentelemetry:opentelemetry-common:1.58.0=runtimeClasspath +io.opentelemetry:opentelemetry-context:1.58.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.58.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.58.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.58.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.58.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.58.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.58.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk:1.58.0=runtimeClasspath io.projectreactor.netty:reactor-netty-core:1.2.10=runtimeClasspath io.projectreactor.netty:reactor-netty-http:1.2.10=runtimeClasspath io.projectreactor:reactor-core:3.7.11=runtimeClasspath diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AfterAgentListener.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AfterAgentListener.java index c1e31125200..7318ff91165 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AfterAgentListener.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AfterAgentListener.java @@ -5,6 +5,7 @@ import com.google.auto.service.AutoService; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; +import com.microsoft.applicationinsights.agent.internal.configuration.SnippetConfiguration; import com.microsoft.applicationinsights.agent.internal.httpclient.LazyHttpClient; import com.microsoft.applicationinsights.agent.internal.profiler.ProfilingInitializer; import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient; @@ -29,6 +30,11 @@ public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetr PerformanceCounterInitializer.initialize(configuration); TelemetryClient telemetryClient = TelemetryClient.getActive(); + if (configuration.preview.browserSdkLoader.enabled + && telemetryClient != null + && telemetryClient.getConnectionString() != null) { + SnippetConfiguration.initializeSnippet(configuration.connectionString); + } if (configuration.preview.profiler.enabled && telemetryClient != null && telemetryClient.getConnectionString() != null) { 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 5d17bb98b64..e0b44d7aa40 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 @@ -22,9 +22,10 @@ public Map apply(ConfigProperties otelConfig) { Map properties = new HashMap<>(); - properties.put( - "applicationinsights.internal.micrometer.step.millis", - Long.toString(SECONDS.toMillis(configuration.metricIntervalSeconds))); + String stepMillisValue = Long.toString(SECONDS.toMillis(configuration.metricIntervalSeconds)); + properties.put("applicationinsights.internal.micrometer.step.millis", stepMillisValue); + // also set as system property so that instrumentation modules can read it + System.setProperty("applicationinsights.internal.micrometer.step.millis", stepMillisValue); properties.put( "otel.metric.export.interval", @@ -102,6 +103,8 @@ public Map apply(ConfigProperties otelConfig) { sb.append(']'); } properties.put("applicationinsights.internal.methods.include", sb.toString()); + // also set as system property so that instrumentation modules can read it + System.setProperty("applicationinsights.internal.methods.include", sb.toString()); } properties.put("otel.propagators", DelegatingPropagatorProvider.NAME); @@ -223,6 +226,8 @@ private static void enableInstrumentations( String namespace = config.instrumentation.micrometer.namespace; if (namespace != null) { properties.put("applicationinsights.internal.micrometer.namespace", namespace); + // also set as system property so that instrumentation modules can read it + System.setProperty("applicationinsights.internal.micrometer.namespace", namespace); } if (config.instrumentation.azureSdk.enabled) { properties.put("otel.instrumentation.azure-core.enabled", "true"); diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java index 39cbfa39bde..8e0b4b12a2f 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java @@ -23,7 +23,6 @@ import io.opentelemetry.javaagent.bootstrap.InternalLogger; import io.opentelemetry.javaagent.bootstrap.JavaagentFileHolder; import io.opentelemetry.javaagent.tooling.LoggingCustomizer; -import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig; import java.io.File; import java.io.FileOutputStream; import java.io.OutputStreamWriter; @@ -77,7 +76,7 @@ public String name() { } @Override - public void init(EarlyInitAgentConfig earlyConfig) { + public void init() { try { if (DEBUG_SIGNED_JAR_ACCESS) { JarVerifierClassFileTransformer transformer = new JarVerifierClassFileTransformer(); diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java index 6cc887b40ab..ee8323465be 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java @@ -34,7 +34,6 @@ import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.SamplingTelemetryType; import com.microsoft.applicationinsights.agent.internal.configuration.ConfigurationBuilder; import com.microsoft.applicationinsights.agent.internal.configuration.RpConfiguration; -import com.microsoft.applicationinsights.agent.internal.configuration.SnippetConfiguration; import com.microsoft.applicationinsights.agent.internal.exporter.AgentLogExporter; import com.microsoft.applicationinsights.agent.internal.exporter.AgentMetricExporter; import com.microsoft.applicationinsights.agent.internal.exporter.AgentSpanExporter; @@ -214,12 +213,6 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) { initStatsbeatFeatureSet(configuration)); } - if (telemetryClient.getConnectionString() != null) { - if (configuration.preview.browserSdkLoader.enabled) { - SnippetConfiguration.initializeSnippet(configuration.connectionString); - } - } - // TODO (trask) add this method to AutoConfigurationCustomizer upstream? ((AutoConfiguredOpenTelemetrySdkBuilder) autoConfiguration).disableShutdownHook(); diff --git a/agent/agent/build.gradle.kts b/agent/agent/build.gradle.kts index a8f6051973f..752f970b21b 100644 --- a/agent/agent/build.gradle.kts +++ b/agent/agent/build.gradle.kts @@ -84,6 +84,7 @@ tasks { exclude(dependency("io.opentelemetry:opentelemetry-api")) exclude(dependency("io.opentelemetry:opentelemetry-context")) exclude(dependency("io.opentelemetry:opentelemetry-api-incubator")) + exclude(dependency("io.opentelemetry:opentelemetry-common")) } } diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 100644 --- a/agent/agent/gradle.lockfile +++ b/agent/agent/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 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.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 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.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 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.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions/src/main/java/io/opentelemetry/javaagent/instrumentation/azurefunctions/InvocationRequestExtractAdapter.java b/agent/instrumentation/azure-functions/src/main/java/io/opentelemetry/javaagent/instrumentation/azurefunctions/InvocationRequestExtractAdapter.java index 73c77fe48c5..93860a40f33 100644 --- a/agent/instrumentation/azure-functions/src/main/java/io/opentelemetry/javaagent/instrumentation/azurefunctions/InvocationRequestExtractAdapter.java +++ b/agent/instrumentation/azure-functions/src/main/java/io/opentelemetry/javaagent/instrumentation/azurefunctions/InvocationRequestExtractAdapter.java @@ -5,6 +5,7 @@ import com.microsoft.azure.functions.rpc.messages.RpcTraceContext; import io.opentelemetry.context.propagation.TextMapGetter; +import java.util.Arrays; import javax.annotation.Nullable; public class InvocationRequestExtractAdapter implements TextMapGetter { @@ -14,7 +15,7 @@ public class InvocationRequestExtractAdapter implements TextMapGetter keys(RpcTraceContext carrier) { - return null; + return Arrays.asList("traceparent", "tracestate"); } @Override diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 100644 --- a/agent/instrumentation/methods/gradle.lockfile +++ b/agent/instrumentation/methods/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/agent/instrumentation/methods/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/ai/MethodInstrumentationModule.java b/agent/instrumentation/methods/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/ai/MethodInstrumentationModule.java index 036a1f33b0e..a2ea6ef6937 100644 --- a/agent/instrumentation/methods/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/ai/MethodInstrumentationModule.java +++ b/agent/instrumentation/methods/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/ai/MethodInstrumentationModule.java @@ -13,7 +13,7 @@ import static java.util.Collections.emptyList; import com.google.auto.service.AutoService; -import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig; +import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.tooling.config.MethodsConfigurationParser; @@ -33,8 +33,7 @@ public MethodInstrumentationModule() { super("ai-methods"); Map> classMethodsToTrace = - MethodsConfigurationParser.parse( - AgentInstrumentationConfig.get().getString(TRACE_METHODS_CONFIG)); + MethodsConfigurationParser.parse(ConfigPropertiesUtil.getString(TRACE_METHODS_CONFIG)); typeInstrumentations = classMethodsToTrace.entrySet().stream() diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 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.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/agent/instrumentation/micrometer-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/ai/AzureMonitorRegistryConfig.java b/agent/instrumentation/micrometer-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/ai/AzureMonitorRegistryConfig.java index b3865ecd991..7851780addd 100644 --- a/agent/instrumentation/micrometer-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/ai/AzureMonitorRegistryConfig.java +++ b/agent/instrumentation/micrometer-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/ai/AzureMonitorRegistryConfig.java @@ -4,7 +4,7 @@ package io.opentelemetry.javaagent.instrumentation.micrometer.ai; import io.micrometer.core.instrument.step.StepRegistryConfig; -import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig; +import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil; import java.time.Duration; import javax.annotation.Nullable; @@ -16,13 +16,18 @@ public class AzureMonitorRegistryConfig implements StepRegistryConfig { public static final AzureMonitorRegistryConfig INSTANCE = new AzureMonitorRegistryConfig(); private AzureMonitorRegistryConfig() { - step = - AgentInstrumentationConfig.get() - .getDuration( - "applicationinsights.internal.micrometer.step.millis", Duration.ofSeconds(60)); - namespace = - AgentInstrumentationConfig.get() - .getString("applicationinsights.internal.micrometer.namespace"); + String stepMillisStr = + ConfigPropertiesUtil.getString("applicationinsights.internal.micrometer.step.millis"); + Duration parsedStep = null; + if (stepMillisStr != null) { + try { + parsedStep = Duration.ofMillis(Long.parseLong(stepMillisStr)); + } catch (NumberFormatException ignored) { + // fall through to default + } + } + step = parsedStep != null ? parsedStep : Duration.ofSeconds(60); + namespace = ConfigPropertiesUtil.getString("applicationinsights.internal.micrometer.namespace"); } @Override diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile index 9d56bb3416e..34f771d1c01 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -4,12 +4,12 @@ com.azure:azure-sdk-bom:1.3.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.52.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.1=runtimeClasspath +io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.53.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.4=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 100644 --- a/classic-sdk/core/gradle.lockfile +++ b/classic-sdk/core/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile index 63d2cd42fc8..cda7b3a9bce 100644 --- a/classic-sdk/web/gradle.lockfile +++ b/classic-sdk/web/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath empty= diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index a480052e4f6..b234e772118 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -7,10 +7,10 @@ data class DependencySet(val group: String, val version: String, val modules: Li val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions -val otelSdkVersion = "1.57.0" -val otelInstrumentationAlphaVersion = "2.23.0-alpha" -val otelInstrumentationVersion = "2.23.0" -val otelContribVersion = "1.52.0" +val otelSdkVersion = "1.58.0" +val otelInstrumentationAlphaVersion = "2.24.0-alpha" +val otelInstrumentationVersion = "2.24.0" +val otelContribVersion = "1.53.0" rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaVersion diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index 8cdee816459..4507d6eaeb5 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath io.netty:netty-bom:4.2.9.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.58.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.58.0=runtimeClasspath org.junit:junit-bom:5.14.2=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath diff --git a/gradlew.bat b/gradlew.bat index e509b2dd8fe..c4bdd3ab8e3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,93 +1,93 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 3254963af5b..642bbedd614 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2026-03-03 15:42:57 PST_ +_2026-03-11 13:36:08 PDT_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.21` @@ -170,47 +170,47 @@ _2026-03-03 15:42:57 PST_ > - **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) -**32** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.57.0` +**32** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.58.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) -**33** **Group:** `io.opentelemetry` **Name:** `opentelemetry-common` **Version:** `1.57.0` +**33** **Group:** `io.opentelemetry` **Name:** `opentelemetry-common` **Version:** `1.58.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) -**34** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.57.0` +**34** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.58.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-sdk` **Version:** `1.57.0` +**35** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.58.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) -**36** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.57.0` +**36** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.58.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-sdk-extension-autoconfigure` **Version:** `1.57.0` +**37** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.58.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) -**38** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.57.0` +**38** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.58.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-logs` **Version:** `1.57.0` +**39** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.58.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-metrics` **Version:** `1.57.0` +**40** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.58.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-trace` **Version:** `1.57.0` +**41** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.58.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.contrib` **Name:** `opentelemetry-jfr-connection` **Version:** `1.52.0-alpha` +**42** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-jfr-connection` **Version:** `1.53.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **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/perf-tests/gradlew.bat b/perf-tests/gradlew.bat index e509b2dd8fe..c4bdd3ab8e3 100755 --- a/perf-tests/gradlew.bat +++ b/perf-tests/gradlew.bat @@ -1,93 +1,93 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/smoke-tests/apps/DetectUnexpectedOtelMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DetectUnexpectedOtelMetricsTest.java b/smoke-tests/apps/DetectUnexpectedOtelMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DetectUnexpectedOtelMetricsTest.java index fa3bf412e85..f67f625ee04 100644 --- a/smoke-tests/apps/DetectUnexpectedOtelMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DetectUnexpectedOtelMetricsTest.java +++ b/smoke-tests/apps/DetectUnexpectedOtelMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/DetectUnexpectedOtelMetricsTest.java @@ -63,6 +63,7 @@ void testApp() throws Exception { envelope -> { MetricData md = (MetricData) ((Data) envelope.getData()).getBaseData(); return !EXPECTED_METRIC_NAMES.contains(md.getMetrics().get(0).getName()) + && !md.getMetrics().get(0).getName().startsWith("otel.sdk.") && !md.getProperties().containsKey("_MS.MetricId"); }, 1))