From 0f80f7dd405c3e537ad9993cd83cb7ccc1dc85e8 Mon Sep 17 00:00:00 2001
From: Nikolay Martynov <mar.kolya@gmail.com>
Date: Thu, 26 Jul 2018 10:11:24 -0400
Subject: [PATCH] Remove old checks from HelperInjector

They are not really producing anything useful anf they depend on API
that is forbidden in Java9+
---
 .../trace/agent/tooling/HelperInjector.java   | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java
index 9df00ceadf..4ce3bfb22b 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java
@@ -65,17 +65,6 @@ public class HelperInjector implements Transformer {
         if (!injectedClassLoaders.contains(classLoader)) {
           try {
             final Map<TypeDescription, byte[]> helperMap = getHelperMap();
-            final Set<String> existingClasses = new HashSet<>();
-            final ClassLoader systemCL = ClassLoader.getSystemClassLoader();
-            if (classLoader != BOOTSTRAP_CLASSLOADER && !classLoader.equals(systemCL)) {
-              // Build a list of existing helper classes.
-              for (final TypeDescription def : helperMap.keySet()) {
-                final String name = def.getName();
-                if (Utils.isClassLoaded(name, systemCL)) {
-                  existingClasses.add(name);
-                }
-              }
-            }
             log.debug("Injecting classes onto classloader {} -> {}", classLoader, helperClassNames);
             if (classLoader == BOOTSTRAP_CLASSLOADER) {
               final Map<TypeDescription, Class<?>> injected =
@@ -90,16 +79,6 @@ public class HelperInjector implements Transformer {
             } else {
               new ClassInjector.UsingReflection(classLoader).inject(helperMap);
             }
-            if (classLoader != BOOTSTRAP_CLASSLOADER && !classLoader.equals(systemCL)) {
-              for (final TypeDescription def : helperMap.keySet()) {
-                // Ensure we didn't add any helper classes to the system CL.
-                final String name = def.getName();
-                if (!existingClasses.contains(name) && Utils.isClassLoaded(name, systemCL)) {
-                  throw new IllegalStateException(
-                      "Class was erroneously loaded on the System classloader: " + name);
-                }
-              }
-            }
           } catch (final Exception e) {
             log.error(
                 "Error preparing helpers for "