From 519024485c7a0dc3d776de3755337af5975f9936 Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Thu, 7 Apr 2022 03:12:11 +0200 Subject: [PATCH] Move Cache and related classes to internal package (#5759) * Move Cache and related classes to internal package * fix imports --- .../api/annotation/support/MethodCache.java | 2 +- .../support/MethodSpanAttributesExtractor.java | 2 +- .../support/MethodSpanAttributesExtractorTest.groovy | 2 +- .../api/annotation/support/MethodCacheTest.java | 2 +- .../instrumentation/api/db/SqlStatementSanitizer.java | 2 +- .../instrumentation/api/util/SpanNames.java | 2 +- .../instrumentation/api/cache/CacheBenchmark.java | 1 + .../api/internal/RuntimeVirtualFieldSupplier.java | 2 +- .../api/{ => internal}/cache/Cache.java | 11 ++++++++--- .../api/{ => internal}/cache/MapBackedCache.java | 2 +- .../api/{ => internal}/cache/WeakLockFreeCache.java | 4 ++-- .../ConcurrentLinkedHashMap.java | 8 ++++---- .../cache}/concurrentlinkedhashmap/EntryWeigher.java | 2 +- .../concurrentlinkedhashmap/EvictionListener.java | 2 +- .../cache}/concurrentlinkedhashmap/LinkedDeque.java | 2 +- .../cache}/concurrentlinkedhashmap/Weigher.java | 2 +- .../cache}/concurrentlinkedhashmap/Weighers.java | 6 ++---- .../cache}/concurrentlinkedhashmap/package-info.java | 10 +++++----- .../weaklockfree/AbstractWeakConcurrentMap.java | 2 +- .../cache}/weaklockfree/WeakConcurrentMap.java | 2 +- .../instrumentation/api/util/ClassNames.java | 2 +- .../api/{ => internal}/cache/CacheTest.java | 2 +- .../jbosslogmanager/v1_1/LoggingEventMapper.java | 2 +- .../log4j/appender/v1_2/LogEventMapper.java | 2 +- .../log4j/appender/v2_16/internal/LogEventMapper.java | 2 +- .../appender/v1_0/internal/LoggingEventMapper.java | 2 +- .../instrumentation/micrometer/v1_5/Bridging.java | 2 +- .../javaagent/bootstrap/HelperResources.java | 2 +- .../javaagent/bootstrap/VirtualFieldDetector.java | 2 +- .../javaagent/extension/AgentListener.java | 3 +-- .../matcher/ClassLoaderHasClassesNamedMatcher.java | 2 +- .../api/internal/ClassLoaderMatcherCacheHolder.java | 2 +- .../field/VirtualFieldImplementationsGenerator.java | 2 +- .../tooling/ignore/IgnoredClassLoadersMatcher.java | 2 +- .../InstrumentationModuleInstaller.java | 2 +- .../javaagent/tooling/HelperInjector.java | 2 +- .../tooling/muzzle/AgentCachingPoolStrategy.java | 2 +- 37 files changed, 53 insertions(+), 50 deletions(-) rename instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/{ => internal}/cache/Cache.java (83%) rename instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/{ => internal}/cache/MapBackedCache.java (93%) rename instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/{ => internal}/cache/WeakLockFreeCache.java (87%) rename instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/{cache/internal => internal/cache}/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java (99%) rename instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/{cache/internal => internal/cache}/concurrentlinkedhashmap/EntryWeigher.java (95%) rename instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/{cache/internal => internal/cache}/concurrentlinkedhashmap/EvictionListener.java (96%) rename instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/{cache/internal => internal/cache}/concurrentlinkedhashmap/LinkedDeque.java (99%) rename instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/{cache/internal => internal/cache}/concurrentlinkedhashmap/Weigher.java (95%) rename instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/{cache/internal => internal/cache}/concurrentlinkedhashmap/Weighers.java (97%) rename instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/{cache/internal => internal/cache}/concurrentlinkedhashmap/package-info.java (87%) rename instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/{cache/internal => internal/cache}/weaklockfree/AbstractWeakConcurrentMap.java (99%) rename instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/{cache/internal => internal/cache}/weaklockfree/WeakConcurrentMap.java (99%) rename instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/{ => internal}/cache/CacheTest.java (97%) diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCache.java b/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCache.java index f9bda1ba77..8aac9eff39 100644 --- a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCache.java +++ b/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.cache.Cache; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import java.lang.reflect.Method; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java b/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java index b53e86baeb..4e143eecf1 100644 --- a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java +++ b/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java @@ -7,8 +7,8 @@ package io.opentelemetry.instrumentation.api.annotation.support; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; -import io.opentelemetry.instrumentation.api.cache.Cache; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import java.lang.reflect.Method; import java.lang.reflect.Parameter; import javax.annotation.Nullable; diff --git a/instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.groovy b/instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.groovy index 0fee18302f..3ede0270bf 100644 --- a/instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.groovy +++ b/instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.groovy @@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.api.annotation.support import io.opentelemetry.api.common.AttributesBuilder import io.opentelemetry.context.Context -import io.opentelemetry.instrumentation.api.cache.Cache +import io.opentelemetry.instrumentation.api.internal.cache.Cache import spock.lang.Specification import java.lang.reflect.Method diff --git a/instrumentation-api-annotation-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCacheTest.java b/instrumentation-api-annotation-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCacheTest.java index 3d9d9998a5..9d422001bd 100644 --- a/instrumentation-api-annotation-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCacheTest.java +++ b/instrumentation-api-annotation-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCacheTest.java @@ -11,7 +11,7 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import io.opentelemetry.instrumentation.api.cache.Cache; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import java.lang.reflect.Method; import java.util.function.Function; import org.junit.jupiter.api.Test; diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizer.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizer.java index 8b0a846398..077645442c 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizer.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizer.java @@ -9,8 +9,8 @@ import static io.opentelemetry.instrumentation.api.db.StatementSanitizationConfi import static io.opentelemetry.instrumentation.api.internal.SupportabilityMetrics.CounterNames.SQL_STATEMENT_SANITIZER_CACHE_MISS; import com.google.auto.value.AutoValue; -import io.opentelemetry.instrumentation.api.cache.Cache; import io.opentelemetry.instrumentation.api.internal.SupportabilityMetrics; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import javax.annotation.Nullable; /** diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/util/SpanNames.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/util/SpanNames.java index 04b74595fc..8e1cc31e6b 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/util/SpanNames.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/util/SpanNames.java @@ -5,7 +5,7 @@ package io.opentelemetry.instrumentation.api.util; -import io.opentelemetry.instrumentation.api.cache.Cache; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import java.lang.reflect.Method; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/cache/CacheBenchmark.java b/instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/cache/CacheBenchmark.java index 1c78ec4e46..4180a0233c 100644 --- a/instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/cache/CacheBenchmark.java +++ b/instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/cache/CacheBenchmark.java @@ -5,6 +5,7 @@ package io.opentelemetry.instrumentation.api.cache; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Fork; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/RuntimeVirtualFieldSupplier.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/RuntimeVirtualFieldSupplier.java index 8274f6ed4e..eeddec3417 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/RuntimeVirtualFieldSupplier.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/RuntimeVirtualFieldSupplier.java @@ -5,8 +5,8 @@ package io.opentelemetry.instrumentation.api.internal; -import io.opentelemetry.instrumentation.api.cache.Cache; import io.opentelemetry.instrumentation.api.field.VirtualField; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import java.util.logging.Logger; import javax.annotation.Nullable; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/Cache.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/Cache.java similarity index 83% rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/Cache.java rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/Cache.java index 6cce6f7317..7b2439d9b5 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/Cache.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/Cache.java @@ -3,13 +3,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.api.cache; +package io.opentelemetry.instrumentation.api.internal.cache; -import io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.ConcurrentLinkedHashMap; +import io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import java.util.function.Function; import javax.annotation.Nullable; -/** A cache from keys to values. */ +/** + * A cache from keys to values. + * + *

This class is internal and is hence not for public use. Its APIs are unstable and can change + * at any time. + */ public interface Cache { /** diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/MapBackedCache.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/MapBackedCache.java similarity index 93% rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/MapBackedCache.java rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/MapBackedCache.java index 4d2d475743..45679e853a 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/MapBackedCache.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/MapBackedCache.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.api.cache; +package io.opentelemetry.instrumentation.api.internal.cache; import java.util.concurrent.ConcurrentMap; import java.util.function.Function; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/WeakLockFreeCache.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/WeakLockFreeCache.java similarity index 87% rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/WeakLockFreeCache.java rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/WeakLockFreeCache.java index 641524a0ad..3681ea2a3c 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/WeakLockFreeCache.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/WeakLockFreeCache.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.api.cache; +package io.opentelemetry.instrumentation.api.internal.cache; -import io.opentelemetry.instrumentation.api.cache.internal.weaklockfree.WeakConcurrentMap; +import io.opentelemetry.instrumentation.api.internal.cache.weaklockfree.WeakConcurrentMap; import java.util.function.Function; final class WeakLockFreeCache implements Cache { diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java similarity index 99% rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java index 86f4d92755..f64df6e4c5 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java @@ -20,11 +20,11 @@ * limitations under the License. */ -package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap; +package io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap; -import static io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.ConcurrentLinkedHashMap.DrainStatus.IDLE; -import static io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.ConcurrentLinkedHashMap.DrainStatus.PROCESSING; -import static io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.ConcurrentLinkedHashMap.DrainStatus.REQUIRED; +import static io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap.ConcurrentLinkedHashMap.DrainStatus.IDLE; +import static io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap.ConcurrentLinkedHashMap.DrainStatus.PROCESSING; +import static io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap.ConcurrentLinkedHashMap.DrainStatus.REQUIRED; import static java.util.Collections.emptyList; import static java.util.Collections.unmodifiableMap; import static java.util.Collections.unmodifiableSet; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/EntryWeigher.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/EntryWeigher.java similarity index 95% rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/EntryWeigher.java rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/EntryWeigher.java index 4a5ce53624..8a384fb359 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/EntryWeigher.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/EntryWeigher.java @@ -20,7 +20,7 @@ * limitations under the License. */ -package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap; +package io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap; import javax.annotation.concurrent.ThreadSafe; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/EvictionListener.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/EvictionListener.java similarity index 96% rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/EvictionListener.java rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/EvictionListener.java index 3487798cb3..f557616f73 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/EvictionListener.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/EvictionListener.java @@ -20,7 +20,7 @@ * limitations under the License. */ -package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap; +package io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap; import javax.annotation.concurrent.ThreadSafe; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/LinkedDeque.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/LinkedDeque.java similarity index 99% rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/LinkedDeque.java rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/LinkedDeque.java index 98b93e6bce..5dbd7a02b4 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/LinkedDeque.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/LinkedDeque.java @@ -20,7 +20,7 @@ * limitations under the License. */ -package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap; +package io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap; import java.util.AbstractCollection; import java.util.Collection; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/Weigher.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/Weigher.java similarity index 95% rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/Weigher.java rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/Weigher.java index 8e0f1528c5..641fe08c2a 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/Weigher.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/Weigher.java @@ -20,7 +20,7 @@ * limitations under the License. */ -package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap; +package io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap; import javax.annotation.concurrent.ThreadSafe; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/Weighers.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/Weighers.java similarity index 97% rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/Weighers.java rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/Weighers.java index 8fa798d7a6..2e43120abc 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/Weighers.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/Weighers.java @@ -20,9 +20,7 @@ * limitations under the License. */ -package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap; - -import static io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.ConcurrentLinkedHashMap.checkNotNull; +package io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap; import java.io.Serializable; import java.util.Collection; @@ -188,7 +186,7 @@ public final class Weighers { final Weigher weigher; EntryWeigherView(Weigher weigher) { - checkNotNull(weigher); + ConcurrentLinkedHashMap.checkNotNull(weigher); this.weigher = weigher; } diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/package-info.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/package-info.java similarity index 87% rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/package-info.java rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/package-info.java index 94a555154e..828418d51a 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/concurrentlinkedhashmap/package-info.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/concurrentlinkedhashmap/package-info.java @@ -30,21 +30,21 @@ * This package contains an implementation of a bounded {@link java.util.concurrent.ConcurrentMap} * data structure. * - *

{@link io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.Weigher} is + *

{@link io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap.Weigher} is * a simple interface for determining how many units of capacity an entry consumes. Depending on * which concrete Weigher class is used, an entry may consume a different amount of space within the * cache. The {@link - * io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.Weighers} class + * io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap.Weighers} class * provides utility methods for obtaining the most common kinds of implementations. * *

{@link - * io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.EvictionListener} + * io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap.EvictionListener} * provides the ability to be notified when an entry is evicted from the map. An eviction occurs * when the entry was automatically removed due to the map exceeding a capacity threshold. It is not * called when an entry was explicitly removed. * *

The {@link - * io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap.ConcurrentLinkedHashMap} + * io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap.ConcurrentLinkedHashMap} * class supplies an efficient, scalable, thread-safe, bounded map. As with the Java Collections * Framework the "Concurrent" prefix is used to indicate that the map is not governed by a * single exclusion lock. @@ -52,4 +52,4 @@ * @see * http://code.google.com/p/concurrentlinkedhashmap/ */ -package io.opentelemetry.instrumentation.api.cache.internal.concurrentlinkedhashmap; +package io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/weaklockfree/AbstractWeakConcurrentMap.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/weaklockfree/AbstractWeakConcurrentMap.java similarity index 99% rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/weaklockfree/AbstractWeakConcurrentMap.java rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/weaklockfree/AbstractWeakConcurrentMap.java index 4f4969e7dc..dcfc9269f5 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/weaklockfree/AbstractWeakConcurrentMap.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/weaklockfree/AbstractWeakConcurrentMap.java @@ -23,7 +23,7 @@ // Suppress warnings since this is vendored as-is. // CHECKSTYLE:OFF -package io.opentelemetry.instrumentation.api.cache.internal.weaklockfree; +package io.opentelemetry.instrumentation.api.internal.cache.weaklockfree; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/weaklockfree/WeakConcurrentMap.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/weaklockfree/WeakConcurrentMap.java similarity index 99% rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/weaklockfree/WeakConcurrentMap.java rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/weaklockfree/WeakConcurrentMap.java index e68a29365f..92ea071db4 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/cache/internal/weaklockfree/WeakConcurrentMap.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/cache/weaklockfree/WeakConcurrentMap.java @@ -23,7 +23,7 @@ // Suppress warnings since this is vendored as-is. // CHECKSTYLE:OFF -package io.opentelemetry.instrumentation.api.cache.internal.weaklockfree; +package io.opentelemetry.instrumentation.api.internal.cache.weaklockfree; import java.util.Iterator; import java.util.Map; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/util/ClassNames.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/util/ClassNames.java index 3a6118c864..1762b669d5 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/util/ClassNames.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/util/ClassNames.java @@ -5,7 +5,7 @@ package io.opentelemetry.instrumentation.api.util; -import io.opentelemetry.instrumentation.api.cache.Cache; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; /** A utility class used to compute readable simple class names. */ public final class ClassNames { diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/cache/CacheTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/cache/CacheTest.java similarity index 97% rename from instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/cache/CacheTest.java rename to instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/cache/CacheTest.java index d81a7e01c9..0ab8fdd897 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/cache/CacheTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/cache/CacheTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.api.cache; +package io.opentelemetry.instrumentation.api.internal.cache; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; diff --git a/instrumentation/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/LoggingEventMapper.java b/instrumentation/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/LoggingEventMapper.java index 53b32a6555..482d0f6621 100644 --- a/instrumentation/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/LoggingEventMapper.java +++ b/instrumentation/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/LoggingEventMapper.java @@ -13,8 +13,8 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder; import io.opentelemetry.instrumentation.api.appender.internal.Severity; -import io.opentelemetry.instrumentation.api.cache.Cache; import io.opentelemetry.instrumentation.api.config.Config; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.instrumentation.api.appender.internal.AgentLogEmitterProvider; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.io.PrintWriter; diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java index 2c79220ac2..5b12200a15 100644 --- a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java +++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java @@ -13,8 +13,8 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder; import io.opentelemetry.instrumentation.api.appender.internal.Severity; -import io.opentelemetry.instrumentation.api.cache.Cache; import io.opentelemetry.instrumentation.api.config.Config; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.instrumentation.api.appender.internal.AgentLogEmitterProvider; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.io.PrintWriter; diff --git a/instrumentation/log4j/log4j-appender-2.16/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_16/internal/LogEventMapper.java b/instrumentation/log4j/log4j-appender-2.16/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_16/internal/LogEventMapper.java index 63ff1d50a5..aa82406558 100644 --- a/instrumentation/log4j/log4j-appender-2.16/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_16/internal/LogEventMapper.java +++ b/instrumentation/log4j/log4j-appender-2.16/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_16/internal/LogEventMapper.java @@ -13,8 +13,8 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder; import io.opentelemetry.instrumentation.api.appender.internal.Severity; -import io.opentelemetry.instrumentation.api.cache.Cache; import io.opentelemetry.instrumentation.api.config.Config; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java index 3bf60903f0..730a1e5985 100644 --- a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java +++ b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java @@ -17,8 +17,8 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder; import io.opentelemetry.instrumentation.api.appender.internal.LogEmitterProvider; import io.opentelemetry.instrumentation.api.appender.internal.Severity; -import io.opentelemetry.instrumentation.api.cache.Cache; import io.opentelemetry.instrumentation.api.config.Config; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/Bridging.java b/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/Bridging.java index cd33dcbf76..6ac4c6ee6b 100644 --- a/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/Bridging.java +++ b/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/Bridging.java @@ -12,7 +12,7 @@ import io.micrometer.core.instrument.config.NamingConvention; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; -import io.opentelemetry.instrumentation.api.cache.Cache; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; final class Bridging { diff --git a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/HelperResources.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/HelperResources.java index c79b50d27a..a82fb7f05a 100644 --- a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/HelperResources.java +++ b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/HelperResources.java @@ -8,7 +8,7 @@ package io.opentelemetry.javaagent.bootstrap; import static java.util.Collections.emptyList; import static java.util.Collections.unmodifiableList; -import io.opentelemetry.instrumentation.api.cache.Cache; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import java.net.URL; import java.util.ArrayList; import java.util.List; diff --git a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/VirtualFieldDetector.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/VirtualFieldDetector.java index 5e9511c549..80e14aab03 100644 --- a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/VirtualFieldDetector.java +++ b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/VirtualFieldDetector.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.bootstrap; -import io.opentelemetry.instrumentation.api.cache.Cache; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import java.util.Arrays; /** Helper class for detecting whether given class has virtual fields. */ diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/AgentListener.java b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/AgentListener.java index 3577ecc960..b1a661af0b 100644 --- a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/AgentListener.java +++ b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/AgentListener.java @@ -5,7 +5,6 @@ package io.opentelemetry.javaagent.extension; -import io.opentelemetry.instrumentation.api.cache.Cache; import io.opentelemetry.instrumentation.api.config.Config; import io.opentelemetry.instrumentation.api.field.VirtualField; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; @@ -29,7 +28,7 @@ public interface AgentListener extends Ordered { *

Execute only minimal code because any classes loaded before the agent installation will have * to be retransformed, which takes extra time, and more importantly means that fields can't be * added to those classes - which causes {@link VirtualField} to fall back to the less performant - * {@link Cache} implementation for those classes. + * cache-based implementation for those classes. */ default void beforeAgent( Config config, AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {} diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/matcher/ClassLoaderHasClassesNamedMatcher.java b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/matcher/ClassLoaderHasClassesNamedMatcher.java index 2988bc334f..455d3a0c41 100644 --- a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/matcher/ClassLoaderHasClassesNamedMatcher.java +++ b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/matcher/ClassLoaderHasClassesNamedMatcher.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.extension.matcher; -import io.opentelemetry.instrumentation.api.cache.Cache; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.instrumentation.api.internal.ClassLoaderMatcherCacheHolder; import io.opentelemetry.javaagent.instrumentation.api.internal.InClassLoaderMatcher; import net.bytebuddy.matcher.ElementMatcher; diff --git a/javaagent-instrumentation-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/internal/ClassLoaderMatcherCacheHolder.java b/javaagent-instrumentation-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/internal/ClassLoaderMatcherCacheHolder.java index 42146a26a6..10e1cd76fb 100644 --- a/javaagent-instrumentation-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/internal/ClassLoaderMatcherCacheHolder.java +++ b/javaagent-instrumentation-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/internal/ClassLoaderMatcherCacheHolder.java @@ -5,8 +5,8 @@ package io.opentelemetry.javaagent.instrumentation.api.internal; -import io.opentelemetry.instrumentation.api.cache.Cache; import io.opentelemetry.instrumentation.api.internal.GuardedBy; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import java.net.URL; import java.util.ArrayList; import java.util.List; diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/VirtualFieldImplementationsGenerator.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/VirtualFieldImplementationsGenerator.java index 56f508d659..0212187ce8 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/VirtualFieldImplementationsGenerator.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/VirtualFieldImplementationsGenerator.java @@ -9,8 +9,8 @@ import static io.opentelemetry.javaagent.tooling.field.GeneratedVirtualFieldName import static io.opentelemetry.javaagent.tooling.field.GeneratedVirtualFieldNames.getRealSetterName; import static io.opentelemetry.javaagent.tooling.field.GeneratedVirtualFieldNames.getVirtualFieldImplementationClassName; -import io.opentelemetry.instrumentation.api.cache.Cache; import io.opentelemetry.instrumentation.api.field.VirtualField; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.tooling.Utils; import io.opentelemetry.javaagent.tooling.muzzle.VirtualFieldMappings; import java.util.HashMap; diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/IgnoredClassLoadersMatcher.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/IgnoredClassLoadersMatcher.java index 1ef23bc205..d12b04f3d3 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/IgnoredClassLoadersMatcher.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/IgnoredClassLoadersMatcher.java @@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.tooling.ignore; import static java.util.logging.Level.FINE; -import io.opentelemetry.instrumentation.api.cache.Cache; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.bootstrap.PatchLogger; import io.opentelemetry.javaagent.tooling.util.Trie; import java.util.logging.Logger; diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java index 0e19141ca0..08344b7a4a 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java @@ -12,7 +12,7 @@ import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.not; -import io.opentelemetry.instrumentation.api.cache.Cache; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.tooling.HelperInjector; diff --git a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/HelperInjector.java b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/HelperInjector.java index 92d1fc73d7..4b4de35dde 100644 --- a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/HelperInjector.java +++ b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/HelperInjector.java @@ -8,7 +8,7 @@ package io.opentelemetry.javaagent.tooling; import static java.util.logging.Level.FINE; import static java.util.logging.Level.SEVERE; -import io.opentelemetry.instrumentation.api.cache.Cache; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.bootstrap.HelperResources; import io.opentelemetry.javaagent.bootstrap.InjectedClassHelper; import io.opentelemetry.javaagent.tooling.muzzle.HelperResource; diff --git a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java index f7e109fdae..c7b7e6bcfc 100644 --- a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java +++ b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/AgentCachingPoolStrategy.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.tooling.muzzle; -import io.opentelemetry.instrumentation.api.cache.Cache; +import io.opentelemetry.instrumentation.api.internal.cache.Cache; import java.lang.ref.WeakReference; import javax.annotation.Nullable; import net.bytebuddy.agent.builder.AgentBuilder;