Stop reporting datasource timeout configuration as metrics

CHANGES.md

@@ -40,6 +40,8 @@ Release Notes.
   `apm-application-toolkit` and therefore of every published toolkit artifact, but 9.7.0 skipped it,
   so resolving any `org.apache.skywalking:apm-toolkit-*:9.7.0` failed with `Non-resolvable parent POM
   ... Could not find artifact org.apache.skywalking:java-agent:pom:9.7.0` (apache/skywalking#13988).
+* Stop reporting datasource timeout configuration as metrics. The c3p0 `maxIdleTime`, DBCP `maxWaitMillis`
+  and HikariCP `connectionTimeout`, `validationTimeout`, `idleTimeout` and `leakDetectionThreshold` gauges are no longer reported.
 
 All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/263?closed=1)
 

apm-sniffer/apm-sdk-plugin/c3p0-0.9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/c3p0/PoolConstants.java

@@ -27,7 +27,6 @@ public class PoolConstants {
     public static final String NUM_TOTAL_CONNECTIONS = "numTotalConnections";
     public static final String NUM_BUSY_CONNECTIONS = "numBusyConnections";
     public static final String NUM_IDLE_CONNECTIONS = "numIdleConnections";
-    public static final String MAX_IDLE_TIME = "maxIdleTime";
     public static final String MIN_POOL_SIZE = "minPoolSize";
     public static final String MAX_POOL_SIZE = "maxPoolSize";
     public static final String INITIAL_POOL_SIZE = "initialPoolSize";

apm-sniffer/apm-sdk-plugin/c3p0-0.9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/c3p0/PoolingCreationInterceptor.java

@@ -111,10 +111,6 @@ private Map<String, Function<ComboPooledDataSource, Supplier<Double>>> getMetric
             }
             return numIdleConnections;
         });
-        metricMap.put(
-            PoolConstants.MAX_IDLE_TIME,
-            (ComboPooledDataSource pooledDataSource) -> () -> (double) pooledDataSource.getMaxIdleTime()
-        );
         metricMap.put(
             PoolConstants.MIN_POOL_SIZE,
             (ComboPooledDataSource pooledDataSource) -> () -> (double) pooledDataSource.getMinPoolSize()

apm-sniffer/apm-sdk-plugin/dbcp-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/dbcp/v2/PoolingJmxRegisterInterceptor.java

@@ -62,7 +62,6 @@ private Map<String, Function<BasicDataSourceMXBean, Supplier<Double>>> getMetric
         metricMap.put("numActive", (BasicDataSourceMXBean basicDataSource) -> () -> (double) basicDataSource.getNumActive());
         metricMap.put("maxTotal", (BasicDataSourceMXBean basicDataSource) -> () -> (double) basicDataSource.getMaxTotal());
         metricMap.put("numIdle", (BasicDataSourceMXBean basicDataSource) -> () -> (double) (basicDataSource.getNumIdle()));
-        metricMap.put("maxWaitMillis", (BasicDataSourceMXBean basicDataSource) -> () -> (double) basicDataSource.getMaxWaitMillis());
         metricMap.put("maxIdle", (BasicDataSourceMXBean basicDataSource) -> () -> (double) basicDataSource.getMaxIdle());
         metricMap.put("minIdle", (BasicDataSourceMXBean basicDataSource) -> () -> (double) basicDataSource.getMinIdle());
         metricMap.put("initialSize", (BasicDataSourceMXBean basicDataSource) -> () -> (double) basicDataSource.getInitialSize());

apm-sniffer/apm-sdk-plugin/hikaricp-3.x-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hikaricp/PoolingSealInterceptor.java

@@ -34,7 +34,7 @@
 import java.util.function.Supplier;
 
 /**
- * {@link PoolingSealInterceptor} intercepted the method of HikariCP getting connection.
+ * Registers HikariCP datasource metrics when the connection pool is sealed.
  */
 public class PoolingSealInterceptor implements InstanceMethodsAroundInterceptor {
 
@@ -81,10 +81,6 @@ private Map<String, Function<HikariPoolMXBean, Supplier<Double>>> getPoolMetrics
 
     private Map<String, Function<HikariConfigMXBean, Supplier<Double>>> getConfigMetrics() {
         final Map<String, Function<HikariConfigMXBean, Supplier<Double>>> metricConfigMap = new HashMap();
-        metricConfigMap.put("connectionTimeout", (HikariConfigMXBean hikariConfigMXBean) -> () -> (double) hikariConfigMXBean.getConnectionTimeout());
-        metricConfigMap.put("validationTimeout", (HikariConfigMXBean hikariConfigMXBean) -> () -> (double) hikariConfigMXBean.getValidationTimeout());
-        metricConfigMap.put("idleTimeout", (HikariConfigMXBean hikariConfigMXBean) -> () -> (double) hikariConfigMXBean.getIdleTimeout());
-        metricConfigMap.put("leakDetectionThreshold", (HikariConfigMXBean hikariConfigMXBean) -> () -> (double) hikariConfigMXBean.getLeakDetectionThreshold());
         metricConfigMap.put("minimumIdle", (HikariConfigMXBean hikariConfigMXBean) -> () -> (double) hikariConfigMXBean.getMinimumIdle());
         metricConfigMap.put("maximumPoolSize", (HikariConfigMXBean hikariConfigMXBean) -> () -> (double) hikariConfigMXBean.getMaximumPoolSize());
         return metricConfigMap;

test/plugin/scenarios/c3p0-0.9.0.x-0.9.1.x-scenario/config/expectedData.yaml

@@ -212,20 +212,14 @@ segmentItems:
         - {key: http.status_code, value: '200'}
 meterItems:
 - serviceName: c3p0-0.9.0.x-0.9.1.x-scenario
-  meterSize: ge 12
+  meterSize: ge 11
   meters:
   - meterId:
       name: datasource
       tags:
       - {name: name, value: test_mysql-server:3306}
       - {name: status, value: initialPoolSize}
     singleValue: ge 0
-  - meterId:
-      name: datasource
-      tags:
-      - {name: name, value: test_mysql-server:3306}
-      - {name: status, value: maxIdleTime}
-    singleValue: ge 0
   - meterId:
       name: datasource
       tags:

test/plugin/scenarios/c3p0-0.9.2.x-0.10.x-scenario/config/expectedData.yaml

@@ -212,20 +212,14 @@ segmentItems:
         - {key: http.status_code, value: '200'}
 meterItems:
 - serviceName: c3p0-0.9.2.x-0.10.x-scenario
-  meterSize: ge 12
+  meterSize: ge 11
   meters:
   - meterId:
       name: datasource
       tags:
       - {name: name, value: test_mysql-server:3306}
       - {name: status, value: initialPoolSize}
     singleValue: ge 0
-  - meterId:
-      name: datasource
-      tags:
-      - {name: name, value: test_mysql-server:3306}
-      - {name: status, value: maxIdleTime}
-    singleValue: ge 0
   - meterId:
       name: datasource
       tags:

test/plugin/scenarios/dbcp-2.x-scenario/config/expectedData.yaml

@@ -224,7 +224,7 @@ segmentItems:
         - {key: http.status_code, value: '200'}
 meterItems:
 - serviceName: dbcp-2.x-scenario
-  meterSize: ge 12
+  meterSize: ge 11
   meters:
   - meterId:
       name: datasource
@@ -244,12 +244,6 @@ meterItems:
       - {name: name, value: test_mysql-server:3306}
       - {name: status, value: numIdle}
     singleValue: ge 0
-  - meterId:
-      name: datasource
-      tags:
-      - {name: name, value: test_mysql-server:3306}
-      - {name: status, value: maxWaitMillis}
-    singleValue: ge -1
   - meterId:
       name: datasource
       tags:

test/plugin/scenarios/hikaricp-scenario/config/expectedData.yaml

@@ -206,7 +206,7 @@ segmentItems:
       - {key: http.status_code, value: '200'}
 meterItems:
 - serviceName: hikaricp-scenario
-  meterSize: ge 15
+  meterSize: ge 11
   meters:
   - meterId:
       name: datasource
@@ -232,30 +232,6 @@ meterItems:
         - {name: name, value: test_mysql-server:3306}
         - {name: status, value: threadsAwaitingConnection}
     singleValue: ge 0
-  - meterId:
-      name: datasource
-      tags:
-        - {name: name, value: test_mysql-server:3306}
-        - {name: status, value: connectionTimeout}
-    singleValue: ge 0
-  - meterId:
-      name: datasource
-      tags:
-        - {name: name, value: test_mysql-server:3306}
-        - {name: status, value: validationTimeout}
-    singleValue: ge 0
-  - meterId:
-      name: datasource
-      tags:
-        - {name: name, value: test_mysql-server:3306}
-        - {name: status, value: idleTimeout}
-    singleValue: ge 0
-  - meterId:
-      name: datasource
-      tags:
-        - {name: name, value: test_mysql-server:3306}
-        - {name: status, value: leakDetectionThreshold}
-    singleValue: ge 0
   - meterId:
       name: datasource
       tags: