tskycc
diff --git a/‎dd-java-agent/agent-tooling/agent-tooling.gradle‎
Lines changed: 0 additions & 16 deletions b/‎dd-java-agent/agent-tooling/agent-tooling.gradle‎
Lines changed: 0 additions & 16 deletions
diff --git a/‎dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentTooling.java‎
Lines changed: 3 additions & 12 deletions b/‎dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentTooling.java‎
Lines changed: 3 additions & 12 deletions
diff --git a/‎dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/CaffeineWeakCache.java‎
Lines changed: 0 additions & 53 deletions b/‎dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/CaffeineWeakCache.java‎
Lines changed: 0 additions & 53 deletions
diff --git a/‎dd-java-agent/agent-tooling/src/patch/java/com/github/benmanes/caffeine/cache/BoundedLocalCache.java‎
Lines changed: 0 additions & 42 deletions b/‎dd-java-agent/agent-tooling/src/patch/java/com/github/benmanes/caffeine/cache/BoundedLocalCache.java‎
Lines changed: 0 additions & 42 deletions
@@ -3,18 +3,6 @@ apply from: "$rootDir/gradle/java.gradle"
 minimumBranchCoverage = 0.6
 excludedClassesCoverage += ['datadog.trace.agent.tooling.*']
 
-// patch inner class from Caffeine to avoid ForkJoinTask from being loaded too early
-sourceSets {
-  patch {
-    java {}
-  }
-}
-jar {
-  from(sourceSets.patch.output) {
-    include 'com/github/benmanes/caffeine/cache/BoundedLocalCache$PerformCleanupTask.class'
-  }
-}
-
 configurations {
   // classpath used by the instrumentation muzzle plugin
   instrumentationMuzzle
@@ -26,10 +14,6 @@ dependencies {
   }
   compile group: 'com.blogspot.mydailyjava', name: 'weak-lock-free', version: '0.17'
   compile group: 'com.googlecode.concurrentlinkedhashmap', name: 'concurrentlinkedhashmap-lru', version: '1.4.2'
-  compile(group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '2.8.6') {
-    exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
-    exclude group: 'org.checkerframework', module: 'checker-qual'
-  }
   compile deps.bytebuddy
   compile deps.bytebuddyagent
 
 
@@ -3,7 +3,6 @@
 import datadog.trace.agent.tooling.bytebuddy.DDCachingPoolStrategy;
 import datadog.trace.agent.tooling.bytebuddy.DDLocationStrategy;
 import datadog.trace.api.Config;
-import datadog.trace.api.Platform;
 import datadog.trace.bootstrap.WeakCache;
 import datadog.trace.bootstrap.WeakCache.Provider;
 import datadog.trace.bootstrap.WeakMap;
@@ -32,17 +31,9 @@ private static Provider loadWeakCacheProvider() {
     Class<Provider> providerClass;
 
     try {
-      if (Platform.isJavaVersionAtLeast(8)) {
-        providerClass =
-            (Class<Provider>)
-                classLoader.loadClass("datadog.trace.agent.tooling.CaffeineWeakCache$Provider");
-        log.debug("Using CaffeineWeakCache Provider");
-      } else {
-        providerClass =
-            (Class<Provider>)
-                classLoader.loadClass("datadog.trace.agent.tooling.CLHMWeakCache$Provider");
-        log.debug("Using CLHMWeakCache Provider");
-      }
+      providerClass =
+          (Class<Provider>)
+              classLoader.loadClass("datadog.trace.agent.tooling.CLHMWeakCache$Provider");
 
       return providerClass.getDeclaredConstructor().newInstance();
     } catch (ReflectiveOperationException e) {