Drop instrumentation-api-caching module and move weak cache implementation to instrumentation-api

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")

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"/>

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")

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")

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"))
 }

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)

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)

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",

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")
 

instrumentation-api-annotation-support/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;

instrumentation-api-annotation-support/src/main/java/io/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;

instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/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

instrumentation-api-annotation-support/src/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;