From cc43cf326d3f9eaf1ff30f09987e4dcc792a1480 Mon Sep 17 00:00:00 2001
From: Mateusz Rzeszutek <mrzeszutek@splunk.com>
Date: Fri, 11 Jun 2021 21:16:14 +0200
Subject: [PATCH] Internal instrumentations should always be enabled by default
 (#3257)

---
 .../classloader/ClassLoaderInstrumentationModule.java       | 6 ++++++
 .../internal/osgi/EclipseOsgiInstrumentationModule.java     | 6 ++++++
 .../internal/proxy/ProxyInstrumentationModule.java          | 6 ++++++
 .../urlclassloader/UrlClassLoaderInstrumentationModule.java | 6 ++++++
 4 files changed, 24 insertions(+)

diff --git a/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java
index 24c2103cfc..b544abcef4 100644
--- a/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java
+++ b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java
@@ -18,6 +18,12 @@ public class ClassLoaderInstrumentationModule extends InstrumentationModule {
     super("internal-class-loader");
   }
 
+  @Override
+  public boolean defaultEnabled() {
+    // internal instrumentations are always enabled by default
+    return true;
+  }
+
   @Override
   public boolean isHelperClass(String className) {
     return className.equals("io.opentelemetry.javaagent.tooling.Constants");
diff --git a/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java b/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java
index 806653591b..f5d7e8cd22 100644
--- a/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java
+++ b/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentationModule.java
@@ -18,6 +18,12 @@ public class EclipseOsgiInstrumentationModule extends InstrumentationModule {
     super("internal-eclipse-osgi");
   }
 
+  @Override
+  public boolean defaultEnabled() {
+    // internal instrumentations are always enabled by default
+    return true;
+  }
+
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new EclipseOsgiInstrumentation());
diff --git a/instrumentation/internal/internal-proxy/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentationModule.java b/instrumentation/internal/internal-proxy/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentationModule.java
index 6cb26cae0c..347496a0a6 100644
--- a/instrumentation/internal/internal-proxy/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentationModule.java
+++ b/instrumentation/internal/internal-proxy/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentationModule.java
@@ -18,6 +18,12 @@ public class ProxyInstrumentationModule extends InstrumentationModule {
     super("internal-proxy");
   }
 
+  @Override
+  public boolean defaultEnabled() {
+    // internal instrumentations are always enabled by default
+    return true;
+  }
+
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new ProxyInstrumentation());
diff --git a/instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentationModule.java b/instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentationModule.java
index ee300e582c..03f92be72d 100644
--- a/instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentationModule.java
+++ b/instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentationModule.java
@@ -18,6 +18,12 @@ public class UrlClassLoaderInstrumentationModule extends InstrumentationModule {
     super("internal-url-class-loader");
   }
 
+  @Override
+  public boolean defaultEnabled() {
+    // internal instrumentations are always enabled by default
+    return true;
+  }
+
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new UrlClassLoaderInstrumentation());