Skip to content

Commit b682631

Browse files
SylvainJugeSylvainJuge
committed
remove getModuleGroup implementations
1 parent 848c87f commit b682631

59 files changed

Lines changed: 54 additions & 471 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/AkkaHttpServerInstrumentationModule.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,15 @@
1111
import com.google.auto.service.AutoService;
1212
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1313
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
14-
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
1514
import java.util.List;
1615
import net.bytebuddy.matcher.ElementMatcher;
1716

1817
@AutoService(InstrumentationModule.class)
19-
public class AkkaHttpServerInstrumentationModule extends InstrumentationModule
20-
implements ExperimentalInstrumentationModule {
18+
public class AkkaHttpServerInstrumentationModule extends InstrumentationModule {
2119
public AkkaHttpServerInstrumentationModule() {
2220
super("akka-http", "akka-http-10.0", "akka-http-server");
2321
}
2422

25-
@Override
26-
public String getModuleGroup() {
27-
return "akka-http";
28-
}
29-
3023
@Override
3124
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3225
// in GraphInterpreterInstrumentation we instrument a class that belongs to akka-streams, make

‎instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/server/route/AkkaHttpServerRouteInstrumentationModule.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,18 @@
1010
import com.google.auto.service.AutoService;
1111
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1212
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
13-
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
1413
import java.util.List;
1514

1615
/**
1716
* This instrumentation applies to classes in akka-http.jar while
1817
* AkkaHttpServerInstrumentationModule applies to classes in akka-http-core.jar
1918
*/
2019
@AutoService(InstrumentationModule.class)
21-
public class AkkaHttpServerRouteInstrumentationModule extends InstrumentationModule
22-
implements ExperimentalInstrumentationModule {
20+
public class AkkaHttpServerRouteInstrumentationModule extends InstrumentationModule {
2321
public AkkaHttpServerRouteInstrumentationModule() {
2422
super("akka-http", "akka-http-10.0", "akka-http-server", "akka-http-server-route");
2523
}
2624

27-
@Override
28-
public String getModuleGroup() {
29-
return "akka-http";
30-
}
31-
3225
@Override
3326
public List<TypeInstrumentation> typeInstrumentations() {
3427
return asList(

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AbstractAwsSdkInstrumentationModule.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@
1212
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1313
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1414
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
15-
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
1615
import java.util.List;
1716
import net.bytebuddy.description.type.TypeDescription;
1817
import net.bytebuddy.matcher.ElementMatcher;
1918

2019
// TODO: Copy & paste with only trivial adaptions from v2
21-
abstract class AbstractAwsSdkInstrumentationModule extends InstrumentationModule
22-
implements ExperimentalInstrumentationModule {
20+
abstract class AbstractAwsSdkInstrumentationModule extends InstrumentationModule {
2321

2422
protected AbstractAwsSdkInstrumentationModule(String additionalInstrumentationName) {
2523
super("aws-sdk", "aws-sdk-1.11", additionalInstrumentationName);
@@ -30,11 +28,6 @@ public boolean isHelperClass(String className) {
3028
return className.startsWith("io.opentelemetry.contrib.awsxray.");
3129
}
3230

33-
@Override
34-
public String getModuleGroup() {
35-
return "aws-sdk";
36-
}
37-
3831
@Override
3932
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
4033
// added in 1.10.33

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@
1010
import com.google.auto.service.AutoService;
1111
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1212
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
13-
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
1413
import java.util.List;
1514

1615
@AutoService(InstrumentationModule.class)
17-
public class AwsSdkInstrumentationModule extends InstrumentationModule
18-
implements ExperimentalInstrumentationModule {
16+
public class AwsSdkInstrumentationModule extends InstrumentationModule {
1917
public AwsSdkInstrumentationModule() {
2018
super("aws-sdk", "aws-sdk-1.11", "aws-sdk-1.11-core");
2119
}
@@ -25,11 +23,6 @@ public boolean isHelperClass(String className) {
2523
return className.startsWith("io.opentelemetry.contrib.awsxray.");
2624
}
2725

28-
@Override
29-
public String getModuleGroup() {
30-
return "aws-sdk";
31-
}
32-
3326
@Override
3427
public List<TypeInstrumentation> typeInstrumentations() {
3528
return asList(

‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AbstractAwsSdkInstrumentationModule.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,16 @@
1212
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1313
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1414
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
15-
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
1615
import java.util.List;
1716
import net.bytebuddy.description.type.TypeDescription;
1817
import net.bytebuddy.matcher.ElementMatcher;
1918

20-
abstract class AbstractAwsSdkInstrumentationModule extends InstrumentationModule
21-
implements ExperimentalInstrumentationModule {
19+
abstract class AbstractAwsSdkInstrumentationModule extends InstrumentationModule {
2220

2321
protected AbstractAwsSdkInstrumentationModule(String additionalInstrumentationName) {
2422
super("aws-sdk", "aws-sdk-2.2", additionalInstrumentationName);
2523
}
2624

27-
@Override
28-
public String getModuleGroup() {
29-
return "aws-sdk-v2";
30-
}
31-
3225
@Override
3326
public boolean isHelperClass(String className) {
3427
return className.startsWith("io.opentelemetry.contrib.awsxray.");

‎instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ public List<TypeInstrumentation> typeInstrumentations() {
3434
return asList(new CouchbaseBucketInstrumentation(), new CouchbaseClusterInstrumentation());
3535
}
3636

37-
@Override
38-
public String getModuleGroup() {
39-
return "couchbase";
40-
}
41-
4237
@Override
4338
public List<String> injectedClassNames() {
4439
return singletonList("rx.OpenTelemetryTracingUtil");

‎instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@
1111
import com.google.auto.service.AutoService;
1212
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1313
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
14-
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
1514
import java.util.List;
1615
import net.bytebuddy.matcher.ElementMatcher;
1716

1817
@AutoService(InstrumentationModule.class)
19-
public class CouchbaseInstrumentationModule extends InstrumentationModule
20-
implements ExperimentalInstrumentationModule {
18+
public class CouchbaseInstrumentationModule extends InstrumentationModule {
2119

2220
public CouchbaseInstrumentationModule() {
2321
super("couchbase", "couchbase-2.6");
@@ -33,9 +31,4 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3331
public List<TypeInstrumentation> typeInstrumentations() {
3432
return asList(new CouchbaseCoreInstrumentation(), new CouchbaseNetworkInstrumentation());
3533
}
36-
37-
@Override
38-
public String getModuleGroup() {
39-
return "couchbase";
40-
}
4134
}

‎instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/api/client/v7_16/ElasticsearchApiClientInstrumentationModule.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212
import com.google.auto.service.AutoService;
1313
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1414
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
15-
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
1615
import java.util.List;
1716
import net.bytebuddy.matcher.ElementMatcher;
1817

1918
@AutoService(InstrumentationModule.class)
20-
public class ElasticsearchApiClientInstrumentationModule extends InstrumentationModule
21-
implements ExperimentalInstrumentationModule {
19+
public class ElasticsearchApiClientInstrumentationModule extends InstrumentationModule {
2220
public ElasticsearchApiClientInstrumentationModule() {
2321
super("elasticsearch-api-client", "elasticsearch-api-client-7.16", "elasticsearch");
2422
}
@@ -32,11 +30,6 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3230
.and(not(hasClassesNamed("co.elastic.clients.transport.instrumentation.Instrumentation")));
3331
}
3432

35-
@Override
36-
public String getModuleGroup() {
37-
return "elasticsearch";
38-
}
39-
4033
@Override
4134
public List<TypeInstrumentation> typeInstrumentations() {
4235
return asList(

‎instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7InstrumentationModule.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212
import com.google.auto.service.AutoService;
1313
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1414
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
15-
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
1615
import java.util.List;
1716
import net.bytebuddy.matcher.ElementMatcher;
1817

1918
@AutoService(InstrumentationModule.class)
20-
public class ElasticsearchRest7InstrumentationModule extends InstrumentationModule
21-
implements ExperimentalInstrumentationModule {
19+
public class ElasticsearchRest7InstrumentationModule extends InstrumentationModule {
2220
public ElasticsearchRest7InstrumentationModule() {
2321
super("elasticsearch-rest", "elasticsearch-rest-7.0", "elasticsearch");
2422
}
@@ -32,11 +30,6 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3230
.and(not(hasClassesNamed("co.elastic.clients.transport.instrumentation.Instrumentation")));
3331
}
3432

35-
@Override
36-
public String getModuleGroup() {
37-
return "elasticsearch";
38-
}
39-
4033
@Override
4134
public List<TypeInstrumentation> typeInstrumentations() {
4235
return singletonList(new RestClientInstrumentation());

‎instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/FinagleHttpInstrumentationModule.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ public List<TypeInstrumentation> typeInstrumentations() {
3030
new H2StreamChannelInitInstrumentation());
3131
}
3232

33-
@Override
34-
public String getModuleGroup() {
35-
// relies on netty and needs access to common netty instrumentation classes
36-
return "netty";
37-
}
38-
3933
@Override
4034
public List<String> injectedClassNames() {
4135
// these are injected so that they can access package-private members

0 commit comments

Comments
 (0)