Update instrumentation suppression keys that do not align with their …

…module name (#7811)
open-telemetry · Apr 11, 2023 · 66f4c80 · 66f4c80
1 parent 56eae81
commit 66f4c80
Show file tree

Hide file tree

Showing 24 changed files with 24 additions and 24 deletions.
diff --git a/...emetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientInstrumentationModule.java b/...emetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class AkkaHttpClientInstrumentationModule extends InstrumentationModule {
  public AkkaHttpClientInstrumentationModule() {
- super("akka-http", "akka-http-client");
+ super("akka-http", "akka-http-10.0", "akka-http-client");
  }
 
  @Override

diff --git a/...emetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java b/...emetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class AkkaHttpServerInstrumentationModule extends InstrumentationModule {
  public AkkaHttpServerInstrumentationModule() {
- super("akka-http", "akka-http-server");
+ super("akka-http", "akka-http-10.0", "akka-http-server");
  }
 
  @Override

diff --git a/...elemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaInstrumentationModule.java b/...elemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class AwsLambdaInstrumentationModule extends InstrumentationModule {
  public AwsLambdaInstrumentationModule() {
- super("aws-lambda", "aws-lambda-core-1.0");
+ super("aws-lambda-core", "aws-lambda-core-1.0", "aws-lambda");
  }
 
  @Override

diff --git a/...emetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaInstrumentationModule.java b/...emetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaInstrumentationModule.java
@@ -17,7 +17,7 @@
 @AutoService(InstrumentationModule.class)
 public class AwsLambdaInstrumentationModule extends InstrumentationModule {
  public AwsLambdaInstrumentationModule() {
- super("aws-lambda", "aws-lambda-events-2.2");
+ super("aws-lambda-events", "aws-lambda-events-2.2", "aws-lambda");
  }
 
  @Override

diff --git a/...pentelemetry/javaagent/instrumentation/couchbase/v3_2/CouchbaseInstrumentationModule.java b/...pentelemetry/javaagent/instrumentation/couchbase/v3_2/CouchbaseInstrumentationModule.java
@@ -17,7 +17,7 @@
 @AutoService(InstrumentationModule.class)
 public class CouchbaseInstrumentationModule extends InstrumentationModule {
  public CouchbaseInstrumentationModule() {
- super("couchbase", "couchbase-3.1.6");
+ super("couchbase", "couchbase-3.2");
  }
 
  @Override

diff --git a/...ntelemetry/javaagent/instrumentation/dropwizardviews/DropwizardInstrumentationModule.java b/...ntelemetry/javaagent/instrumentation/dropwizardviews/DropwizardInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class DropwizardInstrumentationModule extends InstrumentationModule {
  public DropwizardInstrumentationModule() {
- super("dropwizard-views");
+ super("dropwizard-views", "dropwizard-views-0.7");
  }
 
  @Override

diff --git a/.../java/io/opentelemetry/javaagent/instrumentation/grpc/v1_6/GrpcInstrumentationModule.java b/.../java/io/opentelemetry/javaagent/instrumentation/grpc/v1_6/GrpcInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class GrpcInstrumentationModule extends InstrumentationModule {
  public GrpcInstrumentationModule() {
- super("grpc", "grpc-1.5");
+ super("grpc", "grpc-1.6");
  }
 
  @Override

diff --git a/...pentelemetry/javaagent/instrumentation/hibernate/v4_3/HibernateInstrumentationModule.java b/...pentelemetry/javaagent/instrumentation/hibernate/v4_3/HibernateInstrumentationModule.java
@@ -17,7 +17,7 @@
 @AutoService(InstrumentationModule.class)
 public class HibernateInstrumentationModule extends InstrumentationModule {
  public HibernateInstrumentationModule() {
- super("hibernate", "hibernate-4.3");
+ super("hibernate-procedure-call", "hibernate-procedure-call-4.3", "hibernate");
  }
 
  @Override

diff --git a/...entelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java b/...entelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java
@@ -16,7 +16,7 @@
 @AutoService(InstrumentationModule.class)
 public class EclipseOsgiInstrumentationModule extends InstrumentationModule {
  public EclipseOsgiInstrumentationModule() {
- super("internal-eclipse-osgi");
+ super("internal-eclipse-osgi", "internal-eclipse-osgi-3.6");
  }
 
  @Override

diff --git a/...a/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsInstrumentationModule.java b/...a/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsInstrumentationModule.java
@@ -15,7 +15,7 @@
 public class JwsInstrumentationModule extends InstrumentationModule {
 
  public JwsInstrumentationModule() {
- super("jaxws", "jws-1.1");
+ super("jaxws-jws-api", "jaxws-jws-api-1.1", "jaxws");
  }
 
  @Override

diff --git a/...java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java b/...java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class MojarraInstrumentationModule extends InstrumentationModule {
  public MojarraInstrumentationModule() {
- super("mojarra", "mojarra-1.2");
+ super("jsf-mojarra", "jsf-mojarra-1.2");
  }
 
  @Override

diff --git a/...io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/MojarraInstrumentationModule.java b/...io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/MojarraInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class MojarraInstrumentationModule extends InstrumentationModule {
  public MojarraInstrumentationModule() {
- super("mojarra", "mojarra-3.0");
+ super("jsf-mojarra", "jsf-mojarra-3.0");
  }
 
  @Override

diff --git a/...java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesInstrumentationModule.java b/...java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class MyFacesInstrumentationModule extends InstrumentationModule {
  public MyFacesInstrumentationModule() {
- super("myfaces", "myfaces-1.2");
+ super("jsf-myfaces", "jsf-myfaces-1.2");
  }
 
  @Override

diff --git a/...io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/MyFacesInstrumentationModule.java b/...io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/MyFacesInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class MyFacesInstrumentationModule extends InstrumentationModule {
  public MyFacesInstrumentationModule() {
- super("myfaces", "myfaces-3.0");
+ super("jsf-myfaces", "jsf-myfaces-3.0");
  }
 
  @Override

diff --git a/...rc/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationModule.java b/...rc/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class JspInstrumentationModule extends InstrumentationModule {
  public JspInstrumentationModule() {
- super("jsp");
+ super("jsp", "jsp-2.3");
  }
 
  @Override

diff --git a/...java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyInstrumentationModule.java b/...java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyInstrumentationModule.java
@@ -29,7 +29,7 @@
 public class LibertyInstrumentationModule extends InstrumentationModule {
 
  public LibertyInstrumentationModule() {
- super("liberty");
+ super("liberty", "liberty-20.0");
  }
 
  @Override

diff --git a/.../javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherInstrumentationModule.java b/.../javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherInstrumentationModule.java
@@ -16,7 +16,7 @@
 public class LibertyDispatcherInstrumentationModule extends InstrumentationModule {
 
  public LibertyDispatcherInstrumentationModule() {
- super("liberty", "liberty-dispatcher");
+ super("liberty-dispatcher", "liberty-dispatcher-20.0", "liberty");
  }
 
  @Override

diff --git a/...try/javaagent/instrumentation/opentelemetryapi/OpenTelemetryApiInstrumentationModule.java b/...try/javaagent/instrumentation/opentelemetryapi/OpenTelemetryApiInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule {
  public OpenTelemetryApiInstrumentationModule() {
- super("opentelemetry-api");
+ super("opentelemetry-api", "opentelemetry-api-1.0");
  }
 
  @Override

diff --git a/...vaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java b/...vaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java
@@ -16,7 +16,7 @@
 public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule {
 
  public OpenTelemetryApiInstrumentationModule() {
- super("opentelemetry-api-1.10", "opentelemetry-api");
+ super("opentelemetry-api", "opentelemetry-api-1.10");
  }
 
  @Override

diff --git a/...vaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryApiInstrumentationModule.java b/...vaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryApiInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule {
  public OpenTelemetryApiInstrumentationModule() {
- super("opentelemetry-api-1.15", "opentelemetry-api");
+ super("opentelemetry-api", "opentelemetry-api-1.15");
  }
 
  @Override

diff --git a/...avaagent/instrumentation/opentelemetryapi/v1_4/OpenTelemetryApiInstrumentationModule.java b/...avaagent/instrumentation/opentelemetryapi/v1_4/OpenTelemetryApiInstrumentationModule.java
@@ -15,7 +15,7 @@
 @AutoService(InstrumentationModule.class)
 public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule {
  public OpenTelemetryApiInstrumentationModule() {
- super("opentelemetry-api-1.4", "opentelemetry-api");
+ super("opentelemetry-api", "opentelemetry-api-1.4");
  }
 
  @Override

diff --git a/.../java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java b/.../java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java
@@ -18,7 +18,7 @@
 public class PlayInstrumentationModule extends InstrumentationModule {
 
  public PlayInstrumentationModule() {
- super("play", "play-mvc-2.4");
+ super("play-mvc", "play-mvc-2.4", "play");
  }
 
  @Override

diff --git a/.../java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java b/.../java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java
@@ -16,7 +16,7 @@
 public class PlayInstrumentationModule extends InstrumentationModule {
 
  public PlayInstrumentationModule() {
- super("play", "play-mvc-2.6");
+ super("play-mvc", "play-mvc-2.6", "play");
  }
 
  @Override

diff --git a/...telemetry/javaagent/instrumentation/vertx/kafka/v3_6/VertxKafkaInstrumentationModule.java b/...telemetry/javaagent/instrumentation/vertx/kafka/v3_6/VertxKafkaInstrumentationModule.java
@@ -16,7 +16,7 @@
 public class VertxKafkaInstrumentationModule extends InstrumentationModule {
 
  public VertxKafkaInstrumentationModule() {
- super("vertx-kafka-client", "vertx-kafka-client-3.5", "vertx");
+ super("vertx-kafka-client", "vertx-kafka-client-3.6", "vertx");
  }
 
  @Override