[#11267] Use micrometer metric as default

pinpoint-apm · Aug 14, 2024 · 9c6cd77 · 9c6cd77
1 parent 9ddc23a
commit 9c6cd77
Show file tree

Hide file tree

Showing 16 changed files with 83 additions and 553 deletions.
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/config/HbaseAsyncConfiguration.java b/collector/src/main/java/com/navercorp/pinpoint/collector/config/HbaseAsyncConfiguration.java
@@ -17,10 +17,7 @@
 
 package com.navercorp.pinpoint.collector.config;
 
-import com.navercorp.pinpoint.collector.dao.hbase.BulkOperationReporter;
 import com.navercorp.pinpoint.collector.manage.HBaseManager;
-import com.navercorp.pinpoint.collector.monitor.dropwizard.BulkOperationMetrics;
-import com.navercorp.pinpoint.collector.monitor.dropwizard.HBaseAsyncOperationMetrics;
 import com.navercorp.pinpoint.common.hbase.async.HBaseTableMultiplexerFactory;
 import com.navercorp.pinpoint.common.hbase.async.HbasePutWriter;
 import com.navercorp.pinpoint.common.hbase.async.LoggingHbasePutWriter;
@@ -38,8 +35,6 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Primary;
 
-import java.util.List;
-
 @Configuration
 @Import({
         CommonCacheManagerConfiguration.class,
@@ -54,11 +49,6 @@ public HbaseBatchPerformanceCounter batchPerformanceCounter() {
         return new HbaseBatchPerformanceCounter();
     }
 
-    @Bean
-    public HBaseAsyncOperationMetrics asyncOperationMetrics(List<HBaseBatchPerformance> hBaseAsyncOperationList) {
-        return new HBaseAsyncOperationMetrics(hBaseAsyncOperationList);
-    }
-
     @Configuration
     @ConditionalOnProperty(name = "hbase.client.put-writer", havingValue = "tableMultiplexer")
     public static class TableMultiplexerConfig {
@@ -81,8 +71,8 @@ public HbasePutWriter hbasePutWriter(@Qualifier("batchConnectionFactory") Connec
 
         @Bean
         public HbasePutWriter spanPutWriter(@Qualifier("batchConnectionFactory") Connection connection,
-                                             HbaseBatchPerformanceCounter counter,
-                                             HbaseMultiplexerProperties properties) throws Exception {
+                                            HbaseBatchPerformanceCounter counter,
+                                            HbaseMultiplexerProperties properties) throws Exception {
             HbasePutWriter writer = newPutWriter(connection, counter, properties);
             logger.info("HbaseSpanPutWriter:{}", writer);
             return writer;
@@ -98,16 +88,9 @@ private HbasePutWriter newPutWriter(Connection connection, HbaseBatchPerformance
 
     }
 
-
-    @Bean
-    public BulkOperationMetrics cachedStatisticsDaoMetrics(List<BulkOperationReporter> bulkOperationReporters) {
-        return new BulkOperationMetrics(bulkOperationReporters);
-    }
-
     @Bean
     public HBaseManager hBaseManager(@Qualifier("batchPerformanceCounter") HBaseBatchPerformance hBaseAsyncOperation) {
         return new HBaseManager(hBaseAsyncOperation);
     }
 
-
 }
diff --git a/...ector/src/main/java/com/navercorp/pinpoint/collector/grpc/CollectorGrpcConfiguration.java b/...ector/src/main/java/com/navercorp/pinpoint/collector/grpc/CollectorGrpcConfiguration.java
@@ -17,7 +17,6 @@
 
 package com.navercorp.pinpoint.collector.grpc;
 
-import com.codahale.metrics.MetricRegistry;
 import com.navercorp.pinpoint.collector.grpc.channelz.ChannelzConfiguration;
 import com.navercorp.pinpoint.collector.grpc.config.GrpcAgentConfiguration;
 import com.navercorp.pinpoint.collector.grpc.config.GrpcAgentReceiverConfiguration;
@@ -28,17 +27,10 @@
 import com.navercorp.pinpoint.collector.grpc.config.GrpcStatConfiguration;
 import com.navercorp.pinpoint.collector.grpc.config.GrpcStatReceiverConfiguration;
 import com.navercorp.pinpoint.collector.monitor.MonitoredThreadPoolExecutorFactoryProvider;
-import com.navercorp.pinpoint.collector.monitor.config.DropwizardConfiguration;
 import com.navercorp.pinpoint.collector.monitor.config.MicrometerConfiguration;
-import com.navercorp.pinpoint.collector.monitor.dropwizard.DropwizardThreadPoolExecutorFactoryProvider;
 import com.navercorp.pinpoint.collector.monitor.MonitoringExecutors;
-import com.navercorp.pinpoint.collector.monitor.micrometer.MicrometerThreadPoolExecutorFactoryProvider;
 import com.navercorp.pinpoint.common.server.executor.ExecutorCustomizer;
-import io.micrometer.core.instrument.MeterRegistry;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -60,7 +52,6 @@
 
         GrpcKeepAliveScheduler.class,
 
-        DropwizardConfiguration.class,
         MicrometerConfiguration.class,
 
         ChannelzConfiguration.class

diff --git a/...ain/java/com/navercorp/pinpoint/collector/grpc/config/GrpcAgentReceiverConfiguration.java b/...ain/java/com/navercorp/pinpoint/collector/grpc/config/GrpcAgentReceiverConfiguration.java
@@ -16,16 +16,12 @@
 
 package com.navercorp.pinpoint.collector.grpc.config;
 
-import com.codahale.metrics.MetricRegistry;
-import com.navercorp.pinpoint.collector.monitor.MonitoredThreadPoolExecutorFactoryProvider;
 import com.navercorp.pinpoint.collector.monitor.MonitoringExecutors;
-import com.navercorp.pinpoint.collector.monitor.dropwizard.DropwizardThreadPoolExecutorFactoryProvider;
 import com.navercorp.pinpoint.collector.receiver.BindAddress;
 import com.navercorp.pinpoint.common.server.thread.MonitoringExecutorProperties;
 import com.navercorp.pinpoint.common.server.util.CallerUtils;
 import com.navercorp.pinpoint.grpc.server.ServerOption;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/...tor/src/main/java/com/navercorp/pinpoint/collector/grpc/config/GrpcSpanConfiguration.java b/...tor/src/main/java/com/navercorp/pinpoint/collector/grpc/config/GrpcSpanConfiguration.java
@@ -16,16 +16,12 @@
 
 package com.navercorp.pinpoint.collector.grpc.config;
 
-import com.codahale.metrics.MetricRegistry;
-import com.navercorp.pinpoint.collector.monitor.MonitoredThreadPoolExecutorFactoryProvider;
 import com.navercorp.pinpoint.collector.monitor.MonitoringExecutors;
-import com.navercorp.pinpoint.collector.monitor.dropwizard.DropwizardThreadPoolExecutorFactoryProvider;
 import com.navercorp.pinpoint.collector.receiver.BindAddress;
 import com.navercorp.pinpoint.common.server.thread.MonitoringExecutorProperties;
 import com.navercorp.pinpoint.common.server.util.CallerUtils;
 import com.navercorp.pinpoint.grpc.server.ServerOption;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/...tor/src/main/java/com/navercorp/pinpoint/collector/grpc/config/GrpcStatConfiguration.java b/...tor/src/main/java/com/navercorp/pinpoint/collector/grpc/config/GrpcStatConfiguration.java
@@ -16,17 +16,13 @@
 
 package com.navercorp.pinpoint.collector.grpc.config;
 
-import com.codahale.metrics.MetricRegistry;
-import com.navercorp.pinpoint.collector.monitor.MonitoredThreadPoolExecutorFactoryProvider;
 import com.navercorp.pinpoint.collector.monitor.MonitoringExecutors;
-import com.navercorp.pinpoint.collector.monitor.dropwizard.DropwizardThreadPoolExecutorFactoryProvider;
 import com.navercorp.pinpoint.collector.receiver.BindAddress;
 import com.navercorp.pinpoint.common.server.thread.MonitoringExecutorProperties;
 import com.navercorp.pinpoint.common.server.util.CallerUtils;
 import com.navercorp.pinpoint.grpc.server.ServerOption;
 import jakarta.inject.Provider;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/.../com/navercorp/pinpoint/collector/monitor/MonitoredThreadPoolExecutorFactoryProvider.java b/.../com/navercorp/pinpoint/collector/monitor/MonitoredThreadPoolExecutorFactoryProvider.java
@@ -15,12 +15,7 @@
  */
 package com.navercorp.pinpoint.collector.monitor;
 
-import com.codahale.metrics.MetricRegistry;
-import com.navercorp.pinpoint.collector.monitor.dropwizard.DropwizardThreadPoolExecutorFactory;
-import com.navercorp.pinpoint.collector.monitor.micrometer.MicrometerThreadPoolExecutorFactory;
 import com.navercorp.pinpoint.common.server.thread.MonitoringExecutorProperties;
-import io.micrometer.core.instrument.MeterRegistry;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author intr3p1d

diff --git a/...rc/main/java/com/navercorp/pinpoint/collector/monitor/config/DropwizardConfiguration.java b/...rc/main/java/com/navercorp/pinpoint/collector/monitor/config/DropwizardConfiguration.java
diff --git a/...rc/main/java/com/navercorp/pinpoint/collector/monitor/config/MicrometerConfiguration.java b/...rc/main/java/com/navercorp/pinpoint/collector/monitor/config/MicrometerConfiguration.java
@@ -15,35 +15,36 @@
  */
 package com.navercorp.pinpoint.collector.monitor.config;
 
+import com.navercorp.pinpoint.collector.dao.hbase.BulkOperationReporter;
 import com.navercorp.pinpoint.collector.monitor.MonitoredThreadPoolExecutorFactoryProvider;
+import com.navercorp.pinpoint.collector.monitor.micrometer.BulkOperationMetrics;
+import com.navercorp.pinpoint.collector.monitor.micrometer.HBaseAsyncOperationMetrics;
 import com.navercorp.pinpoint.collector.monitor.micrometer.MicrometerThreadPoolExecutorFactoryProvider;
+import com.navercorp.pinpoint.common.hbase.counter.HBaseBatchPerformance;
 import io.grpc.ServerInterceptor;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Timer;
-import io.micrometer.core.instrument.binder.MeterBinder;
 import io.micrometer.core.instrument.binder.grpc.MetricCollectingServerInterceptor;
 import io.micrometer.core.instrument.binder.logging.Log4j2Metrics;
 import io.micrometer.core.instrument.binder.netty4.NettyAllocatorMetrics;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.ByteBufAllocatorMetricProvider;
 import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.channel.EventLoopGroup;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.List;
+
 /**
  * @author intr3p1d
  */
 @Configuration
-@ConditionalOnProperty(
-        value = "pinpoint.modules.collector.monitor.metric",
-        havingValue = "micrometer"
-)
 public class MicrometerConfiguration {
     private final Logger logger = LogManager.getLogger(MicrometerConfiguration.class);
     private static final String GRPC_INTERCEPTOR_TAG_KEY = "service";
@@ -54,10 +55,12 @@ public MicrometerConfiguration() {
     }
 
     @Bean
-    @ConditionalOnProperty(
-            value = "pinpoint.modules.collector.monitor.metric",
-            havingValue = "micrometer"
-    )
+    @ConditionalOnMissingBean(MeterRegistry.class)
+    public MeterRegistry simpleMeterRegistry() {
+        return new SimpleMeterRegistry();
+    }
+
+    @Bean
     public MonitoredThreadPoolExecutorFactoryProvider micrometerMonitoredThreadPoolExecutorFactoryProvider(
             MeterRegistry meterRegistry
     ) {
@@ -112,11 +115,28 @@ private Timer.Builder addTimerTag(Timer.Builder builder, String tagValue) {
 
     @Bean
     @Qualifier("monitoredByteBufAllocator")
-    public ByteBufAllocator monitoredByteBufAllocator(MeterRegistry meterRegistry){
+    public ByteBufAllocator monitoredByteBufAllocator(MeterRegistry meterRegistry) {
         ByteBufAllocator allocator = PooledByteBufAllocator.DEFAULT;
         if (allocator != null) {
             new NettyAllocatorMetrics((ByteBufAllocatorMetricProvider) allocator).bindTo(meterRegistry);
         }
         return allocator;
     }
+
+    @Bean
+    public BulkOperationMetrics cachedStatisticsDaoMetrics(
+            List<BulkOperationReporter> bulkOperationReporters,
+            MeterRegistry meterRegistry
+    ) {
+        return new BulkOperationMetrics(bulkOperationReporters, meterRegistry);
+    }
+
+    @Bean
+    public HBaseAsyncOperationMetrics asyncOperationMetrics(
+            List<HBaseBatchPerformance> hBaseAsyncOperationList,
+            MeterRegistry meterRegistry
+    ) {
+        return new HBaseAsyncOperationMetrics(hBaseAsyncOperationList, meterRegistry);
+    }
+
 }