Drop instrumentation-api-caching module and move weak cache implement…

…ation to instrumentation-api (open-telemetry#4667) * Drop instrumentation-api-caching module and move weak cache implementation to instrumentation-api * Some test fixes * Some cleanup * Temporary workaround for using weak values in FutureListenerWrappers * Spotless * Update ClassNames and SpanNames * Compilation and comment * Add bounded cache and clean interface * Polish * Add comment * Vendor ConcurrentLinkedHashMap in * Let errorprone ignore vendored CLHM for now * Keep license in java files too * Convert Netty wrapper cache to VirtualField * Work around lambda instrumentation failure Ideally we would ignore instrumenting helper classes... * Revert "Work around lambda instrumentation failure" This reverts commit 6d63815. * Revert "Convert Netty wrapper cache to VirtualField" This reverts commit dac1522. * Handle cleared weak values * Fix comment * Delete instrumentation-api-caching * Copy in weak-lock-free * Remove caffeine remnants * Fix checkstyle * Rename BoundedCache to MapBackedCached * Remove duplicate LICENSE * Remove outdated comment * Sync with SDK copy of weaklockfree * Enable checkstyle:off comment * Re-generate license report * Move NOTICE file to package-info.java Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
RashmiRam · May 23, 2022 · 3cb76bf · 3cb76bf
1 parent f5d82b6
commit 3cb76bf
Show file tree

Hide file tree

Showing 72 changed files with 3,722 additions and 1,008 deletions.
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
  jmh(project(":javaagent-tooling"))
  jmh(project(":javaagent-extension-api"))
 
- jmh("com.github.ben-manes.caffeine:caffeine:$caffeine2Version")
+ jmh("com.github.ben-manes.caffeine:caffeine:2.9.2")
 
  jmh("javax.servlet:javax.servlet-api:4.0.1")
  jmh("com.google.http-client:google-http-client:1.19.0")

diff --git a/buildscripts/checkstyle.xml b/buildscripts/checkstyle.xml
@@ -373,6 +373,8 @@
  </module>
  <!-- this enables @SuppressWarnings("checkstyle:...") annotations -->
  <module name="SuppressWarningsHolder"/>
+ <!-- this enables CHECKSTYLE:OFF and CHECKSTYLE:ON comments -->
+ <module name="SuppressionCommentFilter"/>
  </module>
  <!-- this enables @SuppressWarnings("checkstyle:...") annotations -->
  <module name="SuppressWarningsFilter"/>

diff --git a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts
@@ -8,7 +8,6 @@ tasks.withType<ShadowJar>().configureEach {
  mergeServiceFiles()
 
  exclude("**/module-info.class")
- exclude("META-INF/jandex.idx") // from caffeine
 
  // Prevents conflict with other SLF4J instances. Important for premain.
  relocate("org.slf4j", "io.opentelemetry.javaagent.slf4j")

diff --git a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts
@@ -19,7 +19,7 @@ tasks {
  disableWarningsInGeneratedCode.set(true)
  allDisabledChecksAsWarnings.set(true)
 
- excludedPaths.set(".*/build/generated/.*")
+ excludedPaths.set(".*/build/generated/.*|.*/concurrentlinkedhashmap/.*")
 
  if (System.getenv("CI") == null) {
  disable("SystemOut")

diff --git a/conventions/src/main/kotlin/otel.javaagent-bootstrap.gradle.kts b/conventions/src/main/kotlin/otel.javaagent-bootstrap.gradle.kts
@@ -12,8 +12,4 @@ dependencies {
  compileOnly("io.opentelemetry:opentelemetry-api")
  compileOnly(project(":instrumentation-api"))
  compileOnly(project(":javaagent-instrumentation-api"))
-
- // this only exists to make Intellij happy since it doesn't (currently at least) understand our
- // inclusion of this artifact inside of :instrumentation-api
- compileOnly(project(":instrumentation-api-caching"))
 }
diff --git a/conventions/src/main/kotlin/otel.javaagent-instrumentation.gradle.kts b/conventions/src/main/kotlin/otel.javaagent-instrumentation.gradle.kts
@@ -7,10 +7,4 @@ plugins {
 
 extra["mavenGroupId"] = "io.opentelemetry.javaagent.instrumentation"
 
-base.archivesName.set(projectDir.parentFile.name)
-
-dependencies {
- // this only exists to make Intellij happy since it doesn't (currently at least) understand our
- // inclusion of this artifact inside of :instrumentation-api
- compileOnly(project(":instrumentation-api-caching"))
-}
+base.archivesName.set(projectDir.parentFile.name)
diff --git a/conventions/src/main/kotlin/otel.library-instrumentation.gradle.kts b/conventions/src/main/kotlin/otel.library-instrumentation.gradle.kts
@@ -8,10 +8,4 @@ plugins {
 
 extra["mavenGroupId"] = "io.opentelemetry.instrumentation"
 
-base.archivesName.set(projectDir.parentFile.name)
-
-dependencies {
- // this only exists to make Intellij happy since it doesn't (currently at least) understand our
- // inclusion of this artifact inside of :instrumentation-api
- compileOnly(project(":instrumentation-api-caching"))
-}
+base.archivesName.set(projectDir.parentFile.name)
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -17,9 +17,6 @@ rootProject.extra["otelVersion"] = otelVersion
 // Need both BOM and -all
 val groovyVersion = "2.5.14"
 
-rootProject.extra["caffeine2Version"] = "2.9.2"
-rootProject.extra["caffeine3Version"] = "3.0.4"
-
 // We don't force libraries we instrument to new versions since we compile and test against specific
 // old baseline versions
 // but we do try to force those libraries' transitive dependencies to new versions where possible
@@ -87,7 +84,6 @@ val DEPENDENCY_SETS = listOf(
 
 val DEPENDENCIES = listOf(
  "ch.qos.logback:logback-classic:1.2.3",
- "com.blogspot.mydailyjava:weak-lock-free:0.18",
  "com.github.stefanbirkner:system-lambda:1.2.0",
  "com.github.stefanbirkner:system-rules:1.19.0",
  "com.google.auto.service:auto-service:1.0",

diff --git a/instrumentation-api-annotation-support/build.gradle.kts b/instrumentation-api-annotation-support/build.gradle.kts
@@ -10,11 +10,6 @@ group = "io.opentelemetry.instrumentation"
 dependencies {
  implementation(project(":instrumentation-api"))
 
- // this only exists to make Intellij happy since it doesn't (currently at least) understand our
- // inclusion of this artifact inside of :instrumentation-api
- compileOnly(project(":instrumentation-api-caching"))
- testCompileOnly(project(":instrumentation-api-caching"))
-
  api("io.opentelemetry:opentelemetry-api")
  api("io.opentelemetry:opentelemetry-semconv")
 

diff --git a/...rt/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCache.java b/...rt/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCache.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.api.annotation.support;
 
-import io.opentelemetry.instrumentation.api.caching.Cache;
+import io.opentelemetry.instrumentation.api.cache.Cache;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/...o/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java b/...o/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.api.annotation.support;
 
 import io.opentelemetry.api.common.AttributesBuilder;
-import io.opentelemetry.instrumentation.api.caching.Cache;
+import io.opentelemetry.instrumentation.api.cache.Cache;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.tracer.AttributeSetter;
 import java.lang.reflect.Method;

diff --git a/...telemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.groovy b/...telemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.groovy
@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.api.annotation.support
 
 import io.opentelemetry.api.common.AttributesBuilder
-import io.opentelemetry.instrumentation.api.caching.Cache
+import io.opentelemetry.instrumentation.api.cache.Cache
 import spock.lang.Specification
 
 import java.lang.reflect.Method

diff --git a/...rc/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCacheTest.java b/...rc/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCacheTest.java
@@ -11,7 +11,7 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import io.opentelemetry.instrumentation.api.caching.Cache;
+import io.opentelemetry.instrumentation.api.cache.Cache;
 import java.lang.reflect.Method;
 import java.util.function.Function;
 import org.junit.jupiter.api.Test;

diff --git a/instrumentation-api-caching/build.gradle.kts b/instrumentation-api-caching/build.gradle.kts
diff --git a/instrumentation-api-caching/caffeine2/build.gradle.kts b/instrumentation-api-caching/caffeine2/build.gradle.kts
diff --git a/...hing/caffeine2/src/main/java/com/github/benmanes/caffeine/cache/CacheImplementations.java b/...hing/caffeine2/src/main/java/com/github/benmanes/caffeine/cache/CacheImplementations.java
diff --git a/.../opentelemetry/instrumentation/api/internal/shaded/caffeine2/cache/BoundedLocalCache.java b/.../opentelemetry/instrumentation/api/internal/shaded/caffeine2/cache/BoundedLocalCache.java
diff --git a/instrumentation-api-caching/caffeine3/build.gradle.kts b/instrumentation-api-caching/caffeine3/build.gradle.kts