remove PulsarBrokerInterceptorOpenTelemetry

crossoverJie · May 25, 2024 · e4fd028 · e4fd028
1 parent 1affc88
commit e4fd028
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 74 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
@@ -111,7 +111,6 @@
 import org.apache.pulsar.broker.stats.MetricsGenerator;
 import org.apache.pulsar.broker.stats.OpenTelemetryConsumerStats;
 import org.apache.pulsar.broker.stats.OpenTelemetryTopicStats;
-import org.apache.pulsar.broker.stats.PulsarBrokerInterceptorOpenTelemetry;
 import org.apache.pulsar.broker.stats.PulsarBrokerOpenTelemetry;
 import org.apache.pulsar.broker.stats.prometheus.PrometheusMetricsServlet;
 import org.apache.pulsar.broker.stats.prometheus.PrometheusRawMetricsProvider;
@@ -255,7 +254,6 @@ public class PulsarService implements AutoCloseable, ShutdownService {
 
     private MetricsGenerator metricsGenerator;
     private final PulsarBrokerOpenTelemetry openTelemetry;
-    private PulsarBrokerInterceptorOpenTelemetry interceptorOpenTelemetry;
     private OpenTelemetryTopicStats openTelemetryTopicStats;
     private OpenTelemetryConsumerStats openTelemetryConsumerStats;
 
@@ -329,8 +327,6 @@ public PulsarService(ServiceConfiguration config,
         this.config = config;
 
         this.openTelemetry = new PulsarBrokerOpenTelemetry(config, openTelemetrySdkBuilderCustomizer);
-        this.interceptorOpenTelemetry = new PulsarBrokerInterceptorOpenTelemetry(config,
-                openTelemetrySdkBuilderCustomizer);
 
         // validate `advertisedAddress`, `advertisedListeners`, `internalListenerName`
         this.advertisedListeners = MultipleListenerValidator.validateAndAnalysisAdvertisedListener(config);
@@ -496,9 +492,6 @@ public CompletableFuture<Void> closeAsync() {
             if (openTelemetry != null) {
                 openTelemetry.close();
             }
-            if (interceptorOpenTelemetry != null) {
-                interceptorOpenTelemetry.close();
-            }
 
             if (this.compactionServiceFactory != null) {
                 try {
@@ -851,7 +844,6 @@ public void start() throws PulsarServerException {
             // use getter to support mocking getBrokerInterceptor method in tests
             BrokerInterceptor interceptor = getBrokerInterceptor();
             if (interceptor != null) {
-                this.interceptorOpenTelemetry.build();
                 brokerService.setInterceptor(interceptor);
                 interceptor.initialize(this);
             }

diff --git a/...er/src/main/java/org/apache/pulsar/broker/stats/PulsarBrokerInterceptorOpenTelemetry.java b/...er/src/main/java/org/apache/pulsar/broker/stats/PulsarBrokerInterceptorOpenTelemetry.java
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/CounterBrokerInterceptor.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/CounterBrokerInterceptor.java
@@ -294,7 +294,7 @@ public void txnEnded(String txnID, long txnAction) {
 
     @Override
     public void initialize(PulsarService pulsarService) throws Exception {
-        var meter = pulsarService.getInterceptorOpenTelemetry().getMeter();
+        var meter = pulsarService.getOpenTelemetry().getMeter();
 
         messageCounter = meter
                 .counterBuilder(MESSAGE_COUNTER)