From 112c7e5d3f64865a85b8a1ddee21502988428b1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 13:12:29 -0700
Subject: [PATCH] Bump otelInstrumentationAlphaVersion from 1.24.0-alpha to
1.25.0-alpha (#3005)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps `otelInstrumentationAlphaVersion` from 1.24.0-alpha to
1.25.0-alpha.
Updates
`io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha`
from 1.24.0-alpha to 1.25.0-alpha
Release notes
Sourced from io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha's
releases.
Version 1.24.0
This release targets the OpenTelemetry SDK 1.24.0.
Note that many artifacts have the -alpha suffix attached
to their version number, reflecting that they are still alpha quality
and will continue to have breaking changes. Please see the VERSIONING.md
for more details.
Migration notes
🌟 New javaagent instrumentation
🌟 New library instrumentation
- Add Ktor client instrumentation (#7982,
#7997)
- Add Spring Webflux server instrumentation (#7899)
📈 Enhancements
- Implement
messaging.kafka.* attributes spec (#7824,
#7860)
- Make RxJava2 instrumentation Android-friendly (#7895)
- Support more semantic convention for RocketMQ trace (#7871)
- Instrumenting cassandra executeReactive method (#6441)
- Make the OpenTelemetry Logback appender work with GraalVM native
images (#7989)
- Add baggage to Logback MDC; controlled by a configuration flag (#7892)
- Make the Spring Boot autoconfigure module work with Spring Boot 3
(#8028,
#8051)
🛠️ Bug fixes
- Handle JMX MBean attributes with embedded dots (#7841)
- Fix
ClassCastException when using
-Dotel.jmx.target.system=tomcat (#7884)
- Fix NPE in the AWS SDK 2 instrumentation when request
instrumentation is suppressed (#7953)
- Fix Kotlin coroutine context propagation (#7879)
- Fix the JAX-RS annotation instrumentation on Open Liberty (#7890)
- Fix an
AbstractMethodError in the Logback
instrumentation (#7967)
- Fix NPE in the RabbitMQ instrumentation (#8021)
- Fix JMX metrics usage examples (#7877)
🧰 Tooling
- Remove deprecated
instrumentation-api-semconv code (#7838)
- Look up helper class bytes when they are needed (#7839)
- Run smoke tests using Open Liberty 21.0.0.12 and 22.0.0.12 (#7878,
#7857)
- Add additional groovy script classloaders to ignore list. (#7460)
- Make AggregationTemporality configurable for
OtlpInMemoryMetricExporter in the
agent-for-testing module (#7904)
- Upgrade to gradle 8.0.2 (#7910,
7978)
- Replace the test-sets plugin with Gradle test suites (#7930,
#7933,
#7932,
#7931,
#7929,
#7946,
#7945,
#7944,
#7943,
#7942,
#7928,
#7951)
- Add a utility for tracking HTTP resends (#7986)
- Remove deprecated
messaging.url attribute from
messaging getter (#8008)
- Add protocol name&version to net attribute getters (#7994)
... (truncated)
Changelog
Sourced from io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha's
changelog.
Changelog
Unreleased
Version 1.25.0 (2023-04-13)
Migration notes
- Apache Pulsar instrumentation name is changed from
io.opentelemetry.apache-pulsar-2.8 to
io.opentelemetry.pulsar-2.8 and Apache Camel
instrumentation name is changed from
io.opentelemetry.apache-camel-2.20 to
io.opentelemetry.camel-2.20
(#8195)
- Mojarra instrumentation suppression key has changed from
mojarra to jsf-mojarra
and MyFaces instrumentation suppression key has changed from
myfaces to jsf-myfaces
(#7811)
🌟 New javaagent instrumentation
- R2DBC
(#7977)
- Add JFR streaming metrics gatherer
(#7886)
- ZIO 2.0 instrumentation
(#7980)
🌟 New library instrumentation
- R2DBC
(#7977)
- Add JFR streaming metrics gatherer
(#7886)
- Add library instrumentation for java http client
(#8138)
📈 Enhancements
- Move X-Ray Env Variable propagation to span link instead of parent
(#7970)
- Reduce memory usage for ClassLoaderHasClassesNamedMatcher
(#7866)
- Remove password from db.user parsed from JDBC url
(#8106)
- Ignore appd agent classes
(#8065)
- Add http client metrics to apache http library instrumentation
(#8128)
- Instrument additional pulsar receive methods
(#8171)
- Support latest Hibernate 6 version
(#8189)
... (truncated)
Commits
Updates
`io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api` from
1.24.0-alpha to 1.25.0-alpha
Release notes
Sourced from io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api's
releases.
Version 1.24.0
This release targets the OpenTelemetry SDK 1.24.0.
Note that many artifacts have the -alpha suffix attached
to their version number, reflecting that they are still alpha quality
and will continue to have breaking changes. Please see the VERSIONING.md
for more details.
Migration notes
🌟 New javaagent instrumentation
🌟 New library instrumentation
- Add Ktor client instrumentation (#7982,
#7997)
- Add Spring Webflux server instrumentation (#7899)
📈 Enhancements
- Implement
messaging.kafka.* attributes spec (#7824,
#7860)
- Make RxJava2 instrumentation Android-friendly (#7895)
- Support more semantic convention for RocketMQ trace (#7871)
- Instrumenting cassandra executeReactive method (#6441)
- Make the OpenTelemetry Logback appender work with GraalVM native
images (#7989)
- Add baggage to Logback MDC; controlled by a configuration flag (#7892)
- Make the Spring Boot autoconfigure module work with Spring Boot 3
(#8028,
#8051)
🛠️ Bug fixes
- Handle JMX MBean attributes with embedded dots (#7841)
- Fix
ClassCastException when using
-Dotel.jmx.target.system=tomcat (#7884)
- Fix NPE in the AWS SDK 2 instrumentation when request
instrumentation is suppressed (#7953)
- Fix Kotlin coroutine context propagation (#7879)
- Fix the JAX-RS annotation instrumentation on Open Liberty (#7890)
- Fix an
AbstractMethodError in the Logback
instrumentation (#7967)
- Fix NPE in the RabbitMQ instrumentation (#8021)
- Fix JMX metrics usage examples (#7877)
🧰 Tooling
- Remove deprecated
instrumentation-api-semconv code (#7838)
- Look up helper class bytes when they are needed (#7839)
- Run smoke tests using Open Liberty 21.0.0.12 and 22.0.0.12 (#7878,
#7857)
- Add additional groovy script classloaders to ignore list. (#7460)
- Make AggregationTemporality configurable for
OtlpInMemoryMetricExporter in the
agent-for-testing module (#7904)
- Upgrade to gradle 8.0.2 (#7910,
7978)
- Replace the test-sets plugin with Gradle test suites (#7930,
#7933,
#7932,
#7931,
#7929,
#7946,
#7945,
#7944,
#7943,
#7942,
#7928,
#7951)
- Add a utility for tracking HTTP resends (#7986)
- Remove deprecated
messaging.url attribute from
messaging getter (#8008)
- Add protocol name&version to net attribute getters (#7994)
... (truncated)
Changelog
Sourced from io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api's
changelog.
Changelog
Unreleased
Version 1.25.0 (2023-04-13)
Migration notes
- Apache Pulsar instrumentation name is changed from
io.opentelemetry.apache-pulsar-2.8 to
io.opentelemetry.pulsar-2.8 and Apache Camel
instrumentation name is changed from
io.opentelemetry.apache-camel-2.20 to
io.opentelemetry.camel-2.20
(#8195)
- Mojarra instrumentation suppression key has changed from
mojarra to jsf-mojarra
and MyFaces instrumentation suppression key has changed from
myfaces to jsf-myfaces
(#7811)
🌟 New javaagent instrumentation
- R2DBC
(#7977)
- Add JFR streaming metrics gatherer
(#7886)
- ZIO 2.0 instrumentation
(#7980)
🌟 New library instrumentation
- R2DBC
(#7977)
- Add JFR streaming metrics gatherer
(#7886)
- Add library instrumentation for java http client
(#8138)
📈 Enhancements
- Move X-Ray Env Variable propagation to span link instead of parent
(#7970)
- Reduce memory usage for ClassLoaderHasClassesNamedMatcher
(#7866)
- Remove password from db.user parsed from JDBC url
(#8106)
- Ignore appd agent classes
(#8065)
- Add http client metrics to apache http library instrumentation
(#8128)
- Instrument additional pulsar receive methods
(#8171)
- Support latest Hibernate 6 version
(#8189)
... (truncated)
Commits
Updates `io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap`
from 1.24.0-alpha to 1.25.0-alpha
Release notes
Sourced from io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap's
releases.
Version 1.24.0
This release targets the OpenTelemetry SDK 1.24.0.
Note that many artifacts have the -alpha suffix attached
to their version number, reflecting that they are still alpha quality
and will continue to have breaking changes. Please see the VERSIONING.md
for more details.
Migration notes
🌟 New javaagent instrumentation
🌟 New library instrumentation
- Add Ktor client instrumentation (#7982,
#7997)
- Add Spring Webflux server instrumentation (#7899)
📈 Enhancements
- Implement
messaging.kafka.* attributes spec (#7824,
#7860)
- Make RxJava2 instrumentation Android-friendly (#7895)
- Support more semantic convention for RocketMQ trace (#7871)
- Instrumenting cassandra executeReactive method (#6441)
- Make the OpenTelemetry Logback appender work with GraalVM native
images (#7989)
- Add baggage to Logback MDC; controlled by a configuration flag (#7892)
- Make the Spring Boot autoconfigure module work with Spring Boot 3
(#8028,
#8051)
🛠️ Bug fixes
- Handle JMX MBean attributes with embedded dots (#7841)
- Fix
ClassCastException when using
-Dotel.jmx.target.system=tomcat (#7884)
- Fix NPE in the AWS SDK 2 instrumentation when request
instrumentation is suppressed (#7953)
- Fix Kotlin coroutine context propagation (#7879)
- Fix the JAX-RS annotation instrumentation on Open Liberty (#7890)
- Fix an
AbstractMethodError in the Logback
instrumentation (#7967)
- Fix NPE in the RabbitMQ instrumentation (#8021)
- Fix JMX metrics usage examples (#7877)
🧰 Tooling
- Remove deprecated
instrumentation-api-semconv code (#7838)
- Look up helper class bytes when they are needed (#7839)
- Run smoke tests using Open Liberty 21.0.0.12 and 22.0.0.12 (#7878,
#7857)
- Add additional groovy script classloaders to ignore list. (#7460)
- Make AggregationTemporality configurable for
OtlpInMemoryMetricExporter in the
agent-for-testing module (#7904)
- Upgrade to gradle 8.0.2 (#7910,
7978)
- Replace the test-sets plugin with Gradle test suites (#7930,
#7933,
#7932,
#7931,
#7929,
#7946,
#7945,
#7944,
#7943,
#7942,
#7928,
#7951)
- Add a utility for tracking HTTP resends (#7986)
- Remove deprecated
messaging.url attribute from
messaging getter (#8008)
- Add protocol name&version to net attribute getters (#7994)
... (truncated)
Changelog
Sourced from io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap's
changelog.
Changelog
Unreleased
Version 1.25.0 (2023-04-13)
Migration notes
- Apache Pulsar instrumentation name is changed from
io.opentelemetry.apache-pulsar-2.8 to
io.opentelemetry.pulsar-2.8 and Apache Camel
instrumentation name is changed from
io.opentelemetry.apache-camel-2.20 to
io.opentelemetry.camel-2.20
(#8195)
- Mojarra instrumentation suppression key has changed from
mojarra to jsf-mojarra
and MyFaces instrumentation suppression key has changed from
myfaces to jsf-myfaces
(#7811)
🌟 New javaagent instrumentation
- R2DBC
(#7977)
- Add JFR streaming metrics gatherer
(#7886)
- ZIO 2.0 instrumentation
(#7980)
🌟 New library instrumentation
- R2DBC
(#7977)
- Add JFR streaming metrics gatherer
(#7886)
- Add library instrumentation for java http client
(#8138)
📈 Enhancements
- Move X-Ray Env Variable propagation to span link instead of parent
(#7970)
- Reduce memory usage for ClassLoaderHasClassesNamedMatcher
(#7866)
- Remove password from db.user parsed from JDBC url
(#8106)
- Ignore appd agent classes
(#8065)
- Add http client metrics to apache http library instrumentation
(#8128)
- Instrument additional pulsar receive methods
(#8171)
- Support latest Hibernate 6 version
(#8189)
... (truncated)
Commits
Updates `io.opentelemetry.javaagent:opentelemetry-javaagent-tooling`
from 1.24.0-alpha to 1.25.0-alpha
Release notes
Sourced from io.opentelemetry.javaagent:opentelemetry-javaagent-tooling's
releases.
Version 1.24.0
This release targets the OpenTelemetry SDK 1.24.0.
Note that many artifacts have the -alpha suffix attached
to their version number, reflecting that they are still alpha quality
and will continue to have breaking changes. Please see the VERSIONING.md
for more details.
Migration notes
🌟 New javaagent instrumentation
🌟 New library instrumentation
- Add Ktor client instrumentation (#7982,
#7997)
- Add Spring Webflux server instrumentation (#7899)
📈 Enhancements
- Implement
messaging.kafka.* attributes spec (#7824,
#7860)
- Make RxJava2 instrumentation Android-friendly (#7895)
- Support more semantic convention for RocketMQ trace (#7871)
- Instrumenting cassandra executeReactive method (#6441)
- Make the OpenTelemetry Logback appender work with GraalVM native
images (#7989)
- Add baggage to Logback MDC; controlled by a configuration flag (#7892)
- Make the Spring Boot autoconfigure module work with Spring Boot 3
(#8028,
#8051)
🛠️ Bug fixes
- Handle JMX MBean attributes with embedded dots (#7841)
- Fix
ClassCastException when using
-Dotel.jmx.target.system=tomcat (#7884)
- Fix NPE in the AWS SDK 2 instrumentation when request
instrumentation is suppressed (#7953)
- Fix Kotlin coroutine context propagation (#7879)
- Fix the JAX-RS annotation instrumentation on Open Liberty (#7890)
- Fix an
AbstractMethodError in the Logback
instrumentation (#7967)
- Fix NPE in the RabbitMQ instrumentation (#8021)
- Fix JMX metrics usage examples (#7877)
🧰 Tooling
- Remove deprecated
instrumentation-api-semconv code (#7838)
- Look up helper class bytes when they are needed (#7839)
- Run smoke tests using Open Liberty 21.0.0.12 and 22.0.0.12 (#7878,
#7857)
- Add additional groovy script classloaders to ignore list. (#7460)
- Make AggregationTemporality configurable for
OtlpInMemoryMetricExporter in the
agent-for-testing module (#7904)
- Upgrade to gradle 8.0.2 (#7910,
7978)
- Replace the test-sets plugin with Gradle test suites (#7930,
#7933,
#7932,
#7931,
#7929,
#7946,
#7945,
#7944,
#7943,
#7942,
#7928,
#7951)
- Add a utility for tracking HTTP resends (#7986)
- Remove deprecated
messaging.url attribute from
messaging getter (#8008)
- Add protocol name&version to net attribute getters (#7994)
... (truncated)
Changelog
Sourced from io.opentelemetry.javaagent:opentelemetry-javaagent-tooling's
changelog.
Changelog
Unreleased
Version 1.25.0 (2023-04-13)
Migration notes
- Apache Pulsar instrumentation name is changed from
io.opentelemetry.apache-pulsar-2.8 to
io.opentelemetry.pulsar-2.8 and Apache Camel
instrumentation name is changed from
io.opentelemetry.apache-camel-2.20 to
io.opentelemetry.camel-2.20
(#8195)
- Mojarra instrumentation suppression key has changed from
mojarra to jsf-mojarra
and MyFaces instrumentation suppression key has changed from
myfaces to jsf-myfaces
(#7811)
🌟 New javaagent instrumentation
- R2DBC
(#7977)
- Add JFR streaming metrics gatherer
(#7886)
- ZIO 2.0 instrumentation
(#7980)
🌟 New library instrumentation
- R2DBC
(#7977)
- Add JFR streaming metrics gatherer
(#7886)
- Add library instrumentation for java http client
(#8138)
📈 Enhancements
- Move X-Ray Env Variable propagation to span link instead of parent
(#7970)
- Reduce memory usage for ClassLoaderHasClassesNamedMatcher
(#7866)
- Remove password from db.user parsed from JDBC url
(#8106)
- Ignore appd agent classes
(#8065)
- Add http client metrics to apache http library instrumentation
(#8128)
- Instrument additional pulsar receive methods
(#8171)
- Support latest Hibernate 6 version
(#8189)
... (truncated)
Commits
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
---------
Signed-off-by: dependabot[bot]
Co-authored-by: Walt Moorhouse <60402633+KrogerWalt@users.noreply.github.com>
Co-authored-by: Trask Stalnaker
Co-authored-by: Helen <56097766+heyams@users.noreply.github.com>
Co-authored-by: Jean Bisutti
Co-authored-by: Helen Yang
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
agent/agent-bootstrap/gradle.lockfile | 8 ++++----
.../instrumenter/http/TemporaryMetricsView.java | 2 +-
agent/agent-for-testing/gradle.lockfile | 8 ++++----
.../gc-monitor-api/gradle.lockfile | 8 ++++----
.../gc-monitor-core/gradle.lockfile | 8 ++++----
.../gc-monitor-tests/gradle.lockfile | 8 ++++----
.../agent-alerting-api/gradle.lockfile | 8 ++++----
.../agent-profiler/agent-alerting/gradle.lockfile | 8 ++++----
.../agent-diagnostics-api/gradle.lockfile | 8 ++++----
agent/agent-tooling/gradle.lockfile | 14 +++++++-------
.../agent/internal/init/FirstEntryPoint.java | 5 +++++
.../agent/internal/init/Slf4jInternalLogger.java | 8 ++++----
.../sdk/metrics/internal/view/UserAgents.java | 2 +-
agent/agent/gradle.lockfile | 8 ++++----
.../microsoft/applicationinsights/agent/Agent.java | 7 +++++++
agent/azure-monitor-exporter/gradle.lockfile | 14 +++++++-------
.../exporter/implementation/LogDataMapper.java | 6 ++++--
.../exporter/implementation/MappingsBuilder.java | 12 ++++++++++++
.../implementation/SemanticAttributes.java | 2 +-
.../exporter/implementation/SpanDataMapper.java | 2 +-
.../applicationinsights-web-2.3/gradle.lockfile | 8 ++++----
.../azure-functions-worker-stub/gradle.lockfile | 8 ++++----
.../azure-functions/gradle.lockfile | 8 ++++----
agent/instrumentation/methods/gradle.lockfile | 8 ++++----
.../methods/ai/MethodSingletons.java | 3 ++-
.../instrumentation/micrometer-1.0/gradle.lockfile | 8 ++++----
agent/runtime-attach/gradle.lockfile | 8 ++++----
classic-sdk/core/gradle.lockfile | 8 ++++----
classic-sdk/web/gradle.lockfile | 8 ++++----
dependencyManagement/build.gradle.kts | 6 +++---
etw/java/gradle.lockfile | 8 ++++----
licenses/more-licenses.md | 2 +-
32 files changed, 128 insertions(+), 101 deletions(-)
diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile
index 1acce42f7e7..6e758a8de08 100644
--- a/agent/agent-bootstrap/gradle.lockfile
+++ b/agent/agent-bootstrap/gradle.lockfile
@@ -11,10 +11,10 @@ com.google.guava:guava-bom:31.1-jre=runtimeClasspath
com.squareup.moshi:moshi:1.11.0=runtimeClasspath
com.squareup.okio:okio:1.17.5=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
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 64d32f8f2e5..49433e6da6a 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
@@ -62,7 +62,7 @@ private static Set buildDurationServerView() {
view.add(SemanticAttributes.NET_HOST_PORT);
view.add(SemanticAttributes.HTTP_ROUTE);
// START APPLICATION INSIGHTS MODIFICATIONS
- view.add(SemanticAttributes.HTTP_USER_AGENT);
+ view.add(SemanticAttributes.USER_AGENT_ORIGINAL);
// END APPLICATION INSIGHTS MODIFICATIONS
return view;
}
diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile
index a398f1e2719..4d1b2cdf810 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.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.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 a80041a44d4..1baba83ff56 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.14.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.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 a80041a44d4..1baba83ff56 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.14.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.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 a398f1e2719..4d1b2cdf810 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.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile
index a398f1e2719..4d1b2cdf810 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.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile
index b814270e69b..12dc0cb1db4 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.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
index a398f1e2719..4d1b2cdf810 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.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile
index bc3b216bca5..7e294cac85a 100644
--- a/agent/agent-tooling/gradle.lockfile
+++ b/agent/agent-tooling/gradle.lockfile
@@ -50,13 +50,13 @@ io.netty:netty-transport-native-epoll:4.1.91.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.91.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.91.Final=runtimeClasspath
io.netty:netty-transport:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
-io.projectreactor.netty:reactor-netty-core:1.1.5=runtimeClasspath
-io.projectreactor.netty:reactor-netty-http:1.1.5=runtimeClasspath
-io.projectreactor:reactor-core:3.5.4=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
+io.projectreactor.netty:reactor-netty-core:1.1.6=runtimeClasspath
+io.projectreactor.netty:reactor-netty-http:1.1.6=runtimeClasspath
+io.projectreactor:reactor-core:3.5.5=runtimeClasspath
net.java.dev.jna:jna-platform:5.13.0=runtimeClasspath
net.java.dev.jna:jna:5.13.0=runtimeClasspath
net.minidev:accessors-smart:2.4.9=runtimeClasspath
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 3fdbbf77f35..83e1195c946 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
@@ -66,6 +66,11 @@ public static String getAgentVersion() {
return agentVersion;
}
+ @Override
+ public String name() {
+ return "applicationinsights";
+ }
+
@Override
public void init() {
try {
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/Slf4jInternalLogger.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/Slf4jInternalLogger.java
index 2a569f645af..a24768d2c55 100644
--- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/Slf4jInternalLogger.java
+++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/Slf4jInternalLogger.java
@@ -8,7 +8,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class Slf4jInternalLogger extends InternalLogger {
+public class Slf4jInternalLogger implements InternalLogger {
static Slf4jInternalLogger create(String name) {
return new Slf4jInternalLogger(name);
@@ -21,7 +21,7 @@ static Slf4jInternalLogger create(String name) {
}
@Override
- protected boolean isLoggable(InternalLogger.Level level) {
+ public boolean isLoggable(Level level) {
switch (level) {
case TRACE:
return logger.isTraceEnabled();
@@ -38,7 +38,7 @@ protected boolean isLoggable(InternalLogger.Level level) {
}
@Override
- protected void log(InternalLogger.Level level, String message, @Nullable Throwable error) {
+ public void log(Level level, String message, @Nullable Throwable error) {
switch (level) {
case TRACE:
logger.trace(message, error);
@@ -60,7 +60,7 @@ protected void log(InternalLogger.Level level, String message, @Nullable Throwab
}
@Override
- protected String name() {
+ public String name() {
return logger.getName();
}
}
diff --git a/agent/agent-tooling/src/main/java/io/opentelemetry/sdk/metrics/internal/view/UserAgents.java b/agent/agent-tooling/src/main/java/io/opentelemetry/sdk/metrics/internal/view/UserAgents.java
index 6b038e5eb3a..e440a26a8f5 100644
--- a/agent/agent-tooling/src/main/java/io/opentelemetry/sdk/metrics/internal/view/UserAgents.java
+++ b/agent/agent-tooling/src/main/java/io/opentelemetry/sdk/metrics/internal/view/UserAgents.java
@@ -9,7 +9,7 @@
final class UserAgents {
static boolean isBot(Attributes attributes) {
- String userAgent = attributes.get(SemanticAttributes.HTTP_USER_AGENT);
+ String userAgent = attributes.get(SemanticAttributes.USER_AGENT_ORIGINAL);
return userAgent != null && userAgent.contains("AlwaysOn");
}
diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile
index a398f1e2719..4d1b2cdf810 100644
--- a/agent/agent/gradle.lockfile
+++ b/agent/agent/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
diff --git a/agent/agent/src/main/java/com/microsoft/applicationinsights/agent/Agent.java b/agent/agent/src/main/java/com/microsoft/applicationinsights/agent/Agent.java
index 2fb9df54e06..5fda9929bf5 100644
--- a/agent/agent/src/main/java/com/microsoft/applicationinsights/agent/Agent.java
+++ b/agent/agent/src/main/java/com/microsoft/applicationinsights/agent/Agent.java
@@ -28,6 +28,13 @@ public static void premain(String agentArgs, Instrumentation inst) {
StartupProfiler.start();
}
+ // https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7339
+ // Starting 1.25.0, OpenTelemetry defaults logger to Slf4jSimplerlogger when system property
+ // "otel.javaagent.logging" is null.
+ // Setting this system property programmatically will tell agent class loader to load our
+ // Slf4jInternalLogger instead.
+ System.setProperty("otel.javaagent.logging", "applicationinsights");
+
OpenTelemetryAgent.premain(agentArgs, inst);
}
diff --git a/agent/azure-monitor-exporter/gradle.lockfile b/agent/azure-monitor-exporter/gradle.lockfile
index 3158fe1e283..e77a6f624a4 100644
--- a/agent/azure-monitor-exporter/gradle.lockfile
+++ b/agent/azure-monitor-exporter/gradle.lockfile
@@ -40,13 +40,13 @@ io.netty:netty-transport-native-epoll:4.1.91.Final=runtimeClasspath
io.netty:netty-transport-native-kqueue:4.1.91.Final=runtimeClasspath
io.netty:netty-transport-native-unix-common:4.1.91.Final=runtimeClasspath
io.netty:netty-transport:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
-io.projectreactor.netty:reactor-netty-core:1.1.5=runtimeClasspath
-io.projectreactor.netty:reactor-netty-http:1.1.5=runtimeClasspath
-io.projectreactor:reactor-core:3.5.4=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
+io.projectreactor.netty:reactor-netty-core:1.1.6=runtimeClasspath
+io.projectreactor.netty:reactor-netty-http:1.1.6=runtimeClasspath
+io.projectreactor:reactor-core:3.5.5=runtimeClasspath
net.java.dev.jna:jna-platform:5.6.0=runtimeClasspath
net.java.dev.jna:jna:5.6.0=runtimeClasspath
net.minidev:accessors-smart:2.4.9=runtimeClasspath
diff --git a/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/LogDataMapper.java b/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/LogDataMapper.java
index 1a6bea48ab3..de726c7ecb2 100644
--- a/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/LogDataMapper.java
+++ b/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/LogDataMapper.java
@@ -3,6 +3,7 @@
package com.azure.monitor.opentelemetry.exporter.implementation;
+import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
import static io.opentelemetry.api.common.AttributeKey.stringKey;
import com.azure.core.util.logging.ClientLogger;
@@ -20,6 +21,7 @@
import io.opentelemetry.api.trace.SpanContext;
import io.opentelemetry.sdk.logs.data.LogRecordData;
import io.opentelemetry.sdk.resources.Resource;
+import java.util.List;
import java.util.function.BiConsumer;
import reactor.util.annotation.Nullable;
@@ -35,7 +37,7 @@ public class LogDataMapper {
private static final String LOG4J_MAP_MESSAGE_PREFIX = "log4j.map_message."; // log4j 2.x
private static final AttributeKey LOG4J_MARKER = stringKey("log4j.marker");
- private static final AttributeKey LOGBACK_MARKER = stringKey("logback.marker");
+ private static final AttributeKey> LOGBACK_MARKER = stringArrayKey("logback.marker");
private static final Mappings MAPPINGS;
@@ -77,7 +79,7 @@ public class LogDataMapper {
.exactString(SemanticAttributes.CODE_FUNCTION, "MethodName")
.exactLong(SemanticAttributes.CODE_LINENO, "LineNumber")
.exactString(LOG4J_MARKER, "Marker")
- .exactString(LOGBACK_MARKER, "Marker");
+ .exactStringArray(LOGBACK_MARKER, "Marker");
SpanDataMapper.applyCommonTags(mappingsBuilder);
diff --git a/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/MappingsBuilder.java b/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/MappingsBuilder.java
index ef229ae599c..6a9b4588352 100644
--- a/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/MappingsBuilder.java
+++ b/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/MappingsBuilder.java
@@ -10,6 +10,7 @@
import io.opentelemetry.api.common.AttributeKey;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -86,6 +87,17 @@ MappingsBuilder exactLong(AttributeKey attributeKey, String propertyName)
return this;
}
+ MappingsBuilder exactStringArray(AttributeKey> attributeKey, String propertyName) {
+ exactMappings.put(
+ attributeKey.getKey(),
+ (telemetryBuilder, value) -> {
+ if (value instanceof List) {
+ telemetryBuilder.addProperty(propertyName, String.join(",", (List) value));
+ }
+ });
+ return this;
+ }
+
public Mappings build() {
return new Mappings(exactMappings, prefixMappings.build());
}
diff --git a/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SemanticAttributes.java b/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SemanticAttributes.java
index b6e490d2a1f..50adfd00107 100644
--- a/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SemanticAttributes.java
+++ b/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SemanticAttributes.java
@@ -603,7 +603,7 @@ public final class SemanticAttributes {
* Value of the HTTP
* User-Agent header sent by the client.
*/
- public static final AttributeKey HTTP_USER_AGENT = stringKey("http.user_agent");
+ public static final AttributeKey USER_AGENT_ORIGINAL = stringKey("user_agent.original");
/**
* The size of the request payload body in bytes. This is the number of bytes transferred
diff --git a/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SpanDataMapper.java b/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SpanDataMapper.java
index 3abc1c99fd9..7a2e72b0ce0 100644
--- a/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SpanDataMapper.java
+++ b/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/SpanDataMapper.java
@@ -75,7 +75,7 @@ public final class SpanDataMapper {
.ignoreExact(AiSemanticAttributes.KAFKA_RECORD_QUEUE_TIME_MS.getKey())
.ignoreExact(AiSemanticAttributes.KAFKA_OFFSET.getKey())
.exact(
- SemanticAttributes.HTTP_USER_AGENT.getKey(),
+ SemanticAttributes.USER_AGENT_ORIGINAL.getKey(),
(builder, value) -> {
if (value instanceof String) {
builder.addTag("ai.user.userAgent", (String) value);
diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile
index a398f1e2719..4d1b2cdf810 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.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile
index a398f1e2719..4d1b2cdf810 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.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile
index a398f1e2719..4d1b2cdf810 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.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile
index a398f1e2719..4d1b2cdf810 100644
--- a/agent/instrumentation/methods/gradle.lockfile
+++ b/agent/instrumentation/methods/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
diff --git a/agent/instrumentation/methods/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/ai/MethodSingletons.java b/agent/instrumentation/methods/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/ai/MethodSingletons.java
index 3b1717f5b06..684c6bd6d42 100644
--- a/agent/instrumentation/methods/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/ai/MethodSingletons.java
+++ b/agent/instrumentation/methods/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/ai/MethodSingletons.java
@@ -33,7 +33,8 @@ public final class MethodSingletons {
GlobalOpenTelemetry.get(),
INSTRUMENTATION_NAME,
CodeSpanNameExtractor.create(codeAttributesGetter))
- .setInstrumentationVersion("1.23.0-alpha-applicationinsights")
+ .setInstrumentationVersion(
+ "1.25.0-alpha-applicationinsights") // TODO automate version or use upstream
.addAttributesExtractor(CodeAttributesExtractor.create(codeAttributesGetter))
// START APPLICATION INSIGHTS MODIFICATIONS
.buildInstrumenter(new MethodSpanKindExtractor());
diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile
index a398f1e2719..4d1b2cdf810 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.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile
index 81b0c2bb096..6e914e0c4d2 100644
--- a/agent/runtime-attach/gradle.lockfile
+++ b/agent/runtime-attach/gradle.lockfile
@@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.18.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
net.bytebuddy:byte-buddy-agent:1.11.18=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile
index a398f1e2719..4d1b2cdf810 100644
--- a/classic-sdk/core/gradle.lockfile
+++ b/classic-sdk/core/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile
index a398f1e2719..4d1b2cdf810 100644
--- a/classic-sdk/web/gradle.lockfile
+++ b/classic-sdk/web/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
empty=
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 8d06f4a50da..7fbb2899481 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.23.1"
-val otelInstrumentationAlphaVersion = "1.24.0-alpha"
-val otelInstrumentationVersion = "1.24.0"
+val otelVersion = "1.25.0"
+val otelInstrumentationAlphaVersion = "1.25.0-alpha"
+val otelInstrumentationVersion = "1.25.0"
val otelContribAlphaVersion = "1.18.0-alpha"
rootProject.extra["otelVersion"] = otelVersion
diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile
index b814270e69b..12dc0cb1db4 100644
--- a/etw/java/gradle.lockfile
+++ b/etw/java/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.11=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.14.2=runtimeClasspath
com.google.guava:guava-bom:31.1-jre=runtimeClasspath
io.netty:netty-bom:4.1.91.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.24.0=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.23.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.23.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.25.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.25.0=runtimeClasspath
org.junit:junit-bom:5.9.2=runtimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath
org.testcontainers:testcontainers-bom:1.18.0=runtimeClasspath
diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md
index 845ca82570a..f970ff79231 100644
--- a/licenses/more-licenses.md
+++ b/licenses/more-licenses.md
@@ -1,7 +1,7 @@
#agent
##Dependency License Report
-_2023-04-12 15:55:54 UTC_
+_2023-04-19 19:07:48 PDT_
## Apache License, Version 2.0
**1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.14.2`