Display memory pool pinpoint-apm#628

dawidmalina · Dec 17, 2015 · e578059 · e578059
1 parent 78b3374
commit e578059
Show file tree

Hide file tree

Showing 37 changed files with 4,339 additions and 3,089 deletions.
diff --git a/agent/src/main/resources/pinpoint.config b/agent/src/main/resources/pinpoint.config
@@ -27,6 +27,9 @@ profiler.enable=true
 
 profiler.jvm.collect.interval=1000
 
+# Allow to add detailed collector's metrics
+profiler.jvm.collect.detailed.metrics=true
+
 # Allow sampling.
 profiler.sampling.enable=true
 

diff --git a/...rap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java b/...rap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java
@@ -164,6 +164,7 @@ public static ProfilerConfig load(String pinpointConfigFileName) throws IOExcept
     private int ioBufferingBufferSize;
 
     private int profileJvmCollectInterval;
+    private boolean profilerJvmCollectDetailedMetrics;
 
     private Filter<String> profilableClassFilter = new SkipFilter<String>();
 
@@ -316,6 +317,16 @@ public int getProfileJvmCollectInterval() {
         return profileJvmCollectInterval;
     }
 
+    @Override
+    public boolean isProfilerJvmCollectDetailedMetrics() {
+        return profilerJvmCollectDetailedMetrics;
+    }
+
+    @Override
+    public void setProfilerJvmCollectDetailedMetrics(boolean profilerJvmCollectDetailedMetrics) {
+        this.profilerJvmCollectDetailedMetrics = profilerJvmCollectDetailedMetrics;
+    }
+
     @Override
     public long getAgentInfoSendRetryInterval() {
         return agentInfoSendRetryInterval;
@@ -639,6 +650,7 @@ void readPropertyValues() {
 
         // JVM
         this.profileJvmCollectInterval = readInt("profiler.jvm.collect.interval", 1000);
+        this.profilerJvmCollectDetailedMetrics = readBoolean("profiler.jvm.collect.detailed.metrics", false);
 
         this.agentInfoSendRetryInterval = readLong("profiler.agentInfo.send.retry.interval", DEFAULT_AGENT_INFO_SEND_RETRY_INTERVAL);
 
@@ -871,4 +883,5 @@ public String toString() {
         builder.append("}");
         return builder.toString();
     }
+
 }
diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ProfilerConfig.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ProfilerConfig.java
@@ -73,6 +73,10 @@ public interface ProfilerConfig {
 
     int getProfileJvmCollectInterval();
 
+    boolean isProfilerJvmCollectDetailedMetrics();
+
+    void setProfilerJvmCollectDetailedMetrics(boolean profilerJvmCollectDetailedMetrics);
+
     long getAgentInfoSendRetryInterval();
 
     boolean isTomcatHidePinpointHeader();

diff --git a/collector/pom.xml b/collector/pom.xml
@@ -148,15 +148,15 @@
 
         <!-- serving performance metrics -->
         <dependency>
-            <groupId>com.codahale.metrics</groupId>
+            <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.codahale.metrics</groupId>
+            <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-jvm</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.codahale.metrics</groupId>
+            <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-servlets</artifactId>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -53,7 +53,7 @@
         <jdk.version>1.6</jdk.version>
         <jdk.home>${env.JAVA_6_HOME}</jdk.home>
         <slf4j.version>1.7.5</slf4j.version>
-        <metrics.version>3.0.1</metrics.version>
+        <metrics.version>3.1.2</metrics.version>
         <spring.version>4.1.8.RELEASE</spring.version>
         <jetty.version>8.1.12.v20130726</jetty.version>
         <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
@@ -251,17 +251,17 @@
 
             <!-- serving performance metrics -->
             <dependency>
-                <groupId>com.codahale.metrics</groupId>
+                <groupId>io.dropwizard.metrics</groupId>
                 <artifactId>metrics-core</artifactId>
                 <version>${metrics.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.codahale.metrics</groupId>
+                <groupId>io.dropwizard.metrics</groupId>
                 <artifactId>metrics-jvm</artifactId>
                 <version>${metrics.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.codahale.metrics</groupId>
+                <groupId>io.dropwizard.metrics</groupId>
                 <artifactId>metrics-servlets</artifactId>
                 <version>${metrics.version}</version>
             </dependency>

diff --git a/profiler/pom.xml b/profiler/pom.xml
@@ -254,20 +254,20 @@
 
         <!-- serving performance metrics -->
         <dependency>
-            <groupId>com.codahale.metrics</groupId>
+            <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.codahale.metrics</groupId>
+            <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-jvm</artifactId>
         </dependency>
         <!--<dependency> -->
-        <!--<groupId>com.codahale.metrics</groupId> -->
+        <!--<groupId>io.dropwizard.metrics</groupId> -->
         <!--<artifactId>metrics-json</artifactId> -->
         <!--<version>${metrics.version}</version> -->
         <!--</dependency> -->
         <!--<dependency> -->
-        <!--<groupId>com.codahale.metrics</groupId> -->
+        <!--<groupId>io.dropwizard.metrics</groupId> -->
         <!--<artifactId>metrics-healthchecks</artifactId> -->
         <!--<version>${metrics.version}</version> -->
         <!--</dependency> -->

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/DefaultAgent.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/DefaultAgent.java
@@ -193,7 +193,7 @@ public DefaultAgent(AgentOption agentOption, final InterceptorRegistryBinder int
         this.agentInfoSender = new AgentInfoSender.Builder(tcpDataSender, this.agentInformation).sendInterval(profilerConfig.getAgentInfoSendRetryInterval()).build();
         this.serverMetaDataHolder.addListener(this.agentInfoSender);
 
-        AgentStatCollectorFactory agentStatCollectorFactory = new AgentStatCollectorFactory(this.getTransactionCounter(this.traceContext));
+        AgentStatCollectorFactory agentStatCollectorFactory = new AgentStatCollectorFactory(this.getTransactionCounter(this.traceContext), this.profilerConfig);
         this.agentStatMonitor = new AgentStatMonitor(this.statDataSender, this.agentInformation.getAgentId(), this.agentInformation.getStartTime(), agentStatCollectorFactory);
 
         InterceptorInvokerHelper.setPropagateException(profilerConfig.isPropagateInterceptorException());

diff --git a/...main/java/com/navercorp/pinpoint/profiler/monitor/codahale/AgentStatCollectorFactory.java b/...main/java/com/navercorp/pinpoint/profiler/monitor/codahale/AgentStatCollectorFactory.java
@@ -16,15 +16,20 @@
 
 package com.navercorp.pinpoint.profiler.monitor.codahale;
 
+import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
 import com.navercorp.pinpoint.profiler.context.TransactionCounter;
 import com.navercorp.pinpoint.profiler.monitor.MonitorName;
 import com.navercorp.pinpoint.profiler.monitor.codahale.cpu.CpuLoadCollector;
 import com.navercorp.pinpoint.profiler.monitor.codahale.cpu.metric.CpuLoadMetricSet;
 import com.navercorp.pinpoint.profiler.monitor.codahale.gc.CmsCollector;
+import com.navercorp.pinpoint.profiler.monitor.codahale.gc.CmsDetailedMetricsCollector;
 import com.navercorp.pinpoint.profiler.monitor.codahale.gc.G1Collector;
+import com.navercorp.pinpoint.profiler.monitor.codahale.gc.G1DetailedMetricsCollector;
 import com.navercorp.pinpoint.profiler.monitor.codahale.gc.GarbageCollector;
 import com.navercorp.pinpoint.profiler.monitor.codahale.gc.ParallelCollector;
+import com.navercorp.pinpoint.profiler.monitor.codahale.gc.ParallelDetailedMetricsCollector;
 import com.navercorp.pinpoint.profiler.monitor.codahale.gc.SerialCollector;
+import com.navercorp.pinpoint.profiler.monitor.codahale.gc.SerialDetailedMetricsCollector;
 import com.navercorp.pinpoint.profiler.monitor.codahale.gc.UnknownGarbageCollector;
 import com.navercorp.pinpoint.profiler.monitor.codahale.tps.TransactionMetricCollector;
 import com.navercorp.pinpoint.profiler.monitor.codahale.tps.metric.TransactionMetricSet;
@@ -49,9 +54,9 @@ public class AgentStatCollectorFactory {
     private final CpuLoadCollector cpuLoadCollector;
     private final TransactionMetricCollector transactionMetricCollector;
 
-    public AgentStatCollectorFactory(TransactionCounter transactionCounter) {
+    public AgentStatCollectorFactory(TransactionCounter transactionCounter, ProfilerConfig profilerConfig) {
         this.monitorRegistry = createRegistry();
-        this.garbageCollector = createGarbageCollector();
+        this.garbageCollector = createGarbageCollector(profilerConfig.isProfilerJvmCollectDetailedMetrics());
         this.cpuLoadCollector = createCpuLoadCollector();
         this.transactionMetricCollector = createTransactionMetricCollector(transactionCounter);
     }
@@ -64,24 +69,36 @@ private MetricMonitorRegistry createRegistry() {
     /**
      * create with garbage collector types based on metric registry keys
      */
-    private GarbageCollector createGarbageCollector() {
+    private GarbageCollector createGarbageCollector(boolean collectDetailedMetrics) {
         MetricMonitorRegistry registry = this.monitorRegistry;
         registry.registerJvmMemoryMonitor(new MonitorName(MetricMonitorValues.JVM_MEMORY));
         registry.registerJvmGcMonitor(new MonitorName(MetricMonitorValues.JVM_GC));
 
         Collection<String> keys = registry.getRegistry().getNames();
-        GarbageCollector garbageCollectorToReturn;
-        if (keys.contains(JVM_GC_SERIAL_MSC_COUNT)) {
-            garbageCollectorToReturn = new SerialCollector(registry);
-        } else if (keys.contains(JVM_GC_PS_MS_COUNT)) {
-            garbageCollectorToReturn = new ParallelCollector(registry);
-        } else if (keys.contains(JVM_GC_CMS_COUNT)) {
-            garbageCollectorToReturn = new CmsCollector(registry);
-        } else if (keys.contains(JVM_GC_G1_OLD_COUNT)) {
-            garbageCollectorToReturn = new G1Collector(registry);
+        GarbageCollector garbageCollectorToReturn = new UnknownGarbageCollector();
+
+        if (collectDetailedMetrics) {
+            if (keys.contains(JVM_GC_SERIAL_OLDGEN_COUNT)) {
+                garbageCollectorToReturn = new SerialDetailedMetricsCollector(registry);
+            } else if (keys.contains(JVM_GC_PS_OLDGEN_COUNT)) {
+                garbageCollectorToReturn = new ParallelDetailedMetricsCollector(registry);
+            } else if (keys.contains(JVM_GC_CMS_OLDGEN_COUNT)) {
+                garbageCollectorToReturn = new CmsDetailedMetricsCollector(registry);
+            } else if (keys.contains(JVM_GC_G1_OLDGEN_COUNT)) {
+                garbageCollectorToReturn = new G1DetailedMetricsCollector(registry);
+            }
         } else {
-            garbageCollectorToReturn = new UnknownGarbageCollector();
+            if (keys.contains(JVM_GC_SERIAL_OLDGEN_COUNT)) {
+                garbageCollectorToReturn = new SerialCollector(registry);
+            } else if (keys.contains(JVM_GC_PS_OLDGEN_COUNT)) {
+                garbageCollectorToReturn = new ParallelCollector(registry);
+            } else if (keys.contains(JVM_GC_CMS_OLDGEN_COUNT)) {
+                garbageCollectorToReturn = new CmsCollector(registry);
+            } else if (keys.contains(JVM_GC_G1_OLDGEN_COUNT)) {
+                garbageCollectorToReturn = new G1Collector(registry);
+            }
         }
+
         if (logger.isInfoEnabled()) {
             logger.info("found : {}", garbageCollectorToReturn);
         }