Rename metrics instrumentations (signalfx#769)

Mateusz Rzeszutek · web-flow · commit 7cce6a092696 · 2022-05-06T15:11:09.000-07:00
diff --git a/docs/metrics.md b/docs/metrics.md
@@ -84,18 +84,18 @@ For more details on using the Micrometer API please consult the [Micrometer docs
 
 The following metrics are currently gathered by the agent:
 
-| Library/Framework                                                    | Instrumentation name | Versions |
-| -------------------------------------------------------------------- | -------------------- | -------- |
-| [JVM metrics](#jvm)                                                  | `jvm-metrics`        | [Java runtimes version 8 and higher](../README.md#requirements)
-| [Apache DBCP2 connection pool metrics](#connection-pool-metrics)     | `commons-dbcp2`      | 2.0 and higher
-| [c3p0 connection pool metrics](#connection-pool-metrics)             | `c3p0`               | 0.9.5 and higher
-| [HikariCP connection pool metrics](#connection-pool-metrics)         | `hikaricp`           | 3.0 and higher
-| [Oracle Universal Connection Pool metrics](#connection-pool-metrics) | `oracle-ucp`         | 11.2.0.4 and higher
-| [Tomcat JDBC connection pool metrics](#connection-pool-metrics)      | `tomcat-jdbc`        | 8.5 and higher
-| [Vibur DBCP connection pool metrics](#connection-pool-metrics)       | `vibur-dbcp`         | 20.0 and higher
-| [Tomcat thread pool metrics](#thread-pool-metrics)                   | `tomcat`             | 8.5 and higher
-| [WebSphere Liberty web request thread pool](#thread-pool-metrics)    | `liberty`            | 20.0.0.12
-| [WebLogic thread pools](#thread-pool-metrics)                        | `weblogic`           | 12.x and 14.x
+| Library/Framework                                                    | Instrumentation name   | Versions |
+| -------------------------------------------------------------------- |------------------------| -------- |
+| [JVM metrics](#jvm)                                                  | `jvm-metrics-splunk`   | [Java runtimes version 8 and higher](../README.md#requirements)
+| [Apache DBCP2 connection pool metrics](#connection-pool-metrics)     | `commons-dbcp2-splunk` | 2.0 and higher
+| [c3p0 connection pool metrics](#connection-pool-metrics)             | `c3p0-splunk`          | 0.9.5 and higher
+| [HikariCP connection pool metrics](#connection-pool-metrics)         | `hikaricp-splunk`      | 3.0 and higher
+| [Oracle Universal Connection Pool metrics](#connection-pool-metrics) | `oracle-ucp-splunk`    | 11.2.0.4 and higher
+| [Tomcat JDBC connection pool metrics](#connection-pool-metrics)      | `tomcat-jdbc-splunk`   | 8.5 and higher
+| [Vibur DBCP connection pool metrics](#connection-pool-metrics)       | `vibur-dbcp-splunk`    | 20.0 and higher
+| [Tomcat thread pool metrics](#thread-pool-metrics)                   | `tomcat`               | 8.5 and higher
+| [WebSphere Liberty web request thread pool](#thread-pool-metrics)    | `liberty`              | 20.0.0.12
+| [WebLogic thread pools](#thread-pool-metrics)                        | `weblogic`             | 12.x and 14.x
 
 ### JVM
 
diff --git a/instrumentation/c3p0/src/main/java/com/splunk/opentelemetry/instrumentation/c3p0/C3p0InstrumentationModule.java b/instrumentation/c3p0/src/main/java/com/splunk/opentelemetry/instrumentation/c3p0/C3p0InstrumentationModule.java
@@ -27,7 +27,7 @@
 public class C3p0InstrumentationModule extends MetricsInstrumentationModule {
 
   public C3p0InstrumentationModule() {
-    super("c3p0");
+    super("c3p0-splunk");
   }
 
   @Override
diff --git a/instrumentation/commons-dbcp2/src/main/java/com/splunk/opentelemetry/instrumentation/commonsdbcp2/CommonsDbcp2InstrumentationModule.java b/instrumentation/commons-dbcp2/src/main/java/com/splunk/opentelemetry/instrumentation/commonsdbcp2/CommonsDbcp2InstrumentationModule.java
@@ -27,7 +27,7 @@
 @AutoService(InstrumentationModule.class)
 public class CommonsDbcp2InstrumentationModule extends MetricsInstrumentationModule {
   public CommonsDbcp2InstrumentationModule() {
-    super("commons-dbcp2");
+    super("commons-dbcp2-splunk");
   }
 
   @Override
diff --git a/instrumentation/hikaricp/src/main/java/com/splunk/opentelemetry/instrumentation/hikaricp/HikariInstrumentationModule.java b/instrumentation/hikaricp/src/main/java/com/splunk/opentelemetry/instrumentation/hikaricp/HikariInstrumentationModule.java
@@ -26,7 +26,7 @@
 @AutoService(InstrumentationModule.class)
 public class HikariInstrumentationModule extends InstrumentationModule {
   public HikariInstrumentationModule() {
-    super("hikari", "hikaricp");
+    super("hikari-splunk", "hikaricp-splunk");
   }
 
   @Override
diff --git a/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/JvmMetricsInstaller.java b/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/JvmMetricsInstaller.java
@@ -38,7 +38,8 @@ public void afterAgent(
       Config config, AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
     boolean metricsRegistryPresent = !Metrics.globalRegistry.getRegistries().isEmpty();
     AgentConfig agentConfig = new AgentConfig(config);
-    if (!agentConfig.isInstrumentationEnabled(singleton("jvm-metrics"), metricsRegistryPresent)) {
+    if (!agentConfig.isInstrumentationEnabled(
+        singleton("jvm-metrics-splunk"), metricsRegistryPresent)) {
       return;
     }
 
diff --git a/instrumentation/liberty/src/main/java/com/splunk/opentelemetry/instrumentation/liberty/metrics/LibertyMetricsInstrumentationModule.java b/instrumentation/liberty/src/main/java/com/splunk/opentelemetry/instrumentation/liberty/metrics/LibertyMetricsInstrumentationModule.java
@@ -29,7 +29,7 @@
 @AutoService(InstrumentationModule.class)
 public class LibertyMetricsInstrumentationModule extends MetricsInstrumentationModule {
   public LibertyMetricsInstrumentationModule() {
-    super("liberty", "liberty-metrics");
+    super("liberty", "liberty-metrics-splunk");
   }
 
   @Override
diff --git a/instrumentation/oracle-ucp/src/main/java/com/splunk/opentelemetry/instrumentation/oracleucp/OracleUcpInstrumentationModule.java b/instrumentation/oracle-ucp/src/main/java/com/splunk/opentelemetry/instrumentation/oracleucp/OracleUcpInstrumentationModule.java
@@ -27,7 +27,7 @@
 public class OracleUcpInstrumentationModule extends InstrumentationModule {
 
   public OracleUcpInstrumentationModule() {
-    super("oracle-ucp");
+    super("oracle-ucp-splunk");
   }
 
   @Override
diff --git a/instrumentation/tomcat-jdbc/src/main/java/com/splunk/opentelemetry/instrumentation/tomcatjdbc/TomcatJdbcInstrumentationModule.java b/instrumentation/tomcat-jdbc/src/main/java/com/splunk/opentelemetry/instrumentation/tomcatjdbc/TomcatJdbcInstrumentationModule.java
@@ -27,7 +27,7 @@
 @AutoService(InstrumentationModule.class)
 public class TomcatJdbcInstrumentationModule extends MetricsInstrumentationModule {
   public TomcatJdbcInstrumentationModule() {
-    super("tomcat-jdbc");
+    super("tomcat-jdbc-splunk");
   }
 
   @Override
diff --git a/instrumentation/tomcat/src/main/java/com/splunk/opentelemetry/instrumentation/tomcat/metrics/TomcatMetricsInstrumentationModule.java b/instrumentation/tomcat/src/main/java/com/splunk/opentelemetry/instrumentation/tomcat/metrics/TomcatMetricsInstrumentationModule.java
@@ -29,7 +29,7 @@
 @AutoService(InstrumentationModule.class)
 public class TomcatMetricsInstrumentationModule extends MetricsInstrumentationModule {
   public TomcatMetricsInstrumentationModule() {
-    super("tomcat", "tomcat-metrics");
+    super("tomcat", "tomcat-metrics-splunk");
   }
 
   @Override
diff --git a/instrumentation/vibur-dbcp/src/main/java/com/splunk/opentelemetry/instrumentation/viburdbcp/ViburDbcpInstrumentationModule.java b/instrumentation/vibur-dbcp/src/main/java/com/splunk/opentelemetry/instrumentation/viburdbcp/ViburDbcpInstrumentationModule.java
@@ -27,7 +27,7 @@
 @AutoService(InstrumentationModule.class)
 public class ViburDbcpInstrumentationModule extends MetricsInstrumentationModule {
   public ViburDbcpInstrumentationModule() {
-    super("vibur-dbcp");
+    super("vibur-dbcp-splunk");
   }
 
   @Override
diff --git a/instrumentation/weblogic/src/main/java/com/splunk/opentelemetry/instrumentation/weblogic/metrics/WebLogicMetricsInstrumentationModule.java b/instrumentation/weblogic/src/main/java/com/splunk/opentelemetry/instrumentation/weblogic/metrics/WebLogicMetricsInstrumentationModule.java
@@ -27,7 +27,7 @@
 @AutoService(InstrumentationModule.class)
 public class WebLogicMetricsInstrumentationModule extends MetricsInstrumentationModule {
   public WebLogicMetricsInstrumentationModule() {
-    super("weblogic", "weblogic-metrics");
+    super("weblogic", "weblogic-metrics-splunk");
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`public class C3p0InstrumentationModule extends MetricsInstrumentationModule {`
`28`	`28`
`29`	`29`	`public C3p0InstrumentationModule() {`
`30`		`- super("c3p0");`
	`30`	`+ super("c3p0-splunk");`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`@AutoService(InstrumentationModule.class)`
`27`	`27`	`public class HikariInstrumentationModule extends InstrumentationModule {`
`28`	`28`	`public HikariInstrumentationModule() {`
`29`		`- super("hikari", "hikaricp");`
	`29`	`+ super("hikari-splunk", "hikaricp-splunk");`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ public void afterAgent(`
`38`	`38`	`Config config, AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {`
`39`	`39`	`boolean metricsRegistryPresent = !Metrics.globalRegistry.getRegistries().isEmpty();`
`40`	`40`	`AgentConfig agentConfig = new AgentConfig(config);`
`41`		`- if (!agentConfig.isInstrumentationEnabled(singleton("jvm-metrics"), metricsRegistryPresent)) {`
	`41`	`+ if (!agentConfig.isInstrumentationEnabled(`
	`42`	`+ singleton("jvm-metrics-splunk"), metricsRegistryPresent)) {`
`42`	`43`	`return;`
`43`	`44`	`}`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`@AutoService(InstrumentationModule.class)`
`30`	`30`	`public class LibertyMetricsInstrumentationModule extends MetricsInstrumentationModule {`
`31`	`31`	`public LibertyMetricsInstrumentationModule() {`
`32`		`- super("liberty", "liberty-metrics");`
	`32`	`+ super("liberty", "liberty-metrics-splunk");`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`