You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2024/11/13 09:29:33 UTC
(pulsar) 04/12: [improve][test] Disable OTel autoconfigured exporters in tests (#23540)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 5e547a2326a008f051f1f26a69b896ef60da7ede
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Sat Nov 2 11:12:55 2024 +0200
[improve][test] Disable OTel autoconfigured exporters in tests (#23540)
(cherry picked from commit 570cb443eb220135861abf9e9de34ae65e5cdaaa)
---
.../apache/pulsar/broker/stats/BrokerOpenTelemetryTestUtil.java | 8 ++++++++
.../org/apache/pulsar/broker/testcontext/PulsarTestContext.java | 3 ++-
.../org/apache/pulsar/opentelemetry/OpenTelemetryServiceTest.java | 5 +++++
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/BrokerOpenTelemetryTestUtil.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/BrokerOpenTelemetryTestUtil.java
index 47b76a301e1..98efea82fe1 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/BrokerOpenTelemetryTestUtil.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/BrokerOpenTelemetryTestUtil.java
@@ -36,12 +36,20 @@ public class BrokerOpenTelemetryTestUtil {
sdkBuilder.addMeterProviderCustomizer(
(meterProviderBuilder, __) -> meterProviderBuilder.registerMetricReader(reader));
sdkBuilder.disableShutdownHook();
+ disableExporters(sdkBuilder);
sdkBuilder.addPropertiesSupplier(
() -> Map.of(OpenTelemetryService.OTEL_SDK_DISABLED_KEY, "false",
"otel.java.enabled.resource.providers", "none"));
};
}
+ public static void disableExporters(AutoConfiguredOpenTelemetrySdkBuilder sdkBuilder) {
+ sdkBuilder.addPropertiesSupplier(() ->
+ Map.of("otel.metrics.exporter", "none",
+ "otel.traces.exporter", "none",
+ "otel.logs.exporter", "none"));
+ }
+
public static void assertMetricDoubleSumValue(Collection<MetricData> metrics, String metricName,
Attributes attributes, Consumer<Double> valueConsumer) {
assertThat(metrics)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/testcontext/PulsarTestContext.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/testcontext/PulsarTestContext.java
index 09cd4f7cb1a..7f783524439 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/testcontext/PulsarTestContext.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/testcontext/PulsarTestContext.java
@@ -747,7 +747,8 @@ public class PulsarTestContext implements AutoCloseable {
var reader = InMemoryMetricReader.create();
openTelemetryMetricReader(reader);
registerCloseable(reader);
- openTelemetrySdkBuilderCustomizer = BrokerOpenTelemetryTestUtil.getOpenTelemetrySdkBuilderConsumer(reader);
+ openTelemetrySdkBuilderCustomizer =
+ BrokerOpenTelemetryTestUtil.getOpenTelemetrySdkBuilderConsumer(reader);
} else {
openTelemetrySdkBuilderCustomizer = null;
}
diff --git a/pulsar-opentelemetry/src/test/java/org/apache/pulsar/opentelemetry/OpenTelemetryServiceTest.java b/pulsar-opentelemetry/src/test/java/org/apache/pulsar/opentelemetry/OpenTelemetryServiceTest.java
index f1a7ffaa122..99d4189d8f8 100644
--- a/pulsar-opentelemetry/src/test/java/org/apache/pulsar/opentelemetry/OpenTelemetryServiceTest.java
+++ b/pulsar-opentelemetry/src/test/java/org/apache/pulsar/opentelemetry/OpenTelemetryServiceTest.java
@@ -76,6 +76,11 @@ public class OpenTelemetryServiceTest {
(sdkMeterProviderBuilder, __) -> sdkMeterProviderBuilder.registerMetricReader(extraReader));
}
autoConfigurationCustomizer.disableShutdownHook();
+ // disable all autoconfigured exporters
+ autoConfigurationCustomizer.addPropertiesSupplier(() ->
+ Map.of("otel.metrics.exporter", "none",
+ "otel.traces.exporter", "none",
+ "otel.logs.exporter", "none"));
autoConfigurationCustomizer.addPropertiesSupplier(() -> extraProperties);
};
}