This is an automated email from the ASF dual-hosted git repository.
FrankChen021 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 2f915593f94 build(deps): bump opentelemetry.version from 1.7.0 to
1.65.0 (#20017)
2f915593f94 is described below
commit 2f915593f94e31fec35235cadd82a5c10dd2747d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Sat Aug 15 09:41:37 2026 +0800
build(deps): bump opentelemetry.version from 1.7.0 to 1.65.0 (#20017)
* build(deps): bump opentelemetry.version from 1.7.0 to 1.65.0
Bumps `opentelemetry.version` from 1.7.0 to 1.65.0.
Updates `io.opentelemetry:opentelemetry-bom` from 1.7.0 to 1.65.0
- [Release
notes](https://github.com/open-telemetry/opentelemetry-java/releases)
-
[Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
-
[Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.7.0...v1.65.0)
Updates `io.opentelemetry:opentelemetry-bom-alpha` from 1.7.0-alpha to
1.65.0-alpha
- [Release
notes](https://github.com/open-telemetry/opentelemetry-java/releases)
-
[Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/commits)
---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-bom
dependency-version: 1.65.0
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.opentelemetry:opentelemetry-bom-alpha
dependency-version: 1.65.0-alpha
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
* build(deps): fix OpenTelemetry 1.65.0 BOM and API update
* test(deps): cover OpenTelemetry emitter module initialization
* test(deps): satisfy OpenTelemetry emitter Checkstyle
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Frank Chen <[email protected]>
---
extensions-contrib/opentelemetry-emitter/pom.xml | 2 +-
.../opentelemetry/OpenTelemetryEmitterModule.java | 4 +--
.../opentelemetry/OpenTelemetryEmitterTest.java | 36 ++++++++++++++++++++++
3 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/extensions-contrib/opentelemetry-emitter/pom.xml
b/extensions-contrib/opentelemetry-emitter/pom.xml
index e7604dfd99f..5e14d896e04 100644
--- a/extensions-contrib/opentelemetry-emitter/pom.xml
+++ b/extensions-contrib/opentelemetry-emitter/pom.xml
@@ -34,7 +34,7 @@
<description>Extension support for emitting OpenTelemetry spans for Druid
queries</description>
<properties>
- <opentelemetry.version>1.7.0</opentelemetry.version>
+ <opentelemetry.version>1.65.0</opentelemetry.version>
<opentelemetry.instrumentation.version>1.14.0-alpha</opentelemetry.instrumentation.version>
<!-- These guava and grpc versions are used only in the
opentelemetry-extension.
Look at build section for more details about shading. -->
diff --git
a/extensions-contrib/opentelemetry-emitter/src/main/java/org/apache/druid/emitter/opentelemetry/OpenTelemetryEmitterModule.java
b/extensions-contrib/opentelemetry-emitter/src/main/java/org/apache/druid/emitter/opentelemetry/OpenTelemetryEmitterModule.java
index 9e8e748a5e2..ebac6541d15 100644
---
a/extensions-contrib/opentelemetry-emitter/src/main/java/org/apache/druid/emitter/opentelemetry/OpenTelemetryEmitterModule.java
+++
b/extensions-contrib/opentelemetry-emitter/src/main/java/org/apache/druid/emitter/opentelemetry/OpenTelemetryEmitterModule.java
@@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.inject.Binder;
import com.google.inject.Provides;
import com.google.inject.name.Named;
-import io.opentelemetry.sdk.autoconfigure.OpenTelemetrySdkAutoConfiguration;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
import org.apache.druid.guice.JsonConfigProvider;
import org.apache.druid.guice.ManageLifecycle;
import org.apache.druid.initialization.DruidModule;
@@ -55,6 +55,6 @@ public class OpenTelemetryEmitterModule implements DruidModule
public Emitter getEmitter(OpenTelemetryEmitterConfig config, ObjectMapper
mapper)
{
// It's a good practice to not set the GlobalOpenTelemetry since there's
no need to do that
- return new
OpenTelemetryEmitter(OpenTelemetrySdkAutoConfiguration.initialize(false));
+ return new
OpenTelemetryEmitter(AutoConfiguredOpenTelemetrySdk.builder().build().getOpenTelemetrySdk());
}
}
diff --git
a/extensions-contrib/opentelemetry-emitter/src/test/java/org/apache/druid/emitter/opentelemetry/OpenTelemetryEmitterTest.java
b/extensions-contrib/opentelemetry-emitter/src/test/java/org/apache/druid/emitter/opentelemetry/OpenTelemetryEmitterTest.java
index db9860151b9..60c2d932d29 100644
---
a/extensions-contrib/opentelemetry-emitter/src/test/java/org/apache/druid/emitter/opentelemetry/OpenTelemetryEmitterTest.java
+++
b/extensions-contrib/opentelemetry-emitter/src/test/java/org/apache/druid/emitter/opentelemetry/OpenTelemetryEmitterTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.emitter.opentelemetry;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.trace.StatusCode;
@@ -89,6 +90,41 @@ public class OpenTelemetryEmitterTest
emitter = new OpenTelemetryEmitter(openTelemetry);
}
+ @Test
+ public void testModuleCreatesEmitter()
+ {
+ final String previousTracesExporter =
System.getProperty("otel.traces.exporter");
+ final String previousMetricsExporter =
System.getProperty("otel.metrics.exporter");
+ final String previousLogsExporter =
System.getProperty("otel.logs.exporter");
+ System.setProperty("otel.traces.exporter", "none");
+ System.setProperty("otel.metrics.exporter", "none");
+ System.setProperty("otel.logs.exporter", "none");
+
+ try {
+ Assertions.assertNotNull(
+ new OpenTelemetryEmitterModule()
+ .getEmitter(new OpenTelemetryEmitterConfig(), new ObjectMapper())
+ );
+ }
+ finally {
+ if (previousTracesExporter == null) {
+ System.clearProperty("otel.traces.exporter");
+ } else {
+ System.setProperty("otel.traces.exporter", previousTracesExporter);
+ }
+ if (previousMetricsExporter == null) {
+ System.clearProperty("otel.metrics.exporter");
+ } else {
+ System.setProperty("otel.metrics.exporter", previousMetricsExporter);
+ }
+ if (previousLogsExporter == null) {
+ System.clearProperty("otel.logs.exporter");
+ } else {
+ System.setProperty("otel.logs.exporter", previousLogsExporter);
+ }
+ }
+ }
+
// Check that we don't call "emitQueryTimeEvent" method for event that is
not instance of ServiceMetricEvent
@Test
public void testNoEmitNotServiceMetric()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
