From bfbecd668fc579e9179451f62ae6c2548e375a2e Mon Sep 17 00:00:00 2001 From: MartinDai Date: Mon, 18 Oct 2021 10:02:55 +0800 Subject: [PATCH 1/2] rename `newBuilder()` to `builder()` --- .../instrumentation/api/caching/Cache.java | 2 +- .../instrumentation/api/config/Config.java | 4 +- .../api/db/SqlStatementSanitizer.java | 2 +- .../http/HttpHeaderAttributes.java | 4 +- .../internal/RuntimeVirtualFieldSupplier.java | 2 +- .../api/caching/CacheTest.java | 8 ++-- .../api/caching/PatchCaffeineTest.java | 2 +- .../api/config/ConfigTest.java | 40 +++++++++---------- .../internal/SupportabilityMetricsTest.java | 2 +- .../guava/InstrumentationHelper.java | 2 +- .../guava/GuavaAsyncOperationEndStrategy.java | 4 +- .../GuavaAsyncOperationEndStrategyTest.groovy | 2 +- .../netty/common/FutureListenerWrappers.java | 2 +- .../reactor/HooksInstrumentation.java | 2 +- .../reactor/ContextPropagationOperator.java | 6 +-- .../ReactorAsyncOperationEndStrategy.java | 4 +- ...eactorAsyncOperationEndStrategyTest.groovy | 2 +- .../rxjava2/TracingAssemblyActivation.java | 2 +- .../RxJava2AsyncOperationEndStrategy.java | 4 +- .../rxjava2/TracingAssembly.java | 6 +-- ...xJava2AsyncOperationEndStrategyTest.groovy | 2 +- .../rxjava3/TracingAssemblyActivation.java | 2 +- .../RxJava3AsyncOperationEndStrategy.java | 4 +- .../rxjava3/TracingAssembly.java | 6 +-- ...xJava3AsyncOperationEndStrategyTest.groovy | 2 +- .../javaagent/bootstrap/HelperResources.java | 2 +- .../ClassLoaderHasClassesNamedMatcher.java | 2 +- .../tooling/config/ConfigInitializer.java | 2 +- .../VirtualFieldImplementationsGenerator.java | 2 +- .../ignore/IgnoredClassLoadersMatcher.java | 2 +- .../ignore/IgnoredTypesBuilderImpl.java | 6 +-- .../javaagent/tooling/util/Trie.java | 2 +- .../tooling/OpenTelemetryInstallerTest.groovy | 4 +- .../config/ConfigPropertiesAdapterTest.java | 2 +- .../UserExcludedClassesConfigurerTest.java | 4 +- .../javaagent/tooling/util/TrieTest.java | 8 ++-- .../javaagent/tooling/HelperInjector.java | 4 +- .../muzzle/AgentCachingPoolStrategy.java | 4 +- .../tooling/muzzle/ReferenceMatcher.java | 2 +- .../testing/bytebuddy/TestAgentListener.java | 2 +- 40 files changed, 83 insertions(+), 83 deletions(-) diff --git a/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/Cache.java b/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/Cache.java index d36f19cc5089..4f340ca12aad 100644 --- a/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/Cache.java +++ b/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/Cache.java @@ -12,7 +12,7 @@ public interface Cache { /** Returns a new {@link CacheBuilder} to configure a {@link Cache}. */ - static CacheBuilder newBuilder() { + static CacheBuilder builder() { return new CacheBuilder(); } diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/config/Config.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/config/Config.java index 018ab46cfea3..726df2d0b60a 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/config/Config.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/config/Config.java @@ -38,7 +38,7 @@ public abstract class Config { @Nullable private static volatile Config instance = null; /** Start building a new {@link Config} instance. */ - public static ConfigBuilder newBuilder() { + public static ConfigBuilder builder() { return new ConfigBuilder(); } @@ -68,7 +68,7 @@ public static Config get() { // this should only happen in library instrumentation // // no need to synchronize because worst case is creating instance more than once - instance = newBuilder().readEnvironmentVariables().readSystemProperties().build(); + instance = builder().readEnvironmentVariables().readSystemProperties().build(); } return instance; } diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizer.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizer.java index b31fffab5a8e..6d5696eba1f6 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizer.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizer.java @@ -20,7 +20,7 @@ public final class SqlStatementSanitizer { private static final SupportabilityMetrics supportability = SupportabilityMetrics.instance(); private static final Cache sqlToStatementInfoCache = - Cache.newBuilder().setMaximumSize(1000).build(); + Cache.builder().setMaximumSize(1000).build(); public static SqlStatementInfo sanitize(@Nullable String statement) { if (!isStatementSanitizationEnabled() || statement == null) { diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpHeaderAttributes.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpHeaderAttributes.java index 881397e4c584..d67ed8fe8e1a 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpHeaderAttributes.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpHeaderAttributes.java @@ -12,9 +12,9 @@ final class HttpHeaderAttributes { private static final Cache>> requestKeysCache = - Cache.newBuilder().setMaximumSize(32).build(); + Cache.builder().setMaximumSize(32).build(); private static final Cache>> responseKeysCache = - Cache.newBuilder().setMaximumSize(32).build(); + Cache.builder().setMaximumSize(32).build(); static AttributeKey> requestAttributeKey(String headerName) { return requestKeysCache.computeIfAbsent(headerName, n -> createKey("request", n)); 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 4aab46ed88bd..3e87a2f7a8c1 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 @@ -55,7 +55,7 @@ public VirtualField find(Class type, Class field } private static final class CacheBasedVirtualField extends VirtualField { - private final Cache cache = Cache.newBuilder().setWeakKeys().build(); + private final Cache cache = Cache.builder().setWeakKeys().build(); @Override @Nullable diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/caching/CacheTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/caching/CacheTest.java index acd8c483c0fe..86898157d1c3 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/caching/CacheTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/caching/CacheTest.java @@ -18,7 +18,7 @@ class CacheTest { class StrongKeys { @Test void unbounded() { - Cache cache = Cache.newBuilder().build(); + Cache cache = Cache.builder().build(); assertThat(cache.computeIfAbsent("bear", unused -> "roar")).isEqualTo("roar"); cache.remove("bear"); @@ -40,7 +40,7 @@ void unbounded() { @Test void bounded() { - Cache cache = Cache.newBuilder().setMaximumSize(1).build(); + Cache cache = Cache.builder().setMaximumSize(1).build(); assertThat(cache.computeIfAbsent("bear", unused -> "roar")).isEqualTo("roar"); cache.remove("bear"); @@ -65,7 +65,7 @@ void bounded() { class WeakKeys { @Test void unbounded() { - Cache cache = Cache.newBuilder().setWeakKeys().build(); + Cache cache = Cache.builder().setWeakKeys().build(); assertThat(cache.computeIfAbsent("bear", unused -> "roar")).isEqualTo("roar"); cache.remove("bear"); @@ -99,7 +99,7 @@ void unbounded() { @Test void bounded() { - Cache cache = Cache.newBuilder().setWeakKeys().setMaximumSize(1).build(); + Cache cache = Cache.builder().setWeakKeys().setMaximumSize(1).build(); assertThat(cache.computeIfAbsent("bear", unused -> "roar")).isEqualTo("roar"); cache.remove("bear"); diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/caching/PatchCaffeineTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/caching/PatchCaffeineTest.java index ebadddb0fdd3..70189fd037ac 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/caching/PatchCaffeineTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/caching/PatchCaffeineTest.java @@ -17,7 +17,7 @@ class PatchCaffeineTest { void cleanupNotForkJoinTask() { AtomicReference errorRef = new AtomicReference<>(); Cache cache = - Cache.newBuilder() + Cache.builder() .setExecutor( task -> { try { diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/config/ConfigTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/config/ConfigTest.java index cd648102c4e5..05bee2e8cb30 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/config/ConfigTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/config/ConfigTest.java @@ -33,7 +33,7 @@ class ConfigTest { @Test void shouldGetString() { - Config config = Config.newBuilder().addProperty("prop.string", "some text").build(); + Config config = Config.builder().addProperty("prop.string", "some text").build(); assertEquals("some text", config.getString("prop.string")); assertEquals("some text", config.getString("prop.string", "default")); @@ -43,7 +43,7 @@ void shouldGetString() { @Test void shouldGetBoolean() { - Config config = Config.newBuilder().addProperty("prop.boolean", "true").build(); + Config config = Config.builder().addProperty("prop.boolean", "true").build(); assertTrue(config.getBoolean("prop.boolean")); assertTrue(config.getBoolean("prop.boolean", false)); @@ -54,7 +54,7 @@ void shouldGetBoolean() { @Test void shouldGetInt() { Config config = - Config.newBuilder() + Config.builder() .addProperty("prop.int", "12") .addProperty("prop.wrong", "twelve") .build(); @@ -68,7 +68,7 @@ void shouldGetInt() { @Test void shouldFailOnInvalidInt() { - Config config = Config.newBuilder().addProperty("prop.wrong", "twelve").build(); + Config config = Config.builder().addProperty("prop.wrong", "twelve").build(); assertThrows(ConfigParsingException.class, () -> config.getInt("prop.wrong")); } @@ -76,7 +76,7 @@ void shouldFailOnInvalidInt() { @Test void shouldGetLong() { Config config = - Config.newBuilder() + Config.builder() .addProperty("prop.long", "12") .addProperty("prop.wrong", "twelve") .build(); @@ -90,7 +90,7 @@ void shouldGetLong() { @Test void shouldFailOnInvalidLong() { - Config config = Config.newBuilder().addProperty("prop.wrong", "twelve").build(); + Config config = Config.builder().addProperty("prop.wrong", "twelve").build(); assertThrows(ConfigParsingException.class, () -> config.getLong("prop.wrong")); } @@ -98,7 +98,7 @@ void shouldFailOnInvalidLong() { @Test void shouldGetDouble() { Config config = - Config.newBuilder() + Config.builder() .addProperty("prop.double", "12.345") .addProperty("prop.wrong", "twelve point something") .build(); @@ -112,7 +112,7 @@ void shouldGetDouble() { @Test void shouldFailOnInvalidDouble() { - Config config = Config.newBuilder().addProperty("prop.wrong", "twelve point something").build(); + Config config = Config.builder().addProperty("prop.wrong", "twelve point something").build(); assertThrows(ConfigParsingException.class, () -> config.getDouble("prop.wrong")); } @@ -120,7 +120,7 @@ void shouldFailOnInvalidDouble() { @Test void shouldGetDuration_defaultUnit() { Config config = - Config.newBuilder() + Config.builder() .addProperty("prop.duration", "5000") .addProperty("prop.wrong", "hundred days") .build(); @@ -134,32 +134,32 @@ void shouldGetDuration_defaultUnit() { @Test void shouldFailOnInvalidDuration() { - Config config = Config.newBuilder().addProperty("prop.wrong", "hundred days").build(); + Config config = Config.builder().addProperty("prop.wrong", "hundred days").build(); assertThrows(ConfigParsingException.class, () -> config.getDuration("prop.wrong")); } @Test void shouldGetDuration_variousUnits() { - Config config = Config.newBuilder().addProperty("prop.duration", "100ms").build(); + Config config = Config.builder().addProperty("prop.duration", "100ms").build(); assertEquals(Duration.ofMillis(100), config.getDuration("prop.duration")); - config = Config.newBuilder().addProperty("prop.duration", "100s").build(); + config = Config.builder().addProperty("prop.duration", "100s").build(); assertEquals(Duration.ofSeconds(100), config.getDuration("prop.duration")); - config = Config.newBuilder().addProperty("prop.duration", "100m").build(); + config = Config.builder().addProperty("prop.duration", "100m").build(); assertEquals(Duration.ofMinutes(100), config.getDuration("prop.duration")); - config = Config.newBuilder().addProperty("prop.duration", "100h").build(); + config = Config.builder().addProperty("prop.duration", "100h").build(); assertEquals(Duration.ofHours(100), config.getDuration("prop.duration")); - config = Config.newBuilder().addProperty("prop.duration", "100d").build(); + config = Config.builder().addProperty("prop.duration", "100d").build(); assertEquals(Duration.ofDays(100), config.getDuration("prop.duration")); } @Test void shouldGetList() { - Config config = Config.newBuilder().addProperty("prop.list", "one, two ,three").build(); + Config config = Config.builder().addProperty("prop.list", "one, two ,three").build(); assertEquals(asList("one", "two", "three"), config.getList("prop.list")); assertEquals( @@ -172,7 +172,7 @@ void shouldGetList() { @Test void shouldGetMap() { Config config = - Config.newBuilder() + Config.builder() .addProperty("prop.map", "one=1, two=2") .addProperty("prop.wrong", "one=1, but not two!") .addProperty("prop.trailing", "one=1,") @@ -191,7 +191,7 @@ void shouldGetMap() { @Test void shouldFailOnInvalidMap() { - Config config = Config.newBuilder().addProperty("prop.wrong", "one=1, but not two!").build(); + Config config = Config.builder().addProperty("prop.wrong", "one=1, but not two!").build(); assertThrows(ConfigParsingException.class, () -> config.getMap("prop.wrong")); } @@ -199,7 +199,7 @@ void shouldFailOnInvalidMap() { @ParameterizedTest @ArgumentsSource(AgentDebugParams.class) void shouldCheckIfAgentDebugModeIsEnabled(String propertyValue, boolean expected) { - Config config = Config.newBuilder().addProperty("otel.javaagent.debug", propertyValue).build(); + Config config = Config.builder().addProperty("otel.javaagent.debug", propertyValue).build(); assertEquals(expected, config.isAgentDebugEnabled()); } @@ -217,7 +217,7 @@ public Stream provideArguments(ExtensionContext context) { void shouldCheckIfInstrumentationIsEnabled( List names, boolean defaultEnabled, boolean expected) { Config config = - Config.newBuilder() + Config.builder() .addProperty("otel.instrumentation.order.enabled", "true") .addProperty("otel.instrumentation.test-prop.enabled", "true") .addProperty("otel.instrumentation.disabled-prop.enabled", "false") diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/SupportabilityMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/SupportabilityMetricsTest.java index 2c597c9e1972..fb33da1127f4 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/SupportabilityMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/SupportabilityMetricsTest.java @@ -78,7 +78,7 @@ void resetsCountsEachReport() { } private static Config configWithJavaagentDebug(boolean enabled) { - return Config.newBuilder() + return Config.builder() .readProperties(Collections.singletonMap("otel.javaagent.debug", Boolean.toString(enabled))) .build(); } diff --git a/instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/InstrumentationHelper.java b/instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/InstrumentationHelper.java index f1a11d1b9d6c..867fb9025093 100644 --- a/instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/InstrumentationHelper.java +++ b/instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/InstrumentationHelper.java @@ -12,7 +12,7 @@ public final class InstrumentationHelper { static { asyncOperationEndStrategy = - GuavaAsyncOperationEndStrategy.newBuilder() + GuavaAsyncOperationEndStrategy.builder() .setCaptureExperimentalSpanAttributes( Config.get() .getBoolean("otel.instrumentation.guava.experimental-span-attributes", false)) diff --git a/instrumentation/guava-10.0/library/src/main/java/io/opentelemetry/instrumentation/guava/GuavaAsyncOperationEndStrategy.java b/instrumentation/guava-10.0/library/src/main/java/io/opentelemetry/instrumentation/guava/GuavaAsyncOperationEndStrategy.java index 578c1548b8cb..67883e4b39d0 100644 --- a/instrumentation/guava-10.0/library/src/main/java/io/opentelemetry/instrumentation/guava/GuavaAsyncOperationEndStrategy.java +++ b/instrumentation/guava-10.0/library/src/main/java/io/opentelemetry/instrumentation/guava/GuavaAsyncOperationEndStrategy.java @@ -20,10 +20,10 @@ public final class GuavaAsyncOperationEndStrategy implements AsyncOperationEndSt AttributeKey.booleanKey("guava.canceled"); public static GuavaAsyncOperationEndStrategy create() { - return newBuilder().build(); + return builder().build(); } - public static GuavaAsyncOperationEndStrategyBuilder newBuilder() { + public static GuavaAsyncOperationEndStrategyBuilder builder() { return new GuavaAsyncOperationEndStrategyBuilder(); } diff --git a/instrumentation/guava-10.0/library/src/test/groovy/GuavaAsyncOperationEndStrategyTest.groovy b/instrumentation/guava-10.0/library/src/test/groovy/GuavaAsyncOperationEndStrategyTest.groovy index 92fb38a2c30c..f8e467592d0d 100644 --- a/instrumentation/guava-10.0/library/src/test/groovy/GuavaAsyncOperationEndStrategyTest.groovy +++ b/instrumentation/guava-10.0/library/src/test/groovy/GuavaAsyncOperationEndStrategyTest.groovy @@ -24,7 +24,7 @@ class GuavaAsyncOperationEndStrategyTest extends Specification { def underTest = GuavaAsyncOperationEndStrategy.create() - def underTestWithExperimentalAttributes = GuavaAsyncOperationEndStrategy.newBuilder() + def underTestWithExperimentalAttributes = GuavaAsyncOperationEndStrategy.builder() .setCaptureExperimentalSpanAttributes(true) .build() diff --git a/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/FutureListenerWrappers.java b/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/FutureListenerWrappers.java index 919e419ffad0..bcf615426187 100644 --- a/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/FutureListenerWrappers.java +++ b/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/FutureListenerWrappers.java @@ -24,7 +24,7 @@ public final class FutureListenerWrappers { // to the key, that means it's no longer used (referenced) by the netty future anyways. private static final Cache< GenericFutureListener>, GenericFutureListener>> - wrappers = Cache.newBuilder().setWeakKeys().setWeakValues().build(); + wrappers = Cache.builder().setWeakKeys().setWeakValues().build(); private static final ClassValue shouldWrap = new ClassValue() { diff --git a/instrumentation/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/HooksInstrumentation.java b/instrumentation/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/HooksInstrumentation.java index 679cbf1528f7..4a4892e0361c 100644 --- a/instrumentation/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/HooksInstrumentation.java +++ b/instrumentation/reactor-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/HooksInstrumentation.java @@ -34,7 +34,7 @@ public static class ResetOnEachOperatorAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void postStaticInitializer() { - ContextPropagationOperator.newBuilder() + ContextPropagationOperator.builder() .setCaptureExperimentalSpanAttributes( Config.get() .getBoolean("otel.instrumentation.reactor.experimental-span-attributes", false)) diff --git a/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperator.java b/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperator.java index 8a9bdae765a8..4e3e03a0a3a4 100644 --- a/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperator.java +++ b/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ContextPropagationOperator.java @@ -40,10 +40,10 @@ public final class ContextPropagationOperator { public static ContextPropagationOperator create() { - return newBuilder().build(); + return builder().build(); } - public static ContextPropagationOperatorBuilder newBuilder() { + public static ContextPropagationOperatorBuilder builder() { return new ContextPropagationOperatorBuilder(); } @@ -87,7 +87,7 @@ public static Context getOpenTelemetryContext( ContextPropagationOperator(boolean captureExperimentalSpanAttributes) { this.asyncOperationEndStrategy = - ReactorAsyncOperationEndStrategy.newBuilder() + ReactorAsyncOperationEndStrategy.builder() .setCaptureExperimentalSpanAttributes(captureExperimentalSpanAttributes) .build(); } diff --git a/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategy.java b/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategy.java index 110ed77c101f..3ec2fe18589d 100644 --- a/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategy.java +++ b/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategy.java @@ -23,10 +23,10 @@ public final class ReactorAsyncOperationEndStrategy implements AsyncOperationEnd AttributeKey.booleanKey("reactor.canceled"); public static ReactorAsyncOperationEndStrategy create() { - return newBuilder().build(); + return builder().build(); } - public static ReactorAsyncOperationEndStrategyBuilder newBuilder() { + public static ReactorAsyncOperationEndStrategyBuilder builder() { return new ReactorAsyncOperationEndStrategyBuilder(); } diff --git a/instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyTest.groovy b/instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyTest.groovy index bc7a3321b26e..ade30236946f 100644 --- a/instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyTest.groovy +++ b/instrumentation/reactor-3.1/library/src/test/groovy/io/opentelemetry/instrumentation/reactor/ReactorAsyncOperationEndStrategyTest.groovy @@ -26,7 +26,7 @@ class ReactorAsyncOperationEndStrategyTest extends Specification { def underTest = ReactorAsyncOperationEndStrategy.create() - def underTestWithExperimentalAttributes = ReactorAsyncOperationEndStrategy.newBuilder() + def underTestWithExperimentalAttributes = ReactorAsyncOperationEndStrategy.builder() .setCaptureExperimentalSpanAttributes(true) .build() diff --git a/instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava2/TracingAssemblyActivation.java b/instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava2/TracingAssemblyActivation.java index 01e1b395f24d..97d91008a93c 100644 --- a/instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava2/TracingAssemblyActivation.java +++ b/instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava2/TracingAssemblyActivation.java @@ -21,7 +21,7 @@ protected AtomicBoolean computeValue(Class type) { public static void activate(Class clz) { if (activated.get(clz).compareAndSet(false, true)) { - TracingAssembly.newBuilder() + TracingAssembly.builder() .setCaptureExperimentalSpanAttributes( Config.get() .getBoolean("otel.instrumentation.rxjava.experimental-span-attributes", false)) diff --git a/instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/RxJava2AsyncOperationEndStrategy.java b/instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/RxJava2AsyncOperationEndStrategy.java index 8b91c95afcd4..2c11459f3ee2 100644 --- a/instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/RxJava2AsyncOperationEndStrategy.java +++ b/instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/RxJava2AsyncOperationEndStrategy.java @@ -29,10 +29,10 @@ public final class RxJava2AsyncOperationEndStrategy implements AsyncOperationEnd AttributeKey.booleanKey("rxjava.canceled"); public static RxJava2AsyncOperationEndStrategy create() { - return newBuilder().build(); + return builder().build(); } - public static RxJava2AsyncOperationEndStrategyBuilder newBuilder() { + public static RxJava2AsyncOperationEndStrategyBuilder builder() { return new RxJava2AsyncOperationEndStrategyBuilder(); } diff --git a/instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/TracingAssembly.java b/instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/TracingAssembly.java index 5b3ee0dde276..84049d001b4c 100644 --- a/instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/TracingAssembly.java +++ b/instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/TracingAssembly.java @@ -97,10 +97,10 @@ public final class TracingAssembly { private static boolean enabled; public static TracingAssembly create() { - return newBuilder().build(); + return builder().build(); } - public static TracingAssemblyBuilder newBuilder() { + public static TracingAssemblyBuilder builder() { return new TracingAssemblyBuilder(); } @@ -249,7 +249,7 @@ private static void enableMaybe() { private static void enableWithSpanStrategy(boolean captureExperimentalSpanAttributes) { asyncOperationEndStrategy = - RxJava2AsyncOperationEndStrategy.newBuilder() + RxJava2AsyncOperationEndStrategy.builder() .setCaptureExperimentalSpanAttributes(captureExperimentalSpanAttributes) .build(); diff --git a/instrumentation/rxjava/rxjava-2.0/library/src/test/groovy/RxJava2AsyncOperationEndStrategyTest.groovy b/instrumentation/rxjava/rxjava-2.0/library/src/test/groovy/RxJava2AsyncOperationEndStrategyTest.groovy index 4b0ade1423e3..1fd58a95affb 100644 --- a/instrumentation/rxjava/rxjava-2.0/library/src/test/groovy/RxJava2AsyncOperationEndStrategyTest.groovy +++ b/instrumentation/rxjava/rxjava-2.0/library/src/test/groovy/RxJava2AsyncOperationEndStrategyTest.groovy @@ -39,7 +39,7 @@ class RxJava2AsyncOperationEndStrategyTest extends Specification { def underTest = RxJava2AsyncOperationEndStrategy.create() - def underTestWithExperimentalAttributes = RxJava2AsyncOperationEndStrategy.newBuilder() + def underTestWithExperimentalAttributes = RxJava2AsyncOperationEndStrategy.builder() .setCaptureExperimentalSpanAttributes(true) .build() diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava3/TracingAssemblyActivation.java b/instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava3/TracingAssemblyActivation.java index 44ef79cc511b..f0fecdda2de5 100644 --- a/instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava3/TracingAssemblyActivation.java +++ b/instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava3/TracingAssemblyActivation.java @@ -21,7 +21,7 @@ protected AtomicBoolean computeValue(Class type) { public static void activate(Class clz) { if (activated.get(clz).compareAndSet(false, true)) { - TracingAssembly.newBuilder() + TracingAssembly.builder() .setCaptureExperimentalSpanAttributes( Config.get() .getBoolean("otel.instrumentation.rxjava.experimental-span-attributes", false)) diff --git a/instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/RxJava3AsyncOperationEndStrategy.java b/instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/RxJava3AsyncOperationEndStrategy.java index d65854451ab9..9b7a33c93c02 100644 --- a/instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/RxJava3AsyncOperationEndStrategy.java +++ b/instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/RxJava3AsyncOperationEndStrategy.java @@ -29,10 +29,10 @@ public final class RxJava3AsyncOperationEndStrategy implements AsyncOperationEnd AttributeKey.booleanKey("rxjava.canceled"); public static RxJava3AsyncOperationEndStrategy create() { - return newBuilder().build(); + return builder().build(); } - public static RxJava3AsyncOperationEndStrategyBuilder newBuilder() { + public static RxJava3AsyncOperationEndStrategyBuilder builder() { return new RxJava3AsyncOperationEndStrategyBuilder(); } diff --git a/instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingAssembly.java b/instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingAssembly.java index 360d5560cde1..593feb96f34b 100644 --- a/instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingAssembly.java +++ b/instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingAssembly.java @@ -97,10 +97,10 @@ public final class TracingAssembly { private static boolean enabled; public static TracingAssembly create() { - return newBuilder().build(); + return builder().build(); } - public static TracingAssemblyBuilder newBuilder() { + public static TracingAssemblyBuilder builder() { return new TracingAssemblyBuilder(); } @@ -247,7 +247,7 @@ private static void enableMaybe() { private static void enableWithSpanStrategy(boolean captureExperimentalSpanAttributes) { asyncOperationEndStrategy = - RxJava3AsyncOperationEndStrategy.newBuilder() + RxJava3AsyncOperationEndStrategy.builder() .setCaptureExperimentalSpanAttributes(captureExperimentalSpanAttributes) .build(); diff --git a/instrumentation/rxjava/rxjava-3.0/library/src/test/groovy/RxJava3AsyncOperationEndStrategyTest.groovy b/instrumentation/rxjava/rxjava-3.0/library/src/test/groovy/RxJava3AsyncOperationEndStrategyTest.groovy index 3e6c2363e2a6..c4309cba6fbf 100644 --- a/instrumentation/rxjava/rxjava-3.0/library/src/test/groovy/RxJava3AsyncOperationEndStrategyTest.groovy +++ b/instrumentation/rxjava/rxjava-3.0/library/src/test/groovy/RxJava3AsyncOperationEndStrategyTest.groovy @@ -39,7 +39,7 @@ class RxJava3AsyncOperationEndStrategyTest extends Specification { def underTest = RxJava3AsyncOperationEndStrategy.create() - def underTestWithExperimentalAttributes = RxJava3AsyncOperationEndStrategy.newBuilder() + def underTestWithExperimentalAttributes = RxJava3AsyncOperationEndStrategy.builder() .setCaptureExperimentalSpanAttributes(true) .build() 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 13f673c8a182..6c79b71f21db 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 @@ -18,7 +18,7 @@ public final class HelperResources { private static final Cache> RESOURCES = - Cache.newBuilder().setWeakKeys().build(); + Cache.builder().setWeakKeys().build(); /** Registers the {@code payload} to be available to instrumentation at {@code path}. */ public static void register(ClassLoader classLoader, String path, URL url) { 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 b403916ee1b4..2037afe51d54 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 @@ -13,7 +13,7 @@ class ClassLoaderHasClassesNamedMatcher extends ElementMatcher.Junction.AbstractBase { private final Cache cache = - Cache.newBuilder().setWeakKeys().setMaximumSize(25).build(); + Cache.builder().setWeakKeys().setMaximumSize(25).build(); private final String[] resources; diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigInitializer.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigInitializer.java index 7d2fba7473a9..c1c83ec46358 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigInitializer.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigInitializer.java @@ -32,7 +32,7 @@ public static void initialize() { // visible for testing static Config create(Properties spiConfiguration, Properties configurationFile) { - return Config.newBuilder() + return Config.builder() .readProperties(spiConfiguration) .readProperties(configurationFile) .readEnvironmentVariables() 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 4bf57f10b86d..10a46bbda149 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 @@ -264,7 +264,7 @@ private MethodVisitor getMethodVisitor(String methodName) { @SuppressWarnings({"UnusedMethod", "UnusedVariable", "MethodCanBeStatic"}) static final class VirtualFieldImplementationTemplate extends VirtualField { private static final VirtualFieldImplementationTemplate INSTANCE = - new VirtualFieldImplementationTemplate(Cache.newBuilder().setWeakKeys().build()); + new VirtualFieldImplementationTemplate(Cache.builder().setWeakKeys().build()); private final Cache map; 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 5112162edea9..54ee03f7f631 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 @@ -18,7 +18,7 @@ public class IgnoredClassLoadersMatcher extends ElementMatcher.Junction.Abstract /* Cache of classloader-instance -> (true|false). True = skip instrumentation. False = safe to instrument. */ private static final Cache skipCache = - Cache.newBuilder().setWeakKeys().build(); + Cache.builder().setWeakKeys().build(); private final Trie ignoredClassLoaders; diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/IgnoredTypesBuilderImpl.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/IgnoredTypesBuilderImpl.java index f0baf5478de1..daaac80a26e9 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/IgnoredTypesBuilderImpl.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/IgnoredTypesBuilderImpl.java @@ -9,9 +9,9 @@ import io.opentelemetry.javaagent.tooling.util.Trie; public class IgnoredTypesBuilderImpl implements IgnoredTypesBuilder { - private final Trie.Builder ignoredTypesTrie = Trie.newBuilder(); - private final Trie.Builder ignoredClassLoadersTrie = Trie.newBuilder(); - private final Trie.Builder ignoredTasksTrie = Trie.newBuilder(); + private final Trie.Builder ignoredTypesTrie = Trie.builder(); + private final Trie.Builder ignoredClassLoadersTrie = Trie.builder(); + private final Trie.Builder ignoredTasksTrie = Trie.builder(); @Override public IgnoredTypesBuilder ignoreClass(String classNameOrPrefix) { diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/util/Trie.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/util/Trie.java index 2d705b014500..91a64f3d0721 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/util/Trie.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/util/Trie.java @@ -11,7 +11,7 @@ public interface Trie { /** Start building a trie. */ - static Builder newBuilder() { + static Builder builder() { return new TrieImpl.BuilderImpl<>(); } diff --git a/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.groovy index df5814f89827..3132d7ba8a57 100755 --- a/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.groovy +++ b/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.groovy @@ -25,7 +25,7 @@ class OpenTelemetryInstallerTest extends Specification { def "should initialize noop"() { given: - def config = Config.newBuilder() + def config = Config.builder() .readProperties([ (OpenTelemetryInstaller.JAVAAGENT_NOOP_CONFIG) : "true", (OpenTelemetryInstaller.JAVAAGENT_ENABLED_CONFIG): "true" @@ -43,7 +43,7 @@ class OpenTelemetryInstallerTest extends Specification { def "should NOT initialize noop"() { given: - def config = Config.newBuilder() + def config = Config.builder() .readProperties([ (OpenTelemetryInstaller.JAVAAGENT_NOOP_CONFIG) : "true", (OpenTelemetryInstaller.JAVAAGENT_ENABLED_CONFIG): "false" diff --git a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigPropertiesAdapterTest.java b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigPropertiesAdapterTest.java index e2224ca8e8b6..081c652509fc 100644 --- a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigPropertiesAdapterTest.java +++ b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigPropertiesAdapterTest.java @@ -176,6 +176,6 @@ void durationUnitParsing() { } private static ConfigProperties createConfig(Map properties) { - return new ConfigPropertiesAdapter(Config.newBuilder().readProperties(properties).build()); + return new ConfigPropertiesAdapter(Config.builder().readProperties(properties).build()); } } diff --git a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassesConfigurerTest.java b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassesConfigurerTest.java index 965e7c08da3d..a64b3d48f3bb 100644 --- a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassesConfigurerTest.java +++ b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassesConfigurerTest.java @@ -27,7 +27,7 @@ class UserExcludedClassesConfigurerTest { @Test void shouldAddNothingToBuilderWhenPropertyIsEmpty() { // when - underTest.configure(Config.newBuilder().build(), builder); + underTest.configure(Config.builder().build(), builder); // then verifyNoInteractions(builder); @@ -37,7 +37,7 @@ void shouldAddNothingToBuilderWhenPropertyIsEmpty() { void shouldIgnoreClassesAndPackages() { // given Config config = - Config.newBuilder() + Config.builder() .readProperties( singletonMap( EXCLUDED_CLASSES_CONFIG, diff --git a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/util/TrieTest.java b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/util/TrieTest.java index 0ed96aedc7ab..2d77d284e28f 100644 --- a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/util/TrieTest.java +++ b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/util/TrieTest.java @@ -16,7 +16,7 @@ class TrieTest { @Test void shouldMatchExactString() { Trie trie = - Trie.newBuilder().put("abc", 0).put("abcd", 10).put("abcde", 20).build(); + Trie.builder().put("abc", 0).put("abcd", 10).put("abcde", 20).build(); assertNull(trie.getOrNull("ab")); assertFalse(trie.contains("ab")); @@ -29,7 +29,7 @@ void shouldMatchExactString() { @Test void shouldReturnLastMatchedValue() { Trie trie = - Trie.newBuilder().put("abc", 0).put("abcde", 10).put("abcdfgh", 20).build(); + Trie.builder().put("abc", 0).put("abcde", 10).put("abcdfgh", 20).build(); assertNull(trie.getOrNull("ababababa")); assertEquals(0, trie.getOrNull("abcd")); @@ -39,14 +39,14 @@ void shouldReturnLastMatchedValue() { @Test void shouldOverwritePreviousValue() { - Trie trie = Trie.newBuilder().put("abc", 0).put("abc", 12).build(); + Trie trie = Trie.builder().put("abc", 0).put("abc", 12).build(); assertEquals(12, trie.getOrNull("abc")); } @Test void shouldReturnDefaultValueWhenNotMatched() { - Trie trie = Trie.newBuilder().put("abc", 42).build(); + Trie trie = Trie.builder().put("abc", 42).build(); assertEquals(-1, trie.getOrDefault("acdc", -1)); } 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 c54e6d2e80df..cd5d6e1000be 100644 --- a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/HelperInjector.java +++ b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/HelperInjector.java @@ -59,7 +59,7 @@ public String toString() { }; private static final Cache, Boolean> injectedClasses = - Cache.newBuilder().setWeakKeys().build(); + Cache.builder().setWeakKeys().build(); private final String requestingName; @@ -70,7 +70,7 @@ public String toString() { private final Map dynamicTypeMap = new LinkedHashMap<>(); private final Cache injectedClassLoaders = - Cache.newBuilder().setWeakKeys().build(); + Cache.builder().setWeakKeys().build(); private final List> helperModules = new CopyOnWriteArrayList<>(); 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 2d364e507550..7bf1c463a70e 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 @@ -49,13 +49,13 @@ public class AgentCachingPoolStrategy implements AgentBuilder.PoolStrategy { * */ final Cache> loaderRefCache = - Cache.newBuilder().setWeakKeys().build(); + Cache.builder().setWeakKeys().build(); /** * Single shared Type.Resolution cache -- uses a composite key -- conceptually of loader & name */ final Cache sharedResolutionCache = - Cache.newBuilder().setMaximumSize(TYPE_CAPACITY).build(); + Cache.builder().setMaximumSize(TYPE_CAPACITY).build(); // fast path for bootstrap final SharedResolutionCacheAdapter bootstrapCacheProvider = diff --git a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceMatcher.java b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceMatcher.java index 6c41e2c83275..72e7e435eca5 100644 --- a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceMatcher.java +++ b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceMatcher.java @@ -32,7 +32,7 @@ public final class ReferenceMatcher { private final Cache mismatchCache = - Cache.newBuilder().setWeakKeys().build(); + Cache.builder().setWeakKeys().build(); private final Map references; private final Set helperClassNames; private final HelperClassPredicate helperClassPredicate; diff --git a/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/bytebuddy/TestAgentListener.java b/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/bytebuddy/TestAgentListener.java index dd274969435a..d41197ec22c2 100644 --- a/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/bytebuddy/TestAgentListener.java +++ b/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/bytebuddy/TestAgentListener.java @@ -47,7 +47,7 @@ private static Trie buildAdditionalLibraryIgnores() { } private static Trie buildOtherConfiguredIgnores() { - Config config = Config.newBuilder().build(); + Config config = Config.builder().build(); IgnoredTypesBuilderImpl builder = new IgnoredTypesBuilderImpl(); for (IgnoredTypesConfigurer configurer : SafeServiceLoader.loadOrdered(IgnoredTypesConfigurer.class)) { From ccf9b9770857f822d0a84c7d544945b53529c55a Mon Sep 17 00:00:00 2001 From: MartinDai Date: Mon, 18 Oct 2021 13:52:04 +0800 Subject: [PATCH 2/2] code format --- .../instrumentation/api/config/ConfigTest.java | 10 ++-------- .../javaagent/tooling/muzzle/ReferenceMatcher.java | 3 +-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/config/ConfigTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/config/ConfigTest.java index 05bee2e8cb30..6ff143154d92 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/config/ConfigTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/config/ConfigTest.java @@ -54,10 +54,7 @@ void shouldGetBoolean() { @Test void shouldGetInt() { Config config = - Config.builder() - .addProperty("prop.int", "12") - .addProperty("prop.wrong", "twelve") - .build(); + Config.builder().addProperty("prop.int", "12").addProperty("prop.wrong", "twelve").build(); assertEquals(12, config.getInt("prop.int")); assertEquals(12, config.getInt("prop.int", 1000)); @@ -76,10 +73,7 @@ void shouldFailOnInvalidInt() { @Test void shouldGetLong() { Config config = - Config.builder() - .addProperty("prop.long", "12") - .addProperty("prop.wrong", "twelve") - .build(); + Config.builder().addProperty("prop.long", "12").addProperty("prop.wrong", "twelve").build(); assertEquals(12, config.getLong("prop.long")); assertEquals(12, config.getLong("prop.long", 1000)); diff --git a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceMatcher.java b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceMatcher.java index 72e7e435eca5..e3e3ff66f8b1 100644 --- a/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceMatcher.java +++ b/muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceMatcher.java @@ -31,8 +31,7 @@ /** Matches a set of references against a classloader. */ public final class ReferenceMatcher { - private final Cache mismatchCache = - Cache.builder().setWeakKeys().build(); + private final Cache mismatchCache = Cache.builder().setWeakKeys().build(); private final Map references; private final Set helperClassNames; private final HelperClassPredicate helperClassPredicate;