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 08:54:11 UTC
(pulsar) 01/12: [fix][test] Fix memory leak via OTel shutdown hooks in tests (#23483)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 48a6c99487e0456a2b5c34b8ee517f6b3935c46b
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Fri Oct 18 21:24:07 2024 +0300
[fix][test] Fix memory leak via OTel shutdown hooks in tests (#23483)
(cherry picked from commit 2d88a4e8b9f957d767b612620cfac8836cc56d70)
---
.../apache/bookkeeper/mledger/impl/cache/InflightReadsLimiterTest.java | 1 +
.../java/org/apache/pulsar/broker/stats/BrokerOpenTelemetryTestUtil.java | 1 +
.../java/org/apache/pulsar/opentelemetry/OpenTelemetryServiceTest.java | 1 +
3 files changed, 3 insertions(+)
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 89bdda15afb..281f19e3888 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
@@ -206,6 +206,7 @@ public class InflightReadsLimiterTest {
private Pair<OpenTelemetrySdk, InMemoryMetricReader> buildOpenTelemetryAndReader() {
var metricReader = InMemoryMetricReader.create();
var openTelemetry = AutoConfiguredOpenTelemetrySdk.builder()
+ .disableShutdownHook()
.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 d7ad0588201..69653ea26e2 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
@@ -35,6 +35,7 @@ public class BrokerOpenTelemetryTestUtil {
return sdkBuilder -> {
sdkBuilder.addMeterProviderCustomizer(
(meterProviderBuilder, __) -> meterProviderBuilder.registerMetricReader(reader));
+ sdkBuilder.disableShutdownHook();
sdkBuilder.addPropertiesSupplier(
() -> Map.of(OpenTelemetryService.OTEL_SDK_DISABLED_KEY, "false",
"otel.java.enabled.resource.providers", "none"));
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 31a6c60f83a..f1a7ffaa122 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
@@ -75,6 +75,7 @@ public class OpenTelemetryServiceTest {
autoConfigurationCustomizer.addMeterProviderCustomizer(
(sdkMeterProviderBuilder, __) -> sdkMeterProviderBuilder.registerMetricReader(extraReader));
}
+ autoConfigurationCustomizer.disableShutdownHook();
autoConfigurationCustomizer.addPropertiesSupplier(() -> extraProperties);
};
}