diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml index 9d7babd5d0..020501bdb3 100644 --- a/.github/workflows/build-common.yml +++ b/.github/workflows/build-common.yml @@ -8,7 +8,7 @@ on: required: false env: - EXPORTER_VERSION: 1.0.0-beta.28 # to be updated with the latest version + EXPORTER_VERSION: 1.0.0-beta.29 # to be updated with the latest version jobs: spotless: diff --git a/agent/agent-tooling/build.gradle.kts b/agent/agent-tooling/build.gradle.kts index 466bb73224..1f4ed9305d 100644 --- a/agent/agent-tooling/build.gradle.kts +++ b/agent/agent-tooling/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { implementation(project(":agent:agent-profiler:agent-diagnostics")) implementation(project(":etw:java")) - implementation("com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.28") + implementation("com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.29") compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap") compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling") compileOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap") diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index b134152370..f348b684c6 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -9,7 +9,7 @@ com.azure:azure-core-http-netty:1.15.2=runtimeClasspath com.azure:azure-core:1.50.0=runtimeClasspath com.azure:azure-identity:1.13.1=runtimeClasspath com.azure:azure-json:1.2.0=runtimeClasspath -com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.28=runtimeClasspath +com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.29=runtimeClasspath com.azure:azure-sdk-bom:1.2.26=runtimeClasspath com.azure:azure-storage-blob:12.27.0=runtimeClasspath com.azure:azure-storage-common:12.26.0=runtimeClasspath 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 00fb285ab3..f519377e86 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 @@ -17,6 +17,7 @@ import com.azure.monitor.opentelemetry.exporter.implementation.heartbeat.HeartbeatExporter; import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem; import com.azure.monitor.opentelemetry.exporter.implementation.quickpulse.QuickPulse; +import com.azure.monitor.opentelemetry.exporter.implementation.quickpulse.QuickPulseMetricReader; import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.Feature; import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.StatsbeatModule; import com.azure.monitor.opentelemetry.exporter.implementation.utils.AzureMonitorHelper; @@ -218,6 +219,8 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) { // TODO (trask) add this method to AutoConfigurationCustomizer upstream? ((AutoConfiguredOpenTelemetrySdkBuilder) autoConfiguration).disableShutdownHook(); + QuickPulseMetricReader liveMetricReader = new QuickPulseMetricReader(); + QuickPulse quickPulse; if (configuration.preview.liveMetrics.enabled) { quickPulse = @@ -231,6 +234,10 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) { telemetryClient.getRoleName(), telemetryClient.getRoleInstance(), configuration.preview.useNormalizedValueForNonNormalizedCpuPercentage, + liveMetricReader, + new MetricDataMapper( + telemetryClient::populateDefaults, + configuration.preview.captureHttpServer4xxAsError), FirstEntryPoint.getAgentVersion()); } else { quickPulse = null; @@ -291,6 +298,11 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) { return metricExporter; } }) + .addMeterProviderCustomizer( + (meterProviderBuilder, configProperties) -> { + meterProviderBuilder.registerMetricReader(liveMetricReader); + return meterProviderBuilder; + }) .addLogRecordExporterCustomizer( (logRecordExporter, configProperties) -> { if (logRecordExporter diff --git a/azure-monitor-opentelemetry-exporter-1.0.0-beta.29.jar b/azure-monitor-opentelemetry-exporter-1.0.0-beta.29.jar new file mode 100644 index 0000000000..f38958fbce Binary files /dev/null and b/azure-monitor-opentelemetry-exporter-1.0.0-beta.29.jar differ diff --git a/azure-monitor-opentelemetry-exporter-1.0.0-beta.29.pom b/azure-monitor-opentelemetry-exporter-1.0.0-beta.29.pom new file mode 100644 index 0000000000..d0bf17efa6 --- /dev/null +++ b/azure-monitor-opentelemetry-exporter-1.0.0-beta.29.pom @@ -0,0 +1,250 @@ + + + + 4.0.0 + + + com.azure + azure-client-sdk-parent + 1.7.0 + ../../parents/azure-client-sdk-parent + + + com.azure + azure-monitor-opentelemetry-exporter + 1.0.0-beta.29 + + Microsoft Azure SDK for OpenTelemetry Azure Monitor Exporter + This package contains Microsoft Azure SDK for OpenTelemetry Azure Monitor Exporter. + + + + azure-java-build-docs + ${site.url}/site/${project.artifactId} + + + + + https://github.com/Azure/azure-sdk-for-java + + + + 0.30 + 0.20 + + + --add-opens com.azure.monitor.opentelemetry.exporter/com.azure.monitor.opentelemetry.exporter=ALL-UNNAMED + + **/implementation/**/*.java + false + + + + + com.azure + azure-core + 1.51.0 + + + com.azure + azure-json + 1.2.0 + + + com.azure + azure-core-http-netty + 1.15.3 + + + io.opentelemetry + opentelemetry-api + 1.40.0 + + + io.opentelemetry + opentelemetry-sdk + 1.40.0 + + + io.opentelemetry + opentelemetry-sdk-metrics + 1.40.0 + + + io.opentelemetry + opentelemetry-sdk-logs + 1.40.0 + + + io.opentelemetry + opentelemetry-sdk-extension-autoconfigure-spi + 1.40.0 + + + io.opentelemetry + opentelemetry-sdk-extension-autoconfigure + 1.40.0 + + + io.opentelemetry.semconv + opentelemetry-semconv-incubating + 1.25.0-alpha + + + + + com.google.code.findbugs + jsr305 + 3.0.2 + provided + + + + + org.slf4j + slf4j-simple + 1.7.36 + test + + + org.junit.jupiter + junit-jupiter-api + 5.9.3 + test + + + org.junit.jupiter + junit-jupiter-engine + 5.9.3 + test + + + org.junit.jupiter + junit-jupiter-params + 5.9.3 + test + + + org.assertj + assertj-core + 3.22.0 + test + + + org.mockito + mockito-core + 4.11.0 + test + + + + + net.bytebuddy + byte-buddy + 1.14.12 + test + + + net.bytebuddy + byte-buddy-agent + 1.14.12 + test + + + io.opentelemetry + opentelemetry-sdk-testing + 1.40.0 + test + + + com.azure + azure-data-appconfiguration + 1.7.0 + test + + + com.azure + azure-messaging-eventhubs + 5.18.6 + test + + + com.azure + azure-core-tracing-opentelemetry + 1.0.0-beta.48 + test + + + com.azure + azure-core-test + 1.26.2 + test + + + com.azure + azure-messaging-eventhubs-checkpointstore-blob + 1.19.6 + test + + + com.azure + azure-identity + 1.13.2 + test + + + org.awaitility + awaitility + 4.2.0 + test + + + io.github.hakky54 + logcaptor + 2.9.0 + test + + + com.squareup.okio + okio + 3.9.0 + test + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.4.1 + + + + + io.opentelemetry:opentelemetry-api:[1.40.0] + io.opentelemetry:opentelemetry-sdk:[1.40.0] + io.opentelemetry:opentelemetry-sdk-metrics:[1.40.0] + io.opentelemetry:opentelemetry-sdk-logs:[1.40.0] + io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:[1.40.0] + io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:[1.40.0] + io.opentelemetry.semconv:opentelemetry-semconv-incubating:[1.25.0-alpha] + com.squareup.okio:okio:[3.9.0] + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.5 + + + + diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 72020abaea..7c0d7f4bd3 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2024-08-12 03:55:56 UTC_ +_2024-08-13 17:34:01 PDT_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.17.2` @@ -362,7 +362,7 @@ _2024-08-12 03:55:56 UTC_ > - **POM Project URL**: [https://github.com/Azure/azure-sdk-for-java](https://github.com/Azure/azure-sdk-for-java) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -**70** **Group:** `com.azure` **Name:** `azure-monitor-opentelemetry-exporter` **Version:** `1.0.0-beta.28` +**70** **Group:** `com.azure` **Name:** `azure-monitor-opentelemetry-exporter` **Version:** `1.0.0-beta.29` > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) **71** **Group:** `com.azure` **Name:** `azure-storage-blob` **Version:** `12.27.0`