This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 570cb443eb2 [improve][test] Disable OTel autoconfigured exporters in
tests (#23540)
570cb443eb2 is described below
commit 570cb443eb220135861abf9e9de34ae65e5cdaaa
Author: Lari Hotari <[email protected]>
AuthorDate: Sat Nov 2 11:12:55 2024 +0200
[improve][test] Disable OTel autoconfigured exporters in tests (#23540)
---
.../bookkeeper/mledger/impl/cache/InflightReadsLimiterTest.java | 4 ++++
.../apache/pulsar/broker/stats/BrokerOpenTelemetryTestUtil.java | 8 ++++++++
.../org/apache/pulsar/broker/testcontext/PulsarTestContext.java | 3 ++-
.../org/apache/pulsar/opentelemetry/OpenTelemetryServiceTest.java | 5 +++++
4 files changed, 19 insertions(+), 1 deletion(-)
diff --git
a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/cache/InflightReadsLimiterTest.java
b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/cache/InflightReadsLimiterTest.java
index 281f19e3888..68135598e33 100644
---
a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/cache/InflightReadsLimiterTest.java
+++
b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/cache/InflightReadsLimiterTest.java
@@ -28,6 +28,7 @@ import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
+import java.util.Map;
import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.tuple.Pair;
@@ -207,6 +208,9 @@ public class InflightReadsLimiterTest {
var metricReader = InMemoryMetricReader.create();
var openTelemetry = AutoConfiguredOpenTelemetrySdk.builder()
.disableShutdownHook()
+ .addPropertiesSupplier(() -> Map.of("otel.metrics.exporter",
"none",
+ "otel.traces.exporter", "none",
+ "otel.logs.exporter", "none"))
.addMeterProviderCustomizer((builder, __) ->
builder.registerMetricReader(metricReader))
.build()
.getOpenTelemetrySdk();
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 69653ea26e2..0d46e80a703 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 cdb047079bf..6403c3bcec4 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
@@ -761,7 +761,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);
};
}
