From 809e67ccc354b1fb533bdec2c33e780b007795f5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 28 Aug 2025 22:58:23 +0000 Subject: [PATCH 01/12] Initial plan From aef8caa8bed646375c7ee1d183cbd7a2aefdfb40 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:08:11 +0000 Subject: [PATCH 02/12] Remove final from method parameters and local variables per style guide Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .../contrib/jmxmetrics/GroovyRunner.java | 24 +++++++++---------- .../contrib/jmxmetrics/JmxConfig.java | 6 ++--- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/GroovyRunner.java b/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/GroovyRunner.java index ab0a8045e..4619b88b0 100644 --- a/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/GroovyRunner.java +++ b/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/GroovyRunner.java @@ -36,15 +36,13 @@ public class GroovyRunner { private final GroovyMetricEnvironment groovyMetricEnvironment; GroovyRunner( - final JmxConfig config, - final JmxClient jmxClient, - final GroovyMetricEnvironment groovyMetricEnvironment) { + JmxConfig config, JmxClient jmxClient, GroovyMetricEnvironment groovyMetricEnvironment) { this.groovyMetricEnvironment = groovyMetricEnvironment; List scriptSources = new ArrayList<>(); try { if (config.targetSystems.size() != 0) { - for (final String target : config.targetSystems) { + for (String target : config.targetSystems) { String systemResourcePath = "target-systems/" + target + ".groovy"; scriptSources.add(getTargetSystemResourceAsString(systemResourcePath)); } @@ -59,7 +57,7 @@ public class GroovyRunner { this.scripts = new ArrayList<>(); try { - for (final String source : scriptSources) { + for (String source : scriptSources) { this.scripts.add(new GroovyShell().parse(source)); } } catch (CompilationFailedException e) { @@ -74,18 +72,18 @@ public class GroovyRunner { new OtelHelper(jmxClient, this.groovyMetricEnvironment, config.aggregateAcrossMBeans); binding.setVariable("otel", otelHelper); - for (final Script script : scripts) { + for (Script script : scripts) { script.setBinding(binding); } } - private static String getFileAsString(final String fileName) throws IOException { + private static String getFileAsString(String fileName) throws IOException { try (InputStream is = new FileInputStream(fileName)) { return getFileFromInputStream(is); } } - private String getTargetSystemResourceAsString(final String targetSystem) throws IOException { + private String getTargetSystemResourceAsString(String targetSystem) throws IOException { URL res = getClass().getClassLoader().getResource(targetSystem); if (res == null) { throw new ConfigurationException("Failed to load " + targetSystem); @@ -98,15 +96,15 @@ private String getTargetSystemResourceAsString(final String targetSystem) throws } private static String getTargetSystemResourceFromJarAsString(URL res) throws IOException { - final String[] array = res.toString().split("!"); + String[] array = res.toString().split("!"); if (array.length != 2) { throw new ConfigurationException( "Invalid path for target system resource from jar: " + res.toString()); } - final Map env = Collections.emptyMap(); + Map env = Collections.emptyMap(); try { - try (final FileSystem fs = FileSystems.newFileSystem(URI.create(array[0]), env)) { + try (FileSystem fs = FileSystems.newFileSystem(URI.create(array[0]), env)) { Path path = fs.getPath(array[1]); try (InputStream is = Files.newInputStream(path)) { return getFileFromInputStream(is); @@ -117,7 +115,7 @@ private static String getTargetSystemResourceFromJarAsString(URL res) throws IOE } } - private static String getFileFromInputStream(final InputStream is) throws IOException { + private static String getFileFromInputStream(InputStream is) throws IOException { if (is == null) { return null; } @@ -134,7 +132,7 @@ private static String getFileFromInputStream(final InputStream is) throws IOExce } public void run() { - for (final Script script : scripts) { + for (Script script : scripts) { script.run(); } } diff --git a/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/JmxConfig.java b/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/JmxConfig.java index 1f1a6abec..dde7b6f6c 100644 --- a/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/JmxConfig.java +++ b/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/JmxConfig.java @@ -138,7 +138,7 @@ class JmxConfig { this(new Properties()); } - private int getProperty(final String key, final int dfault) { + private int getProperty(String key, int dfault) { String propVal = properties.getProperty(key); if (propVal == null) { return dfault; @@ -153,7 +153,7 @@ private int getProperty(final String key, final int dfault) { /** * Similar to getProperty(key, defaultValue) but sets the property to default if not in object. */ - private String getAndSetProperty(final String key, final String defaultValue) { + private String getAndSetProperty(String key, String defaultValue) { String propVal = properties.getProperty(key, defaultValue); if (propVal.equals(defaultValue)) { properties.setProperty(key, defaultValue); @@ -161,7 +161,7 @@ private String getAndSetProperty(final String key, final String defaultValue) { return propVal; } - private int getAndSetProperty(final String key, final int defaultValue) { + private int getAndSetProperty(String key, int defaultValue) { int propVal = getProperty(key, defaultValue); if (propVal == defaultValue) { properties.setProperty(key, String.valueOf(defaultValue)); From 392ae024688a8b3ff2f3cd1910ce6121d5a49117 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:14:08 +0000 Subject: [PATCH 03/12] Add static imports for Collections utilities per style guide Co-authored-by: trask <218610+trask@users.noreply.github.com> --- ...AutoConfigurationCustomizerProviderTest.java | 17 ++++++++--------- .../instruments/AbstractInstrument.java | 5 +++-- .../micrometer/MicrometerMeterProviderTest.java | 6 +++--- .../MicrometerDoubleHistogramTest.java | 4 ++-- .../MicrometerLongHistogramTest.java | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java b/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java index 4fb687925..ef4747cfa 100644 --- a/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java +++ b/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java @@ -10,6 +10,7 @@ import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.SIGNAL_TYPE_ALL; import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.SIGNAL_TYPE_METRICS; import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.SIGNAL_TYPE_TRACES; +import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -55,7 +56,6 @@ import java.time.Instant; import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; -import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; @@ -398,14 +398,13 @@ public void testQuotaProjectBehavior(QuotaProjectIdTestBehavior testCase) throws mockedRequestMetadata = ImmutableMap.of( "Authorization", - Collections.singletonList("Bearer " + fakeAccessToken.getTokenValue()), + singletonList("Bearer " + fakeAccessToken.getTokenValue()), QUOTA_USER_PROJECT_HEADER, - Collections.singletonList(DUMMY_GCP_QUOTA_PROJECT_ID)); + singletonList(DUMMY_GCP_QUOTA_PROJECT_ID)); } else { mockedRequestMetadata = ImmutableMap.of( - "Authorization", - Collections.singletonList("Bearer " + fakeAccessToken.getTokenValue())); + "Authorization", singletonList("Bearer " + fakeAccessToken.getTokenValue())); } // mock credentials to return the prepared request metadata Mockito.when(mockedGoogleCredentials.getRequestMetadata()).thenReturn(mockedRequestMetadata); @@ -920,9 +919,9 @@ private void prepareMockBehaviorForGoogleCredentials() { .thenReturn( ImmutableMap.of( "Authorization", - Collections.singletonList("Bearer " + fakeAccessToken.getTokenValue()), + singletonList("Bearer " + fakeAccessToken.getTokenValue()), QUOTA_USER_PROJECT_HEADER, - Collections.singletonList(DUMMY_GCP_QUOTA_PROJECT_ID))); + singletonList(DUMMY_GCP_QUOTA_PROJECT_ID))); } catch (IOException e) { throw new RuntimeException(e); } @@ -966,7 +965,7 @@ private OpenTelemetrySdk buildOpenTelemetrySdkWithExporter( @Override public List load(Class spiClass) { if (spiClass == ConfigurableSpanExporterProvider.class) { - return Collections.singletonList( + return singletonList( spiClass.cast( new ConfigurableSpanExporterProvider() { @Override @@ -982,7 +981,7 @@ public String getName() { })); } if (spiClass == ConfigurableMetricExporterProvider.class) { - return Collections.singletonList( + return singletonList( spiClass.cast( new ConfigurableMetricExporterProvider() { @Override diff --git a/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/AbstractInstrument.java b/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/AbstractInstrument.java index 80aa56465..cb14e4555 100644 --- a/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/AbstractInstrument.java +++ b/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/AbstractInstrument.java @@ -5,6 +5,8 @@ package io.opentelemetry.contrib.metrics.micrometer.internal.instruments; +import static java.util.Collections.unmodifiableList; + import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tag; import io.opentelemetry.api.common.AttributeKey; @@ -14,7 +16,6 @@ import io.opentelemetry.contrib.metrics.micrometer.CallbackRegistration; import io.opentelemetry.contrib.metrics.micrometer.internal.state.InstrumentState; import java.util.ArrayList; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -91,7 +92,7 @@ private Iterable calculateTags(Attributes attributes) { list.add(instrumentationNameTag); list.add(instrumentationVersionTag); - return Collections.unmodifiableList(list); + return unmodifiableList(list); } protected final CallbackRegistration registerLongCallback( diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeterProviderTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeterProviderTest.java index f323fbaba..1fbe60e27 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeterProviderTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeterProviderTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.metrics.micrometer; +import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -14,11 +15,10 @@ import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.contrib.metrics.micrometer.internal.Constants; -import java.util.Collections; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class MicrometerMeterProviderTest { +class MicrometerMeterProviderTest { SimpleMeterRegistry meterRegistry; CallbackRegistrar callbackRegistrar; @@ -26,7 +26,7 @@ public class MicrometerMeterProviderTest { @BeforeEach void setUp() { meterRegistry = new SimpleMeterRegistry(); - callbackRegistrar = new TestCallbackRegistrar(Collections.emptyList()); + callbackRegistrar = new TestCallbackRegistrar(emptyList()); } @Test diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleHistogramTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleHistogramTest.java index bc88fccc7..641ca4ab9 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleHistogramTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleHistogramTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.metrics.micrometer.internal.instruments; +import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; import io.micrometer.core.instrument.DistributionSummary; @@ -24,7 +25,6 @@ import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterProviderSharedState; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterSharedState; import java.util.Arrays; -import java.util.Collections; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -41,7 +41,7 @@ public class MicrometerDoubleHistogramTest { @BeforeEach void setUp() { meterRegistry = new SimpleMeterRegistry(); - callbackRegistrar = new TestCallbackRegistrar(Collections.emptyList()); + callbackRegistrar = new TestCallbackRegistrar(emptyList()); meterProviderSharedState = new MeterProviderSharedState(() -> meterRegistry, callbackRegistrar); meterSharedState = new MeterSharedState(meterProviderSharedState, "meter", "1.0", null); } diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongHistogramTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongHistogramTest.java index 880e7d766..30b62d1b9 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongHistogramTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongHistogramTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.metrics.micrometer.internal.instruments; +import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; import io.micrometer.core.instrument.DistributionSummary; @@ -24,7 +25,6 @@ import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterProviderSharedState; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterSharedState; import java.util.Arrays; -import java.util.Collections; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -41,7 +41,7 @@ public class MicrometerLongHistogramTest { @BeforeEach void setUp() { meterRegistry = new SimpleMeterRegistry(); - callbackRegistrar = new TestCallbackRegistrar(Collections.emptyList()); + callbackRegistrar = new TestCallbackRegistrar(emptyList()); meterProviderSharedState = new MeterProviderSharedState(() -> meterRegistry, callbackRegistrar); meterSharedState = new MeterSharedState(meterProviderSharedState, "meter", "1.0", null); } From 38047eb1a9c2e5586d1c589340b7f4c1ef7d8ef9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:15:35 +0000 Subject: [PATCH 04/12] Fix test class visibility modifiers per style guide Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .../contrib/metrics/micrometer/MicrometerMeterTest.java | 2 +- .../internal/instruments/MicrometerDoubleGaugeTest.java | 2 +- .../internal/instruments/MicrometerDoubleHistogramTest.java | 2 +- .../internal/instruments/MicrometerDoubleUpDownCounterTest.java | 2 +- .../internal/instruments/MicrometerLongGaugeTest.java | 2 +- .../internal/instruments/MicrometerLongHistogramTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeterTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeterTest.java index 56b173e29..c23ef99dc 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeterTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeterTest.java @@ -31,7 +31,7 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -public class MicrometerMeterTest { +class MicrometerMeterTest { SimpleMeterRegistry meterRegistry; List callbacks; diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleGaugeTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleGaugeTest.java index df358a1b9..393479db7 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleGaugeTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleGaugeTest.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class MicrometerDoubleGaugeTest { +class MicrometerDoubleGaugeTest { SimpleMeterRegistry meterRegistry; List callbacks; diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleHistogramTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleHistogramTest.java index 641ca4ab9..0b8d944f7 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleHistogramTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleHistogramTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class MicrometerDoubleHistogramTest { +class MicrometerDoubleHistogramTest { SimpleMeterRegistry meterRegistry; diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleUpDownCounterTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleUpDownCounterTest.java index 57cf8922e..536f18d91 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleUpDownCounterTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleUpDownCounterTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class MicrometerDoubleUpDownCounterTest { +class MicrometerDoubleUpDownCounterTest { SimpleMeterRegistry meterRegistry; diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongGaugeTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongGaugeTest.java index f55087dcf..96b56b1a9 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongGaugeTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongGaugeTest.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class MicrometerLongGaugeTest { +class MicrometerLongGaugeTest { SimpleMeterRegistry meterRegistry; List callbacks; diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongHistogramTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongHistogramTest.java index 30b62d1b9..3d2edfeec 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongHistogramTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongHistogramTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class MicrometerLongHistogramTest { +class MicrometerLongHistogramTest { SimpleMeterRegistry meterRegistry; From 15dd6f6b10edb3b56dd4cd22740838d1d80719ac Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:53:46 +0000 Subject: [PATCH 05/12] Continue style guide compliance: fix test class visibility and add static imports Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .../disk/buffering/IntegrationTest.java | 2 +- ...toConfigurationCustomizerProviderTest.java | 156 +++++++++--------- .../auth/GcpAuthExtensionEndToEndTest.java | 2 +- .../QueueCollectionBuddyTest.java | 2 +- .../TopicMetricsCollectorTest.java | 2 +- .../InferredSpansAutoConfigTest.java | 2 +- .../micrometer/PrometheusIntegrationTest.java | 32 ++-- .../MicrometerDoubleCounterTest.java | 2 +- .../MicrometerLongCounterTest.java | 2 +- .../MicrometerLongUpDownCounterTest.java | 2 +- .../FilteringLogRecordProcessorTest.java | 2 +- 11 files changed, 100 insertions(+), 106 deletions(-) diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java index b46cba12f..68afb3cbf 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java @@ -53,7 +53,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -public class IntegrationTest { +class IntegrationTest { private InMemorySpanExporter memorySpanExporter; private Tracer tracer; private InMemoryMetricExporter memoryMetricExporter; diff --git a/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java b/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java index ef4747cfa..be9ce7ff8 100644 --- a/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java +++ b/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java @@ -15,6 +15,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyCollection; +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.when; import com.google.auth.oauth2.AccessToken; import com.google.auth.oauth2.GoogleCredentials; @@ -77,7 +88,6 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockedStatic; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.stubbing.Answer; @@ -135,25 +145,24 @@ public void testTraceCustomizerOtlpHttp() { ConfigurableOption.GOOGLE_OTEL_AUTH_TARGET_SIGNALS.getSystemProperty(), SIGNAL_TYPE_TRACES); // Prepare mocks prepareMockBehaviorForGoogleCredentials(); - OtlpHttpSpanExporter mockOtlpHttpSpanExporter = Mockito.mock(OtlpHttpSpanExporter.class); + OtlpHttpSpanExporter mockOtlpHttpSpanExporter = mock(OtlpHttpSpanExporter.class); OtlpHttpSpanExporterBuilder otlpSpanExporterBuilder = OtlpHttpSpanExporter.builder(); - OtlpHttpSpanExporterBuilder spyOtlpHttpSpanExporterBuilder = - Mockito.spy(otlpSpanExporterBuilder); - Mockito.when(spyOtlpHttpSpanExporterBuilder.build()).thenReturn(mockOtlpHttpSpanExporter); + OtlpHttpSpanExporterBuilder spyOtlpHttpSpanExporterBuilder = spy(otlpSpanExporterBuilder); + when(spyOtlpHttpSpanExporterBuilder.build()).thenReturn(mockOtlpHttpSpanExporter); - Mockito.when(mockOtlpHttpSpanExporter.shutdown()).thenReturn(CompletableResultCode.ofSuccess()); + when(mockOtlpHttpSpanExporter.shutdown()).thenReturn(CompletableResultCode.ofSuccess()); List exportedSpans = new ArrayList<>(); - Mockito.when(mockOtlpHttpSpanExporter.export(Mockito.anyCollection())) + when(mockOtlpHttpSpanExporter.export(anyCollection())) .thenAnswer( invocationOnMock -> { exportedSpans.addAll(invocationOnMock.getArgument(0)); return CompletableResultCode.ofSuccess(); }); - Mockito.when(mockOtlpHttpSpanExporter.toBuilder()).thenReturn(spyOtlpHttpSpanExporterBuilder); + when(mockOtlpHttpSpanExporter.toBuilder()).thenReturn(spyOtlpHttpSpanExporterBuilder); // begin assertions try (MockedStatic googleCredentialsMockedStatic = - Mockito.mockStatic(GoogleCredentials.class)) { + mockStatic(GoogleCredentials.class)) { googleCredentialsMockedStatic .when(GoogleCredentials::getApplicationDefault) .thenReturn(mockedGoogleCredentials); @@ -164,14 +173,14 @@ public void testTraceCustomizerOtlpHttp() { CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS); assertTrue(joinResult.isSuccess()); - Mockito.verify(mockOtlpHttpSpanExporter, Mockito.times(1)).toBuilder(); - Mockito.verify(spyOtlpHttpSpanExporterBuilder, Mockito.times(1)) + verify(mockOtlpHttpSpanExporter, times(1)).toBuilder(); + verify(spyOtlpHttpSpanExporterBuilder, times(1)) .setHeaders(traceHeaderSupplierCaptor.capture()); assertEquals(2, traceHeaderSupplierCaptor.getValue().get().size()); assertThat(authHeadersQuotaProjectIsPresent(traceHeaderSupplierCaptor.getValue().get())) .isTrue(); - Mockito.verify(mockOtlpHttpSpanExporter, Mockito.atLeast(1)).export(Mockito.anyCollection()); + verify(mockOtlpHttpSpanExporter, atLeast(1)).export(anyCollection()); assertThat(exportedSpans) .hasSizeGreaterThan(0) @@ -197,16 +206,16 @@ public void testTraceCustomizerOtlpGrpc() { ConfigurableOption.GOOGLE_OTEL_AUTH_TARGET_SIGNALS.getSystemProperty(), SIGNAL_TYPE_TRACES); // Prepare mocks prepareMockBehaviorForGoogleCredentials(); - OtlpGrpcSpanExporter mockOtlpGrpcSpanExporter = Mockito.mock(OtlpGrpcSpanExporter.class); + OtlpGrpcSpanExporter mockOtlpGrpcSpanExporter = mock(OtlpGrpcSpanExporter.class); OtlpGrpcSpanExporterBuilder spyOtlpGrpcSpanExporterBuilder = - Mockito.spy(OtlpGrpcSpanExporter.builder()); + spy(OtlpGrpcSpanExporter.builder()); List exportedSpans = new ArrayList<>(); configureGrpcMockSpanExporter( mockOtlpGrpcSpanExporter, spyOtlpGrpcSpanExporterBuilder, exportedSpans); // begin assertions try (MockedStatic googleCredentialsMockedStatic = - Mockito.mockStatic(GoogleCredentials.class)) { + mockStatic(GoogleCredentials.class)) { googleCredentialsMockedStatic .when(GoogleCredentials::getApplicationDefault) .thenReturn(mockedGoogleCredentials); @@ -217,14 +226,14 @@ public void testTraceCustomizerOtlpGrpc() { CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS); assertTrue(joinResult.isSuccess()); - Mockito.verify(mockOtlpGrpcSpanExporter, Mockito.times(1)).toBuilder(); - Mockito.verify(spyOtlpGrpcSpanExporterBuilder, Mockito.times(1)) + verify(mockOtlpGrpcSpanExporter, times(1)).toBuilder(); + verify(spyOtlpGrpcSpanExporterBuilder, times(1)) .setHeaders(traceHeaderSupplierCaptor.capture()); assertEquals(2, traceHeaderSupplierCaptor.getValue().get().size()); assertThat(authHeadersQuotaProjectIsPresent(traceHeaderSupplierCaptor.getValue().get())) .isTrue(); - Mockito.verify(mockOtlpGrpcSpanExporter, Mockito.atLeast(1)).export(Mockito.anyCollection()); + verify(mockOtlpGrpcSpanExporter, atLeast(1)).export(anyCollection()); assertThat(exportedSpans) .hasSizeGreaterThan(0) @@ -252,17 +261,16 @@ public void testMetricCustomizerOtlpHttp() { SIGNAL_TYPE_METRICS); // Prepare mocks prepareMockBehaviorForGoogleCredentials(); - OtlpHttpMetricExporter mockOtlpHttpMetricExporter = Mockito.mock(OtlpHttpMetricExporter.class); + OtlpHttpMetricExporter mockOtlpHttpMetricExporter = mock(OtlpHttpMetricExporter.class); OtlpHttpMetricExporterBuilder otlpMetricExporterBuilder = OtlpHttpMetricExporter.builder(); - OtlpHttpMetricExporterBuilder spyOtlpHttpMetricExporterBuilder = - Mockito.spy(otlpMetricExporterBuilder); + OtlpHttpMetricExporterBuilder spyOtlpHttpMetricExporterBuilder = spy(otlpMetricExporterBuilder); List exportedMetrics = new ArrayList<>(); configureHttpMockMetricExporter( mockOtlpHttpMetricExporter, spyOtlpHttpMetricExporterBuilder, exportedMetrics); // begin assertions try (MockedStatic googleCredentialsMockedStatic = - Mockito.mockStatic(GoogleCredentials.class)) { + mockStatic(GoogleCredentials.class)) { googleCredentialsMockedStatic .when(GoogleCredentials::getApplicationDefault) .thenReturn(mockedGoogleCredentials); @@ -273,15 +281,14 @@ public void testMetricCustomizerOtlpHttp() { CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS); assertTrue(joinResult.isSuccess()); - Mockito.verify(mockOtlpHttpMetricExporter, Mockito.times(1)).toBuilder(); - Mockito.verify(spyOtlpHttpMetricExporterBuilder, Mockito.times(1)) + verify(mockOtlpHttpMetricExporter, times(1)).toBuilder(); + verify(spyOtlpHttpMetricExporterBuilder, times(1)) .setHeaders(metricHeaderSupplierCaptor.capture()); assertEquals(2, metricHeaderSupplierCaptor.getValue().get().size()); assertThat(authHeadersQuotaProjectIsPresent(metricHeaderSupplierCaptor.getValue().get())) .isTrue(); - Mockito.verify(mockOtlpHttpMetricExporter, Mockito.atLeast(1)) - .export(Mockito.anyCollection()); + verify(mockOtlpHttpMetricExporter, atLeast(1)).export(anyCollection()); assertThat(exportedMetrics) .hasSizeGreaterThan(0) @@ -313,17 +320,16 @@ public void testMetricCustomizerOtlpGrpc() { SIGNAL_TYPE_METRICS); // Prepare mocks prepareMockBehaviorForGoogleCredentials(); - OtlpGrpcMetricExporter mockOtlpGrpcMetricExporter = Mockito.mock(OtlpGrpcMetricExporter.class); + OtlpGrpcMetricExporter mockOtlpGrpcMetricExporter = mock(OtlpGrpcMetricExporter.class); OtlpGrpcMetricExporterBuilder otlpMetricExporterBuilder = OtlpGrpcMetricExporter.builder(); - OtlpGrpcMetricExporterBuilder spyOtlpGrpcMetricExporterBuilder = - Mockito.spy(otlpMetricExporterBuilder); + OtlpGrpcMetricExporterBuilder spyOtlpGrpcMetricExporterBuilder = spy(otlpMetricExporterBuilder); List exportedMetrics = new ArrayList<>(); configureGrpcMockMetricExporter( mockOtlpGrpcMetricExporter, spyOtlpGrpcMetricExporterBuilder, exportedMetrics); // begin assertions try (MockedStatic googleCredentialsMockedStatic = - Mockito.mockStatic(GoogleCredentials.class)) { + mockStatic(GoogleCredentials.class)) { googleCredentialsMockedStatic .when(GoogleCredentials::getApplicationDefault) .thenReturn(mockedGoogleCredentials); @@ -334,15 +340,14 @@ public void testMetricCustomizerOtlpGrpc() { CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS); assertTrue(joinResult.isSuccess()); - Mockito.verify(mockOtlpGrpcMetricExporter, Mockito.times(1)).toBuilder(); - Mockito.verify(spyOtlpGrpcMetricExporterBuilder, Mockito.times(1)) + verify(mockOtlpGrpcMetricExporter, times(1)).toBuilder(); + verify(spyOtlpGrpcMetricExporterBuilder, times(1)) .setHeaders(metricHeaderSupplierCaptor.capture()); assertEquals(2, metricHeaderSupplierCaptor.getValue().get().size()); assertThat(authHeadersQuotaProjectIsPresent(metricHeaderSupplierCaptor.getValue().get())) .isTrue(); - Mockito.verify(mockOtlpGrpcMetricExporter, Mockito.atLeast(1)) - .export(Mockito.anyCollection()); + verify(mockOtlpGrpcMetricExporter, atLeast(1)).export(anyCollection()); assertThat(exportedMetrics) .hasSizeGreaterThan(0) @@ -368,9 +373,9 @@ public void testMetricCustomizerOtlpGrpc() { public void testCustomizerFailWithMissingResourceProject() { System.setProperty( ConfigurableOption.GOOGLE_OTEL_AUTH_TARGET_SIGNALS.getSystemProperty(), SIGNAL_TYPE_ALL); - OtlpGrpcSpanExporter mockOtlpGrpcSpanExporter = Mockito.mock(OtlpGrpcSpanExporter.class); + OtlpGrpcSpanExporter mockOtlpGrpcSpanExporter = mock(OtlpGrpcSpanExporter.class); try (MockedStatic googleCredentialsMockedStatic = - Mockito.mockStatic(GoogleCredentials.class)) { + mockStatic(GoogleCredentials.class)) { googleCredentialsMockedStatic .when(GoogleCredentials::getApplicationDefault) .thenReturn(mockedGoogleCredentials); @@ -407,7 +412,7 @@ public void testQuotaProjectBehavior(QuotaProjectIdTestBehavior testCase) throws "Authorization", singletonList("Bearer " + fakeAccessToken.getTokenValue())); } // mock credentials to return the prepared request metadata - Mockito.when(mockedGoogleCredentials.getRequestMetadata()).thenReturn(mockedRequestMetadata); + when(mockedGoogleCredentials.getRequestMetadata()).thenReturn(mockedRequestMetadata); // configure environment according to test case String quotaProjectId = testCase.getUserSpecifiedQuotaProjectId(); // maybe empty string @@ -418,15 +423,15 @@ public void testQuotaProjectBehavior(QuotaProjectIdTestBehavior testCase) throws } // prepare mock exporter - OtlpGrpcSpanExporter mockOtlpGrpcSpanExporter = Mockito.mock(OtlpGrpcSpanExporter.class); + OtlpGrpcSpanExporter mockOtlpGrpcSpanExporter = mock(OtlpGrpcSpanExporter.class); OtlpGrpcSpanExporterBuilder spyOtlpGrpcSpanExporterBuilder = - Mockito.spy(OtlpGrpcSpanExporter.builder()); + spy(OtlpGrpcSpanExporter.builder()); List exportedSpans = new ArrayList<>(); configureGrpcMockSpanExporter( mockOtlpGrpcSpanExporter, spyOtlpGrpcSpanExporterBuilder, exportedSpans); try (MockedStatic googleCredentialsMockedStatic = - Mockito.mockStatic(GoogleCredentials.class)) { + mockStatic(GoogleCredentials.class)) { googleCredentialsMockedStatic .when(GoogleCredentials::getApplicationDefault) .thenReturn(mockedGoogleCredentials); @@ -437,7 +442,7 @@ public void testQuotaProjectBehavior(QuotaProjectIdTestBehavior testCase) throws CompletableResultCode code = sdk.shutdown(); CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS); assertTrue(joinResult.isSuccess()); - Mockito.verify(spyOtlpGrpcSpanExporterBuilder, Mockito.times(1)) + verify(spyOtlpGrpcSpanExporterBuilder, times(1)) .setHeaders(traceHeaderSupplierCaptor.capture()); // assert that the Authorization bearer token header is present @@ -466,9 +471,9 @@ public void testTargetSignalsBehavior(TargetSignalBehavior testCase) { prepareMockBehaviorForGoogleCredentials(); // Prepare mocked span exporter - OtlpGrpcSpanExporter mockOtlpGrpcSpanExporter = Mockito.mock(OtlpGrpcSpanExporter.class); + OtlpGrpcSpanExporter mockOtlpGrpcSpanExporter = mock(OtlpGrpcSpanExporter.class); OtlpGrpcSpanExporterBuilder spyOtlpGrpcSpanExporterBuilder = - Mockito.spy(OtlpGrpcSpanExporter.builder()); + spy(OtlpGrpcSpanExporter.builder()); List exportedSpans = new ArrayList<>(); configureGrpcMockSpanExporter( mockOtlpGrpcSpanExporter, spyOtlpGrpcSpanExporterBuilder, exportedSpans); @@ -476,10 +481,9 @@ public void testTargetSignalsBehavior(TargetSignalBehavior testCase) { mockOtlpGrpcSpanExporter, spyOtlpGrpcSpanExporterBuilder, exportedSpans); // Prepare mocked metrics exporter - OtlpGrpcMetricExporter mockOtlpGrpcMetricExporter = Mockito.mock(OtlpGrpcMetricExporter.class); + OtlpGrpcMetricExporter mockOtlpGrpcMetricExporter = mock(OtlpGrpcMetricExporter.class); OtlpGrpcMetricExporterBuilder otlpMetricExporterBuilder = OtlpGrpcMetricExporter.builder(); - OtlpGrpcMetricExporterBuilder spyOtlpGrpcMetricExporterBuilder = - Mockito.spy(otlpMetricExporterBuilder); + OtlpGrpcMetricExporterBuilder spyOtlpGrpcMetricExporterBuilder = spy(otlpMetricExporterBuilder); List exportedMetrics = new ArrayList<>(); configureGrpcMockMetricExporter( mockOtlpGrpcMetricExporter, spyOtlpGrpcMetricExporterBuilder, exportedMetrics); @@ -491,7 +495,7 @@ public void testTargetSignalsBehavior(TargetSignalBehavior testCase) { // Build Autoconfigured OpenTelemetry SDK using the mocks and send signals try (MockedStatic googleCredentialsMockedStatic = - Mockito.mockStatic(GoogleCredentials.class)) { + mockStatic(GoogleCredentials.class)) { googleCredentialsMockedStatic .when(GoogleCredentials::getApplicationDefault) .thenReturn(mockedGoogleCredentials); @@ -510,7 +514,7 @@ public void testTargetSignalsBehavior(TargetSignalBehavior testCase) { // Check Traces modification conditions if (testCase.getExpectedIsTraceSignalModified()) { // If traces signal is expected to be modified, auth headers must be present - Mockito.verify(spyOtlpGrpcSpanExporterBuilder, Mockito.times(1)) + verify(spyOtlpGrpcSpanExporterBuilder, times(1)) .setHeaders(traceHeaderSupplierCaptor.capture()); assertEquals(2, traceHeaderSupplierCaptor.getValue().get().size()); assertThat(authHeadersQuotaProjectIsPresent(traceHeaderSupplierCaptor.getValue().get())) @@ -518,13 +522,13 @@ public void testTargetSignalsBehavior(TargetSignalBehavior testCase) { } else { // If traces signals is not expected to be modified then no interaction with the builder // should be made - Mockito.verifyNoInteractions(spyOtlpGrpcSpanExporterBuilder); + verifyNoInteractions(spyOtlpGrpcSpanExporterBuilder); } // Check Metric modification conditions if (testCase.getExpectedIsMetricsSignalModified()) { // If metrics signal is expected to be modified, auth headers must be present - Mockito.verify(spyOtlpGrpcMetricExporterBuilder, Mockito.times(1)) + verify(spyOtlpGrpcMetricExporterBuilder, times(1)) .setHeaders(metricHeaderSupplierCaptor.capture()); assertEquals(2, metricHeaderSupplierCaptor.getValue().get().size()); assertThat(authHeadersQuotaProjectIsPresent(metricHeaderSupplierCaptor.getValue().get())) @@ -532,7 +536,7 @@ public void testTargetSignalsBehavior(TargetSignalBehavior testCase) { } else { // If metrics signals is not expected to be modified then no interaction with the builder // should be made - Mockito.verifyNoInteractions(spyOtlpGrpcMetricExporterBuilder); + verifyNoInteractions(spyOtlpGrpcMetricExporterBuilder); } } } @@ -742,13 +746,11 @@ private static void configureGrpcMockSpanExporter( OtlpGrpcSpanExporter mockGrpcExporter, OtlpGrpcSpanExporterBuilder spyGrpcExporterBuilder, List exportedSpanContainer) { - Mockito.lenient().when(spyGrpcExporterBuilder.build()).thenReturn(mockGrpcExporter); - Mockito.lenient() - .when(mockGrpcExporter.shutdown()) - .thenReturn(CompletableResultCode.ofSuccess()); - Mockito.lenient().when(mockGrpcExporter.toBuilder()).thenReturn(spyGrpcExporterBuilder); - Mockito.lenient() - .when(mockGrpcExporter.export(Mockito.anyCollection())) + lenient().when(spyGrpcExporterBuilder.build()).thenReturn(mockGrpcExporter); + lenient().when(mockGrpcExporter.shutdown()).thenReturn(CompletableResultCode.ofSuccess()); + lenient().when(mockGrpcExporter.toBuilder()).thenReturn(spyGrpcExporterBuilder); + lenient() + .when(mockGrpcExporter.export(anyCollection())) .thenAnswer( invocationOnMock -> { exportedSpanContainer.addAll(invocationOnMock.getArgument(0)); @@ -761,12 +763,10 @@ private static void configureHttpMockMetricExporter( OtlpHttpMetricExporter mockOtlpHttpMetricExporter, OtlpHttpMetricExporterBuilder spyOtlpHttpMetricExporterBuilder, List exportedMetricContainer) { - Mockito.when(spyOtlpHttpMetricExporterBuilder.build()).thenReturn(mockOtlpHttpMetricExporter); - Mockito.when(mockOtlpHttpMetricExporter.shutdown()) - .thenReturn(CompletableResultCode.ofSuccess()); - Mockito.when(mockOtlpHttpMetricExporter.toBuilder()) - .thenReturn(spyOtlpHttpMetricExporterBuilder); - Mockito.when(mockOtlpHttpMetricExporter.export(Mockito.anyCollection())) + when(spyOtlpHttpMetricExporterBuilder.build()).thenReturn(mockOtlpHttpMetricExporter); + when(mockOtlpHttpMetricExporter.shutdown()).thenReturn(CompletableResultCode.ofSuccess()); + when(mockOtlpHttpMetricExporter.toBuilder()).thenReturn(spyOtlpHttpMetricExporterBuilder); + when(mockOtlpHttpMetricExporter.export(anyCollection())) .thenAnswer( invocationOnMock -> { exportedMetricContainer.addAll(invocationOnMock.getArgument(0)); @@ -774,14 +774,14 @@ private static void configureHttpMockMetricExporter( }); // mock the get default aggregation and aggregation temporality - they're required for valid // metric collection. - Mockito.when(mockOtlpHttpMetricExporter.getDefaultAggregation(Mockito.any())) + when(mockOtlpHttpMetricExporter.getDefaultAggregation(any())) .thenAnswer( (Answer) invocationOnMock -> { InstrumentType instrumentType = invocationOnMock.getArgument(0); return OtlpHttpMetricExporter.getDefault().getDefaultAggregation(instrumentType); }); - Mockito.when(mockOtlpHttpMetricExporter.getAggregationTemporality(Mockito.any())) + when(mockOtlpHttpMetricExporter.getAggregationTemporality(any())) .thenAnswer( (Answer) invocationOnMock -> { @@ -798,17 +798,15 @@ private static void configureGrpcMockMetricExporter( OtlpGrpcMetricExporter mockOtlpGrpcMetricExporter, OtlpGrpcMetricExporterBuilder spyOtlpGrpcMetricExporterBuilder, List exportedMetricContainer) { - Mockito.lenient() - .when(spyOtlpGrpcMetricExporterBuilder.build()) - .thenReturn(mockOtlpGrpcMetricExporter); - Mockito.lenient() + lenient().when(spyOtlpGrpcMetricExporterBuilder.build()).thenReturn(mockOtlpGrpcMetricExporter); + lenient() .when(mockOtlpGrpcMetricExporter.shutdown()) .thenReturn(CompletableResultCode.ofSuccess()); - Mockito.lenient() + lenient() .when(mockOtlpGrpcMetricExporter.toBuilder()) .thenReturn(spyOtlpGrpcMetricExporterBuilder); - Mockito.lenient() - .when(mockOtlpGrpcMetricExporter.export(Mockito.anyCollection())) + lenient() + .when(mockOtlpGrpcMetricExporter.export(anyCollection())) .thenAnswer( invocationOnMock -> { exportedMetricContainer.addAll(invocationOnMock.getArgument(0)); @@ -816,16 +814,16 @@ private static void configureGrpcMockMetricExporter( }); // mock the get default aggregation and aggregation temporality - they're required for valid // metric collection. - Mockito.lenient() - .when(mockOtlpGrpcMetricExporter.getDefaultAggregation(Mockito.any())) + lenient() + .when(mockOtlpGrpcMetricExporter.getDefaultAggregation(any())) .thenAnswer( (Answer) invocationOnMock -> { InstrumentType instrumentType = invocationOnMock.getArgument(0); return OtlpGrpcMetricExporter.getDefault().getDefaultAggregation(instrumentType); }); - Mockito.lenient() - .when(mockOtlpGrpcMetricExporter.getAggregationTemporality(Mockito.any())) + lenient() + .when(mockOtlpGrpcMetricExporter.getAggregationTemporality(any())) .thenAnswer( (Answer) invocationOnMock -> { @@ -833,7 +831,7 @@ private static void configureGrpcMockMetricExporter( return OtlpGrpcMetricExporter.getDefault() .getAggregationTemporality(instrumentType); }); - Mockito.lenient() + lenient() .when(mockOtlpGrpcMetricExporter.getMemoryMode()) .thenReturn(MemoryMode.IMMUTABLE_DATA); } @@ -914,7 +912,7 @@ abstract static class Builder { private void prepareMockBehaviorForGoogleCredentials() { AccessToken fakeAccessToken = new AccessToken("fake", Date.from(Instant.now())); try { - Mockito.lenient() + lenient() .when(mockedGoogleCredentials.getRequestMetadata()) .thenReturn( ImmutableMap.of( diff --git a/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.java b/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.java index e04baed93..543dfb6d6 100644 --- a/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.java +++ b/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.java @@ -51,7 +51,7 @@ @SpringBootTest( classes = {Application.class}, webEnvironment = WebEnvironment.RANDOM_PORT) -public class GcpAuthExtensionEndToEndTest { +class GcpAuthExtensionEndToEndTest { @LocalServerPort private int testApplicationPort; // port at which the spring app is running diff --git a/ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/QueueCollectionBuddyTest.java b/ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/QueueCollectionBuddyTest.java index bd0c1ef97..5d18d73da 100644 --- a/ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/QueueCollectionBuddyTest.java +++ b/ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/QueueCollectionBuddyTest.java @@ -33,7 +33,7 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -public class QueueCollectionBuddyTest { +class QueueCollectionBuddyTest { @RegisterExtension static final OpenTelemetryExtension otelTesting = OpenTelemetryExtension.create(); diff --git a/ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/TopicMetricsCollectorTest.java b/ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/TopicMetricsCollectorTest.java index 865501573..646d4ee98 100644 --- a/ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/TopicMetricsCollectorTest.java +++ b/ibm-mq-metrics/src/test/java/io/opentelemetry/ibm/mq/metricscollector/TopicMetricsCollectorTest.java @@ -34,7 +34,7 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -public class TopicMetricsCollectorTest { +class TopicMetricsCollectorTest { @RegisterExtension static final OpenTelemetryExtension otelTesting = OpenTelemetryExtension.create(); diff --git a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfigTest.java b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfigTest.java index 76a6333ba..478aaedb3 100644 --- a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfigTest.java +++ b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfigTest.java @@ -35,7 +35,7 @@ import org.junit.jupiter.api.io.TempDir; @DisabledOnOs(WINDOWS) // Uses async-profiler, which is not supported on Windows -public class InferredSpansAutoConfigTest { +class InferredSpansAutoConfigTest { @BeforeEach @AfterEach diff --git a/micrometer-meter-provider/src/integrationTest/java/io/opentelemetry/contrib/metrics/micrometer/PrometheusIntegrationTest.java b/micrometer-meter-provider/src/integrationTest/java/io/opentelemetry/contrib/metrics/micrometer/PrometheusIntegrationTest.java index 12be80e01..29b8391ff 100644 --- a/micrometer-meter-provider/src/integrationTest/java/io/opentelemetry/contrib/metrics/micrometer/PrometheusIntegrationTest.java +++ b/micrometer-meter-provider/src/integrationTest/java/io/opentelemetry/contrib/metrics/micrometer/PrometheusIntegrationTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.metrics.micrometer; +import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import io.micrometer.prometheusmetrics.PrometheusConfig; @@ -42,13 +43,12 @@ import io.opentelemetry.api.metrics.ObservableLongGauge; import io.opentelemetry.api.metrics.ObservableLongUpDownCounter; import java.util.Arrays; -import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class PrometheusIntegrationTest { +class PrometheusIntegrationTest { private static final AttributeKey KEY1 = AttributeKey.stringKey("key1"); private static final AttributeKey KEY2 = AttributeKey.stringKey("key2"); private static final String VALUE1 = "value1"; @@ -103,7 +103,7 @@ void longCounterWithAttributesAdvice() { LongCounterBuilder builder = meter.counterBuilder("longCounter").setDescription("LongCounter test").setUnit("units"); - ((ExtendedLongCounterBuilder) builder).setAttributesAdvice(Collections.singletonList(KEY1)); + ((ExtendedLongCounterBuilder) builder).setAttributesAdvice(singletonList(KEY1)); LongCounter longCounter = builder.build(); @@ -151,7 +151,7 @@ void observableLongCounterWithAttributesAdvice() { LongCounterBuilder builder = meter.counterBuilder("longCounter").setDescription("LongCounter test").setUnit("units"); - ((ExtendedLongCounterBuilder) builder).setAttributesAdvice(Collections.singletonList(KEY1)); + ((ExtendedLongCounterBuilder) builder).setAttributesAdvice(singletonList(KEY1)); try (ObservableLongCounter observableLongCounter = builder.buildWithCallback( @@ -206,7 +206,7 @@ void doubleCounterWithAttributesAdvice() { .setDescription("DoubleCounter test") .setUnit("units"); - ((ExtendedDoubleCounterBuilder) builder).setAttributesAdvice(Collections.singletonList(KEY1)); + ((ExtendedDoubleCounterBuilder) builder).setAttributesAdvice(singletonList(KEY1)); DoubleCounter doubleCounter = builder.build(); @@ -259,7 +259,7 @@ void observableDoubleCounterWithAttributesAdvice() { .setDescription("DoubleCounter test") .setUnit("units"); - ((ExtendedDoubleCounterBuilder) builder).setAttributesAdvice(Collections.singletonList(KEY1)); + ((ExtendedDoubleCounterBuilder) builder).setAttributesAdvice(singletonList(KEY1)); try (ObservableDoubleCounter observableDoubleCounter = builder.buildWithCallback( @@ -323,8 +323,7 @@ void longUpDownCounterWithAttributesAdvice() { .setDescription("LongUpDownCounter test") .setUnit("units"); - ((ExtendedLongUpDownCounterBuilder) builder) - .setAttributesAdvice(Collections.singletonList(KEY1)); + ((ExtendedLongUpDownCounterBuilder) builder).setAttributesAdvice(singletonList(KEY1)); LongUpDownCounter longUpDownCounter = builder.build(); @@ -385,8 +384,7 @@ void observableLongUpDownCounterWithAttributesAdvice() { .setDescription("LongUpDownCounter test") .setUnit("units"); - ((ExtendedLongUpDownCounterBuilder) builder) - .setAttributesAdvice(Collections.singletonList(KEY1)); + ((ExtendedLongUpDownCounterBuilder) builder).setAttributesAdvice(singletonList(KEY1)); try (ObservableLongUpDownCounter observableLongUpDownCounter = builder.buildWithCallback( @@ -450,8 +448,7 @@ void doubleUpDownCounterWithAttributesAdvice() { .setDescription("DoubleUpDownCounter test") .setUnit("units"); - ((ExtendedDoubleUpDownCounterBuilder) builder) - .setAttributesAdvice(Collections.singletonList(KEY1)); + ((ExtendedDoubleUpDownCounterBuilder) builder).setAttributesAdvice(singletonList(KEY1)); DoubleUpDownCounter doubleUpDownCounter = builder.build(); @@ -504,8 +501,7 @@ void observableDoubleUpDownCounterWithAttributesAdvice() { .setDescription("DoubleUpDownCounter test") .setUnit("units"); - ((ExtendedDoubleUpDownCounterBuilder) builder) - .setAttributesAdvice(Collections.singletonList(KEY1)); + ((ExtendedDoubleUpDownCounterBuilder) builder).setAttributesAdvice(singletonList(KEY1)); try (ObservableDoubleUpDownCounter observableDoubleUpDownCounter = builder.buildWithCallback( @@ -578,7 +574,7 @@ void doubleHistogramWithAttributesAdvice() { .setDescription("DoubleHistogram test") .setUnit("units"); - ((ExtendedDoubleHistogramBuilder) builder).setAttributesAdvice(Collections.singletonList(KEY1)); + ((ExtendedDoubleHistogramBuilder) builder).setAttributesAdvice(singletonList(KEY1)); DoubleHistogram doubleHistogram = builder.build(); @@ -722,7 +718,7 @@ void longHistogramWithAttributesAdvice() { .setDescription("LongHistogram test") .setUnit("units"); - ((ExtendedLongHistogramBuilder) builder).setAttributesAdvice(Collections.singletonList(KEY1)); + ((ExtendedLongHistogramBuilder) builder).setAttributesAdvice(singletonList(KEY1)); LongHistogram longHistogram = builder.build(); @@ -843,7 +839,7 @@ void observableDoubleGaugeWithAttributesAdvice() { DoubleGaugeBuilder builder = meter.gaugeBuilder("doubleGauge").setDescription("DoubleGauge test").setUnit("units"); - ((ExtendedDoubleGaugeBuilder) builder).setAttributesAdvice(Collections.singletonList(KEY1)); + ((ExtendedDoubleGaugeBuilder) builder).setAttributesAdvice(singletonList(KEY1)); try (ObservableDoubleGauge observableDoubleGauge = builder.buildWithCallback( @@ -893,7 +889,7 @@ void observableLongGaugeWithAttributesAdvice() { LongGaugeBuilder builder = meter.gaugeBuilder("longGauge").ofLongs().setDescription("LongGauge test").setUnit("units"); - ((ExtendedLongGaugeBuilder) builder).setAttributesAdvice(Collections.singletonList(KEY1)); + ((ExtendedLongGaugeBuilder) builder).setAttributesAdvice(singletonList(KEY1)); try (ObservableLongGauge observableLongGauge = builder.buildWithCallback( diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleCounterTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleCounterTest.java index fd7585605..5b755da5f 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleCounterTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleCounterTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class MicrometerDoubleCounterTest { +class MicrometerDoubleCounterTest { SimpleMeterRegistry meterRegistry; diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongCounterTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongCounterTest.java index 803cc0952..34423fb14 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongCounterTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongCounterTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class MicrometerLongCounterTest { +class MicrometerLongCounterTest { SimpleMeterRegistry meterRegistry; diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongUpDownCounterTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongUpDownCounterTest.java index e4bce0d99..bc73dcb5d 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongUpDownCounterTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongUpDownCounterTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class MicrometerLongUpDownCounterTest { +class MicrometerLongUpDownCounterTest { SimpleMeterRegistry meterRegistry; diff --git a/processors/src/test/java/io/opentelemetry/contrib/filter/FilteringLogRecordProcessorTest.java b/processors/src/test/java/io/opentelemetry/contrib/filter/FilteringLogRecordProcessorTest.java index 874895340..debaa21a1 100644 --- a/processors/src/test/java/io/opentelemetry/contrib/filter/FilteringLogRecordProcessorTest.java +++ b/processors/src/test/java/io/opentelemetry/contrib/filter/FilteringLogRecordProcessorTest.java @@ -31,7 +31,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class FilteringLogRecordProcessorTest { +class FilteringLogRecordProcessorTest { private final InMemoryLogRecordExporter memoryLogRecordExporter = InMemoryLogRecordExporter.create(); From 2ac82886bc27afc191b2bec31636efaecb40fbb2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 28 Aug 2025 23:57:25 +0000 Subject: [PATCH 06/12] Add more static imports and fix additional test class visibility Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .../contrib/aws/resource/EksResourceTest.java | 2 +- .../ConsistentFixedThresholdSamplerTest.java | 2 +- .../metrics/micrometer/PrometheusIntegrationTest.java | 6 +++--- .../metrics/micrometer/MicrometerMeterProvider.java | 9 +++++---- .../metrics/micrometer/TestCallbackRegistrar.java | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EksResourceTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EksResourceTest.java index 7eaec5e55..31b05be57 100644 --- a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EksResourceTest.java +++ b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EksResourceTest.java @@ -34,7 +34,7 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -public class EksResourceTest { +class EksResourceTest { @Mock private DockerHelper mockDockerHelper; diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentFixedThresholdSamplerTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentFixedThresholdSamplerTest.java index 7eac3ffb1..57d0e3ced 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentFixedThresholdSamplerTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentFixedThresholdSamplerTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class ConsistentFixedThresholdSamplerTest { +class ConsistentFixedThresholdSamplerTest { private Context parentContext; private String name; diff --git a/micrometer-meter-provider/src/integrationTest/java/io/opentelemetry/contrib/metrics/micrometer/PrometheusIntegrationTest.java b/micrometer-meter-provider/src/integrationTest/java/io/opentelemetry/contrib/metrics/micrometer/PrometheusIntegrationTest.java index 29b8391ff..62612d497 100644 --- a/micrometer-meter-provider/src/integrationTest/java/io/opentelemetry/contrib/metrics/micrometer/PrometheusIntegrationTest.java +++ b/micrometer-meter-provider/src/integrationTest/java/io/opentelemetry/contrib/metrics/micrometer/PrometheusIntegrationTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.metrics.micrometer; +import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; @@ -42,7 +43,6 @@ import io.opentelemetry.api.metrics.ObservableLongCounter; import io.opentelemetry.api.metrics.ObservableLongGauge; import io.opentelemetry.api.metrics.ObservableLongUpDownCounter; -import java.util.Arrays; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import org.junit.jupiter.api.BeforeEach; @@ -602,7 +602,7 @@ void doubleHistogramWithExplicitBucketBoundaries() { DoubleHistogram doubleHistogram = meter .histogramBuilder("doubleHistogram") - .setExplicitBucketBoundariesAdvice(Arrays.asList(1.0, 2.0, 3.0)) + .setExplicitBucketBoundariesAdvice(asList(1.0, 2.0, 3.0)) .setDescription("DoubleHistogram test") .setUnit("units") .build(); @@ -747,7 +747,7 @@ void longHistogramWithExplicitBucketBoundaries() { meter .histogramBuilder("longHistogram") .ofLongs() - .setExplicitBucketBoundariesAdvice(Arrays.asList(1L, 2L, 3L)) + .setExplicitBucketBoundariesAdvice(asList(1L, 2L, 3L)) .setDescription("LongHistogram test") .setUnit("units") .build(); diff --git a/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeterProvider.java b/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeterProvider.java index d76e19a34..2817754e2 100644 --- a/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeterProvider.java +++ b/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeterProvider.java @@ -5,12 +5,13 @@ package io.opentelemetry.contrib.metrics.micrometer; +import static java.util.Objects.requireNonNull; + import io.micrometer.core.instrument.MeterRegistry; import io.opentelemetry.api.metrics.MeterBuilder; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.contrib.metrics.micrometer.internal.MemoizingSupplier; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterProviderSharedState; -import java.util.Objects; import java.util.function.Supplier; /** @@ -44,13 +45,13 @@ public void close() { /** {@inheritDoc} */ @Override public MeterBuilder meterBuilder(String instrumentationScopeName) { - Objects.requireNonNull(instrumentationScopeName, "instrumentationScopeName"); + requireNonNull(instrumentationScopeName, "instrumentationScopeName"); return new MicrometerMeterBuilder(meterProviderSharedState, instrumentationScopeName); } /** Returns a new builder instance for this provider with the specified {@link MeterRegistry}. */ public static MicrometerMeterProviderBuilder builder(MeterRegistry meterRegistry) { - Objects.requireNonNull(meterRegistry, "meterRegistry"); + requireNonNull(meterRegistry, "meterRegistry"); return new MicrometerMeterProviderBuilder(() -> meterRegistry); } @@ -62,7 +63,7 @@ public static MicrometerMeterProviderBuilder builder(MeterRegistry meterRegistry */ public static MicrometerMeterProviderBuilder builder( Supplier meterRegistrySupplier) { - Objects.requireNonNull(meterRegistrySupplier, "meterRegistrySupplier"); + requireNonNull(meterRegistrySupplier, "meterRegistrySupplier"); return new MicrometerMeterProviderBuilder(new MemoizingSupplier<>(meterRegistrySupplier)); } } diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/TestCallbackRegistrar.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/TestCallbackRegistrar.java index 2be705618..57fab9ac6 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/TestCallbackRegistrar.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/TestCallbackRegistrar.java @@ -7,7 +7,7 @@ import java.util.List; -public class TestCallbackRegistrar implements CallbackRegistrar, Runnable { +class TestCallbackRegistrar implements CallbackRegistrar, Runnable { private final List callbacks; From b53e28f541d2d9f5599c17a24ce2f1bae52e15c1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 Aug 2025 01:27:17 +0000 Subject: [PATCH 07/12] Continue style guide improvements: fix more test class visibility and add static imports Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .../AwsXrayCompositePropagatorTest.java | 2 +- .../contrib/awsxray/ResourceHolderTest.java | 2 +- .../processor/BaggageSpanProcessorTest.java | 16 +++++++++------- .../ConsistentProbabilityBasedSamplerTest.java | 6 +++--- .../ConsistentAlwaysOffSamplerTest.java | 2 +- .../ConsistentAlwaysOnSamplerTest.java | 2 +- .../consistent56/ConsistentSamplingUtilTest.java | 2 +- .../sampler/consistent56/OtelTraceStateTest.java | 2 +- .../consistent56/RandomValueGeneratorsTest.java | 2 +- .../internal/SamplingProfilerQueueTest.java | 2 +- .../ScheduledCallbackRegistrarBuilder.java | 7 ++++--- 11 files changed, 24 insertions(+), 21 deletions(-) diff --git a/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayCompositePropagatorTest.java b/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayCompositePropagatorTest.java index 53e806fdc..99998d974 100644 --- a/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayCompositePropagatorTest.java +++ b/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayCompositePropagatorTest.java @@ -15,7 +15,7 @@ import java.util.LinkedHashMap; import org.junit.jupiter.api.Test; -public class AwsXrayCompositePropagatorTest extends AwsXrayPropagatorTest { +class AwsXrayCompositePropagatorTest extends AwsXrayPropagatorTest { @Override TextMapPropagator propagator() { diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/ResourceHolderTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/ResourceHolderTest.java index 1140abc5f..e139db578 100644 --- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/ResourceHolderTest.java +++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/ResourceHolderTest.java @@ -21,7 +21,7 @@ * Unit tests for {@link ResourceHolder}. Note that there isn't a great way to test the "default" * fallback logic, as when the test suite is run, the customize logic appears to be invoked. */ -public class ResourceHolderTest { +class ResourceHolderTest { @Test @SuppressWarnings("unchecked") diff --git a/baggage-processor/src/test/java/io/opentelemetry/contrib/baggage/processor/BaggageSpanProcessorTest.java b/baggage-processor/src/test/java/io/opentelemetry/contrib/baggage/processor/BaggageSpanProcessorTest.java index ca1180dcc..133d0b0a6 100644 --- a/baggage-processor/src/test/java/io/opentelemetry/contrib/baggage/processor/BaggageSpanProcessorTest.java +++ b/baggage-processor/src/test/java/io/opentelemetry/contrib/baggage/processor/BaggageSpanProcessorTest.java @@ -5,6 +5,9 @@ package io.opentelemetry.contrib.baggage.processor; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; + import io.opentelemetry.api.baggage.Baggage; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; @@ -13,18 +16,17 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -public class BaggageSpanProcessorTest { +class BaggageSpanProcessorTest { @Test public void test_baggageSpanProcessor_adds_attributes_to_spans(@Mock ReadWriteSpan span) { try (BaggageSpanProcessor processor = BaggageSpanProcessor.allowAllBaggageKeys()) { try (Scope ignore = Baggage.current().toBuilder().put("key", "value").build().makeCurrent()) { processor.onStart(Context.current(), span); - Mockito.verify(span).setAttribute("key", "value"); + verify(span).setAttribute("key", "value"); } } } @@ -40,8 +42,8 @@ public void test_baggageSpanProcessor_adds_attributes_to_spans_when_key_filter_m .build() .makeCurrent()) { processor.onStart(Context.current(), span); - Mockito.verify(span).setAttribute("key", "value"); - Mockito.verify(span, Mockito.never()).setAttribute("other", "value"); + verify(span).setAttribute("key", "value"); + verify(span, never()).setAttribute("other", "value"); } } } @@ -59,8 +61,8 @@ public void test_baggageSpanProcessor_adds_attributes_to_spans_when_key_filter_m .build() .makeCurrent()) { processor.onStart(Context.current(), span); - Mockito.verify(span).setAttribute("key", "value"); - Mockito.verify(span, Mockito.never()).setAttribute("other", "value"); + verify(span).setAttribute("key", "value"); + verify(span, never()).setAttribute("other", "value"); } } } diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentProbabilityBasedSamplerTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentProbabilityBasedSamplerTest.java index 4b9d3e425..e35df75f7 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentProbabilityBasedSamplerTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentProbabilityBasedSamplerTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.sampler.consistent; +import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -16,7 +17,6 @@ import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.SamplingDecision; import io.opentelemetry.sdk.trace.samplers.SamplingResult; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,7 +25,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class ConsistentProbabilityBasedSamplerTest { +class ConsistentProbabilityBasedSamplerTest { private Context parentContext; private String traceId; @@ -42,7 +42,7 @@ public void init() { name = "name"; spanKind = SpanKind.SERVER; attributes = Attributes.empty(); - parentLinks = Collections.emptyList(); + parentLinks = emptyList(); } private void test(SplittableRandom rng, double samplingProbability) { diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentAlwaysOffSamplerTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentAlwaysOffSamplerTest.java index 9b5fc050b..d0425aa0b 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentAlwaysOffSamplerTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentAlwaysOffSamplerTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; -public class ConsistentAlwaysOffSamplerTest { +class ConsistentAlwaysOffSamplerTest { @Test void testDescription() { diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentAlwaysOnSamplerTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentAlwaysOnSamplerTest.java index 3a6b8531b..115c39c41 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentAlwaysOnSamplerTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentAlwaysOnSamplerTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; -public class ConsistentAlwaysOnSamplerTest { +class ConsistentAlwaysOnSamplerTest { @Test void testDescription() { diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentSamplingUtilTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentSamplingUtilTest.java index fcf2dcd8d..d612f9e0a 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentSamplingUtilTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentSamplingUtilTest.java @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; -public class ConsistentSamplingUtilTest { +class ConsistentSamplingUtilTest { @Test void testCalculateSamplingProbability() { diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/OtelTraceStateTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/OtelTraceStateTest.java index a131e9b78..2659d92f9 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/OtelTraceStateTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/OtelTraceStateTest.java @@ -11,7 +11,7 @@ import java.util.stream.Stream; import org.junit.jupiter.api.Test; -public class OtelTraceStateTest { +class OtelTraceStateTest { private static String getXString(int len) { return Stream.generate(() -> "X").limit(len).collect(Collectors.joining()); diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/RandomValueGeneratorsTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/RandomValueGeneratorsTest.java index ab7d378b6..d9a34255f 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/RandomValueGeneratorsTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/RandomValueGeneratorsTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; -public class RandomValueGeneratorsTest { +class RandomValueGeneratorsTest { @Test void testRandomRange() { int attempts = 10000; diff --git a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfilerQueueTest.java b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfilerQueueTest.java index 614f75e72..bcf56691b 100644 --- a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfilerQueueTest.java +++ b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfilerQueueTest.java @@ -17,7 +17,7 @@ import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; -public class SamplingProfilerQueueTest { +class SamplingProfilerQueueTest { @Test @DisabledOnOs(OS.WINDOWS) diff --git a/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/ScheduledCallbackRegistrarBuilder.java b/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/ScheduledCallbackRegistrarBuilder.java index de0da54f7..fb7ff0326 100644 --- a/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/ScheduledCallbackRegistrarBuilder.java +++ b/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/ScheduledCallbackRegistrarBuilder.java @@ -5,9 +5,10 @@ package io.opentelemetry.contrib.metrics.micrometer; +import static java.util.Objects.requireNonNull; + import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.time.Duration; -import java.util.Objects; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -27,7 +28,7 @@ public final class ScheduledCallbackRegistrarBuilder { /** Sets the period between successive executions of each registered callback */ @CanIgnoreReturnValue public ScheduledCallbackRegistrarBuilder setPeriod(long period, TimeUnit unit) { - Objects.requireNonNull(unit, "unit"); + requireNonNull(unit, "unit"); this.period = period; this.timeUnit = unit; return this; @@ -36,7 +37,7 @@ public ScheduledCallbackRegistrarBuilder setPeriod(long period, TimeUnit unit) { /** Sets the period between successive executions of each registered callback */ @CanIgnoreReturnValue public ScheduledCallbackRegistrarBuilder setPeriod(Duration period) { - Objects.requireNonNull(period, "period"); + requireNonNull(period, "period"); this.period = period.toMillis(); this.timeUnit = TimeUnit.MILLISECONDS; return this; From 69afe8965fe973177937ef486abad1e5fe676d26 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 Aug 2025 01:33:25 +0000 Subject: [PATCH 08/12] Continue style guide improvements: fix test visibility and add more static imports Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .../contrib/sampler/consistent/OtelTraceStateTest.java | 2 +- .../contrib/sampler/consistent/RandomGeneratorTest.java | 2 +- .../io/opentelemetry/maven/OpenTelemetrySdkServiceTest.java | 2 +- .../test/java/io/opentelemetry/maven/SpanRegistryTest.java | 2 +- .../contrib/metrics/micrometer/TestCallbackRegistrar.java | 2 +- .../internal/instruments/MicrometerDoubleGaugeTest.java | 4 ++-- .../internal/instruments/MicrometerLongGaugeTest.java | 4 ++-- .../opentelemetry/contrib/attach/RunTimeAttachBasicTest.java | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/OtelTraceStateTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/OtelTraceStateTest.java index a6fd85d47..fc1338bc5 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/OtelTraceStateTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/OtelTraceStateTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class OtelTraceStateTest { +class OtelTraceStateTest { private static String getXString(int len) { return Stream.generate(() -> "X").limit(len).collect(Collectors.joining()); diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/RandomGeneratorTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/RandomGeneratorTest.java index f94e7eef4..e2f336727 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/RandomGeneratorTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/RandomGeneratorTest.java @@ -14,7 +14,7 @@ import org.hipparchus.stat.inference.GTest; import org.junit.jupiter.api.Test; -public class RandomGeneratorTest { +class RandomGeneratorTest { private static void testGenerateRandomBitSet(long seed, int numBits, int numOneBits) { diff --git a/maven-extension/src/test/java/io/opentelemetry/maven/OpenTelemetrySdkServiceTest.java b/maven-extension/src/test/java/io/opentelemetry/maven/OpenTelemetrySdkServiceTest.java index e2cc37a28..4ec9582a6 100644 --- a/maven-extension/src/test/java/io/opentelemetry/maven/OpenTelemetrySdkServiceTest.java +++ b/maven-extension/src/test/java/io/opentelemetry/maven/OpenTelemetrySdkServiceTest.java @@ -17,7 +17,7 @@ * Note: if otel-java-contrib bumps to Java 11+, we could use junit-pioneer's * {@code @SetSystemProperty} and {@code @ClearSystemProperty} but no bump is planned for now. */ -public class OpenTelemetrySdkServiceTest { +class OpenTelemetrySdkServiceTest { /** Verify default config */ @Test diff --git a/maven-extension/src/test/java/io/opentelemetry/maven/SpanRegistryTest.java b/maven-extension/src/test/java/io/opentelemetry/maven/SpanRegistryTest.java index 864ce8df8..b9a41864f 100644 --- a/maven-extension/src/test/java/io/opentelemetry/maven/SpanRegistryTest.java +++ b/maven-extension/src/test/java/io/opentelemetry/maven/SpanRegistryTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.trace.Tracer; import org.junit.jupiter.api.Test; -public class SpanRegistryTest { +class SpanRegistryTest { /** MVND reuses the same Maven process and thus the Span Registry is reused. */ @Test diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/TestCallbackRegistrar.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/TestCallbackRegistrar.java index 57fab9ac6..2be705618 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/TestCallbackRegistrar.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/TestCallbackRegistrar.java @@ -7,7 +7,7 @@ import java.util.List; -class TestCallbackRegistrar implements CallbackRegistrar, Runnable { +public class TestCallbackRegistrar implements CallbackRegistrar, Runnable { private final List callbacks; diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleGaugeTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleGaugeTest.java index 393479db7..0b6002e89 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleGaugeTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleGaugeTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.metrics.micrometer.internal.instruments; +import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import io.micrometer.core.instrument.Gauge; @@ -21,7 +22,6 @@ import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterProviderSharedState; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterSharedState; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -134,7 +134,7 @@ void observableWithAttributesAndAttributesAdvice() { ((ExtendedDoubleGaugeBuilder) builder) .setAttributesAdvice( - Arrays.asList( + asList( AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_NAME), AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_VERSION), AttributeKey.stringKey("key"))); diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongGaugeTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongGaugeTest.java index 96b56b1a9..e8c63ecbc 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongGaugeTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongGaugeTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.metrics.micrometer.internal.instruments; +import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import io.micrometer.core.instrument.Gauge; @@ -21,7 +22,6 @@ import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterProviderSharedState; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterSharedState; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicLong; import org.junit.jupiter.api.BeforeEach; @@ -133,7 +133,7 @@ void observableWithAttributesAndAttributesAdvice() { ((ExtendedLongGaugeBuilder) builder) .setAttributesAdvice( - Arrays.asList( + asList( AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_NAME), AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_VERSION), AttributeKey.stringKey("key"))); diff --git a/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/RunTimeAttachBasicTest.java b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/RunTimeAttachBasicTest.java index 5d8f201ae..65eabcf02 100644 --- a/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/RunTimeAttachBasicTest.java +++ b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/RunTimeAttachBasicTest.java @@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.annotations.WithSpan; import org.junit.jupiter.api.Test; -public class RunTimeAttachBasicTest extends AbstractAttachmentTest { +class RunTimeAttachBasicTest extends AbstractAttachmentTest { @Test void shouldAttach() { From 474350c5595e3b523b3185aa9e66ee985f0242e6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 Aug 2025 01:54:08 +0000 Subject: [PATCH 09/12] Continue comprehensive style guide improvements: fix remaining test class visibility and enhance static imports Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .../exporters/SignalStorageExporterTest.java | 9 ++--- .../SpanDataDeserializerTest.java | 6 +-- .../storage/files/ReadableFileTest.java | 4 +- .../gcp/resource/GCPResourceProviderTest.java | 38 +++++++++---------- .../contrib/jmxscraper/JmxConnectionTest.java | 2 +- .../ActiveMqIntegrationTest.java | 2 +- .../CassandraIntegrationTest.java | 2 +- .../target_systems/CustomIntegrationTest.java | 2 +- .../target_systems/HBaseIntegrationTest.java | 2 +- .../target_systems/HadoopIntegrationTest.java | 2 +- .../target_systems/JettyIntegrationTest.java | 2 +- .../target_systems/JvmIntegrationTest.java | 2 +- .../target_systems/SolrIntegrationTest.java | 2 +- .../target_systems/TomcatIntegrationTest.java | 2 +- .../WildflyIntegrationTest.java | 2 +- .../kafka/KafkaConsumerIntegrationTest.java | 2 +- .../kafka/KafkaIntegrationTest.java | 2 +- .../kafka/KafkaProducerIntegrationTest.java | 2 +- ...GoalExecutionHandlerConfigurationTest.java | 2 +- .../handler/MojoGoalExecutionHandlerTest.java | 2 +- .../metrics/micrometer/MicrometerMeter.java | 11 +++--- .../ScheduledCallbackRegistrar.java | 5 ++- .../MicrometerDoubleHistogramTest.java | 6 +-- .../MicrometerDoubleUpDownCounterTest.java | 6 +-- .../JettyServiceNameDetectorTest.java | 2 +- .../attach/AbstractAttachmentTest.java | 2 +- ...gentDisabledByEnvironmentVariableTest.java | 2 +- .../AgentDisabledBySystemPropertyTest.java | 2 +- .../stacktrace/StackTraceAutoConfigTest.java | 2 +- 29 files changed, 64 insertions(+), 63 deletions(-) diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/exporters/SignalStorageExporterTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/exporters/SignalStorageExporterTest.java index 6f7db99ef..4435cfc55 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/exporters/SignalStorageExporterTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/exporters/SignalStorageExporterTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.disk.buffering.exporters; +import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyCollection; import static org.mockito.Mockito.clearInvocations; @@ -22,7 +23,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -54,7 +54,7 @@ void verifyExportToStorage_success() { // Adding more items clearInvocations(callback); - resultCode = storageExporter.exportToStorage(Collections.singletonList(item3)); + resultCode = storageExporter.exportToStorage(singletonList(item3)); assertThat(resultCode.isSuccess()).isTrue(); verify(callback).onExportSuccess(signalType); @@ -81,8 +81,7 @@ void verifyExportToStorage_failure() { when(storage.write(anyCollection())) .thenReturn(CompletableFuture.completedFuture(WriteResult.create(false, null))); - CompletableResultCode resultCode = - storageExporter.exportToStorage(Collections.singletonList(item1)); + CompletableResultCode resultCode = storageExporter.exportToStorage(singletonList(item1)); assertThat(resultCode.isSuccess()).isFalse(); assertThat(resultCode.getFailureThrowable()).isNull(); @@ -95,7 +94,7 @@ void verifyExportToStorage_failure() { when(storage.write(anyCollection())) .thenReturn(CompletableFuture.completedFuture(WriteResult.create(false, exception))); - resultCode = storageExporter.exportToStorage(Collections.singletonList(item1)); + resultCode = storageExporter.exportToStorage(singletonList(item1)); assertThat(resultCode.isSuccess()).isFalse(); assertThat(resultCode.getFailureThrowable()).isEqualTo(exception); diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/deserializers/SpanDataDeserializerTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/deserializers/SpanDataDeserializerTest.java index d710ca16e..0ca31eba9 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/deserializers/SpanDataDeserializerTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/deserializers/SpanDataDeserializerTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers; +import static java.util.Collections.emptyList; import static org.junit.jupiter.api.Assertions.assertThrows; import io.opentelemetry.api.trace.SpanKind; @@ -14,7 +15,6 @@ import io.opentelemetry.contrib.disk.buffering.testutils.TestData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; -import java.util.Collections; import org.junit.jupiter.api.Test; class SpanDataDeserializerTest extends BaseSignalSerializerTest { @@ -33,8 +33,8 @@ class SpanDataDeserializerTest extends BaseSignalSerializerTest { .setTotalRecordedLinks(0) .setTotalRecordedEvents(0) .setTotalAttributeCount(0) - .setEvents(Collections.emptyList()) - .setLinks(Collections.emptyList()) + .setEvents(emptyList()) + .setLinks(emptyList()) .build(); @Test diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/ReadableFileTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/ReadableFileTest.java index a9d0eb5da..f6afa1f82 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/ReadableFileTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/ReadableFileTest.java @@ -7,6 +7,7 @@ import static io.opentelemetry.contrib.disk.buffering.internal.storage.TestData.MAX_FILE_AGE_FOR_READ_MILLIS; import static io.opentelemetry.contrib.disk.buffering.internal.storage.TestData.getConfiguration; +import static java.util.Collections.singleton; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,7 +32,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -109,7 +109,7 @@ private static void addFileContents(File source) throws IOException { try (FileOutputStream out = new FileOutputStream(source)) { for (LogRecordData item : Arrays.asList(FIRST_LOG_RECORD, SECOND_LOG_RECORD, THIRD_LOG_RECORD)) { - SERIALIZER.initialize(Collections.singleton(item)); + SERIALIZER.initialize(singleton(item)); SERIALIZER.writeBinaryTo(out); SERIALIZER.reset(); } diff --git a/gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProviderTest.java b/gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProviderTest.java index b0683994e..c09fc31ae 100644 --- a/gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProviderTest.java +++ b/gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProviderTest.java @@ -53,6 +53,7 @@ import static io.opentelemetry.semconv.incubating.HostIncubatingAttributes.HOST_TYPE; import static io.opentelemetry.semconv.incubating.K8sIncubatingAttributes.K8S_CLUSTER_NAME; import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import com.google.cloud.opentelemetry.detection.DetectedPlatform; @@ -66,11 +67,10 @@ import java.util.Map; import java.util.ServiceLoader; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; class GCPResourceProviderTest { private static final String DUMMY_PROJECT_ID = "google-pid"; - private final ConfigProperties mockConfigProps = Mockito.mock(ConfigProperties.class); + private final ConfigProperties mockConfigProps = mock(ConfigProperties.class); private final Map mockGKECommonAttributes = new HashMap<>( ImmutableMap.of( @@ -88,7 +88,7 @@ private static DetectedPlatform generateMockGcePlatform() { GCE_INSTANCE_NAME, "instance-name", GCE_MACHINE_TYPE, "gce-m2", GCE_INSTANCE_HOSTNAME, "instance-hostname")); - DetectedPlatform mockGCEPlatform = Mockito.mock(DetectedPlatform.class); + DetectedPlatform mockGCEPlatform = mock(DetectedPlatform.class); Mockito.when(mockGCEPlatform.getSupportedPlatform()) .thenReturn(GCPPlatformDetector.SupportedPlatform.GOOGLE_COMPUTE_ENGINE); Mockito.when(mockGCEPlatform.getAttributes()).thenReturn(mockAttributes); @@ -105,7 +105,7 @@ private DetectedPlatform generateMockGkePlatform(String gkeClusterLocationType) } mockAttributes.put(GKE_CLUSTER_LOCATION_TYPE, gkeClusterLocationType); - DetectedPlatform mockGKEPlatform = Mockito.mock(DetectedPlatform.class); + DetectedPlatform mockGKEPlatform = mock(DetectedPlatform.class); Mockito.when(mockGKEPlatform.getSupportedPlatform()) .thenReturn(GCPPlatformDetector.SupportedPlatform.GOOGLE_KUBERNETES_ENGINE); Mockito.when(mockGKEPlatform.getAttributes()).thenReturn(mockAttributes); @@ -130,7 +130,7 @@ private static DetectedPlatform generateMockServerlessPlatform( SERVERLESS_COMPUTE_INSTANCE_ID, "serverless-instance-id", SERVERLESS_COMPUTE_CLOUD_REGION, "us-central1", SERVERLESS_COMPUTE_AVAILABILITY_ZONE, "us-central1-b")); - DetectedPlatform mockServerlessPlatform = Mockito.mock(DetectedPlatform.class); + DetectedPlatform mockServerlessPlatform = mock(DetectedPlatform.class); Mockito.when(mockServerlessPlatform.getSupportedPlatform()).thenReturn(platform); Mockito.when(mockServerlessPlatform.getAttributes()).thenReturn(mockAttributes); Mockito.when(mockServerlessPlatform.getProjectId()).thenReturn(DUMMY_PROJECT_ID); @@ -146,7 +146,7 @@ private static DetectedPlatform generateMockGcrJobPlatform() { SERVERLESS_COMPUTE_CLOUD_REGION, "us-central1", GCR_JOB_TASK_INDEX, "1", GCR_JOB_EXECUTION_KEY, "serverless-job-a1b2c3")); - DetectedPlatform mockServerlessPlatform = Mockito.mock(DetectedPlatform.class); + DetectedPlatform mockServerlessPlatform = mock(DetectedPlatform.class); Mockito.when(mockServerlessPlatform.getSupportedPlatform()) .thenReturn(GCPPlatformDetector.SupportedPlatform.GOOGLE_CLOUD_RUN_JOB); Mockito.when(mockServerlessPlatform.getAttributes()).thenReturn(mockAttributes); @@ -163,7 +163,7 @@ private static DetectedPlatform generateMockGaePlatform() { GAE_INSTANCE_ID, "gae-instance-id", GAE_CLOUD_REGION, "us-central1", GAE_AVAILABILITY_ZONE, "us-central1-b")); - DetectedPlatform mockGAEPlatform = Mockito.mock(DetectedPlatform.class); + DetectedPlatform mockGAEPlatform = mock(DetectedPlatform.class); Mockito.when(mockGAEPlatform.getSupportedPlatform()) .thenReturn(GCPPlatformDetector.SupportedPlatform.GOOGLE_APP_ENGINE); Mockito.when(mockGAEPlatform.getAttributes()).thenReturn(mockAttributes); @@ -178,7 +178,7 @@ private static DetectedPlatform generateMockUnknownPlatform() { GCE_INSTANCE_ID, "instance-id", GCE_CLOUD_REGION, "australia-southeast1")); - DetectedPlatform mockUnknownPlatform = Mockito.mock(DetectedPlatform.class); + DetectedPlatform mockUnknownPlatform = mock(DetectedPlatform.class); Mockito.when(mockUnknownPlatform.getSupportedPlatform()) .thenReturn(GCPPlatformDetector.SupportedPlatform.UNKNOWN_PLATFORM); Mockito.when(mockUnknownPlatform.getAttributes()).thenReturn(mockAttributes); @@ -187,7 +187,7 @@ private static DetectedPlatform generateMockUnknownPlatform() { @Test public void testGceResourceAttributesMapping() { - GCPPlatformDetector mockDetector = Mockito.mock(GCPPlatformDetector.class); + GCPPlatformDetector mockDetector = mock(GCPPlatformDetector.class); DetectedPlatform mockPlatform = generateMockGcePlatform(); Mockito.when(mockDetector.detectPlatform()).thenReturn(mockPlatform); Map detectedAttributes = mockPlatform.getAttributes(); @@ -211,7 +211,7 @@ public void testGceResourceAttributesMapping() { @Test public void testGkeResourceAttributesMapping_LocationTypeRegion() { - GCPPlatformDetector mockDetector = Mockito.mock(GCPPlatformDetector.class); + GCPPlatformDetector mockDetector = mock(GCPPlatformDetector.class); DetectedPlatform mockPlatform = generateMockGkePlatform(GKE_LOCATION_TYPE_REGION); Mockito.when(mockDetector.detectPlatform()).thenReturn(mockPlatform); @@ -228,7 +228,7 @@ public void testGkeResourceAttributesMapping_LocationTypeRegion() { @Test public void testGkeResourceAttributesMapping_LocationTypeZone() { - GCPPlatformDetector mockDetector = Mockito.mock(GCPPlatformDetector.class); + GCPPlatformDetector mockDetector = mock(GCPPlatformDetector.class); DetectedPlatform mockPlatform = generateMockGkePlatform(GKE_LOCATION_TYPE_ZONE); Mockito.when(mockDetector.detectPlatform()).thenReturn(mockPlatform); @@ -250,8 +250,8 @@ public void testGkeResourceAttributesMapping_LocationTypeInvalid() { mockGKEAttributes.put(GKE_CLUSTER_LOCATION_TYPE, "INVALID"); mockGKEAttributes.put(GKE_CLUSTER_LOCATION, "some-location"); - GCPPlatformDetector mockDetector = Mockito.mock(GCPPlatformDetector.class); - DetectedPlatform mockPlatform = Mockito.mock(DetectedPlatform.class); + GCPPlatformDetector mockDetector = mock(GCPPlatformDetector.class); + DetectedPlatform mockPlatform = mock(DetectedPlatform.class); Mockito.when(mockPlatform.getSupportedPlatform()) .thenReturn(GCPPlatformDetector.SupportedPlatform.GOOGLE_KUBERNETES_ENGINE); Mockito.when(mockPlatform.getProjectId()).thenReturn(DUMMY_PROJECT_ID); @@ -271,7 +271,7 @@ public void testGkeResourceAttributesMapping_LocationTypeInvalid() { @Test public void testGkeResourceAttributesMapping_LocationMissing() { - GCPPlatformDetector mockDetector = Mockito.mock(GCPPlatformDetector.class); + GCPPlatformDetector mockDetector = mock(GCPPlatformDetector.class); DetectedPlatform mockPlatform = generateMockGkePlatform(""); Mockito.when(mockDetector.detectPlatform()).thenReturn(mockPlatform); @@ -296,7 +296,7 @@ private static void verifyGkeMapping(Resource gotResource, DetectedPlatform dete @Test public void testGcrServiceResourceAttributesMapping() { - GCPPlatformDetector mockDetector = Mockito.mock(GCPPlatformDetector.class); + GCPPlatformDetector mockDetector = mock(GCPPlatformDetector.class); DetectedPlatform mockPlatform = generateMockServerlessPlatform(GCPPlatformDetector.SupportedPlatform.GOOGLE_CLOUD_RUN); Mockito.when(mockDetector.detectPlatform()).thenReturn(mockPlatform); @@ -313,7 +313,7 @@ public void testGcrServiceResourceAttributesMapping() { @Test public void testGcfResourceAttributeMapping() { - GCPPlatformDetector mockDetector = Mockito.mock(GCPPlatformDetector.class); + GCPPlatformDetector mockDetector = mock(GCPPlatformDetector.class); DetectedPlatform mockPlatform = generateMockServerlessPlatform( GCPPlatformDetector.SupportedPlatform.GOOGLE_CLOUD_FUNCTIONS); @@ -344,7 +344,7 @@ private static void verifyServerlessMapping( @Test public void testGcrJobResourceAttributesMapping() { - GCPPlatformDetector mockDetector = Mockito.mock(GCPPlatformDetector.class); + GCPPlatformDetector mockDetector = mock(GCPPlatformDetector.class); DetectedPlatform mockPlatform = generateMockGcrJobPlatform(); Mockito.when(mockDetector.detectPlatform()).thenReturn(mockPlatform); Map detectedAttributes = mockPlatform.getAttributes(); @@ -369,7 +369,7 @@ public void testGcrJobResourceAttributesMapping() { @Test public void testGaeResourceAttributeMapping() { - GCPPlatformDetector mockDetector = Mockito.mock(GCPPlatformDetector.class); + GCPPlatformDetector mockDetector = mock(GCPPlatformDetector.class); DetectedPlatform mockPlatform = generateMockGaePlatform(); Mockito.when(mockDetector.detectPlatform()).thenReturn(mockPlatform); Map detectedAttributes = mockPlatform.getAttributes(); @@ -391,7 +391,7 @@ public void testGaeResourceAttributeMapping() { @Test public void testUnknownPlatformResourceAttributesMapping() { - GCPPlatformDetector mockDetector = Mockito.mock(GCPPlatformDetector.class); + GCPPlatformDetector mockDetector = mock(GCPPlatformDetector.class); DetectedPlatform mockPlatform = generateMockUnknownPlatform(); Mockito.when(mockDetector.detectPlatform()).thenReturn(mockPlatform); diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java index d1431647b..c984724e3 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java @@ -28,7 +28,7 @@ * JmxConnectionBuilder and relies on containers to minimize the JMX/RMI network complications which * are not NAT-friendly. */ -public class JmxConnectionTest { +class JmxConnectionTest { // OTLP endpoint is not used in test mode, but still has to be provided private static final String DUMMY_OTLP_ENDPOINT = "http://dummy-otlp-endpoint:8080/"; diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/ActiveMqIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/ActiveMqIntegrationTest.java index 4f909fdc5..19d98bf38 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/ActiveMqIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/ActiveMqIntegrationTest.java @@ -15,7 +15,7 @@ import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.images.builder.ImageFromDockerfile; -public class ActiveMqIntegrationTest extends TargetSystemIntegrationTest { +class ActiveMqIntegrationTest extends TargetSystemIntegrationTest { private static final int ACTIVEMQ_PORT = 61616; diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/CassandraIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/CassandraIntegrationTest.java index 90f1fca73..5ff8f2dcc 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/CassandraIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/CassandraIntegrationTest.java @@ -15,7 +15,7 @@ import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; -public class CassandraIntegrationTest extends TargetSystemIntegrationTest { +class CassandraIntegrationTest extends TargetSystemIntegrationTest { private static final int CASSANDRA_PORT = 9042; diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/CustomIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/CustomIntegrationTest.java index dcecc8f5f..d238e8a72 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/CustomIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/CustomIntegrationTest.java @@ -11,7 +11,7 @@ import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; -public class CustomIntegrationTest extends TargetSystemIntegrationTest { +class CustomIntegrationTest extends TargetSystemIntegrationTest { @Override protected GenericContainer createTargetContainer(int jmxPort) { diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/HBaseIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/HBaseIntegrationTest.java index 803137539..4bab7e574 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/HBaseIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/HBaseIntegrationTest.java @@ -15,7 +15,7 @@ import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; -public class HBaseIntegrationTest extends TargetSystemIntegrationTest { +class HBaseIntegrationTest extends TargetSystemIntegrationTest { @Override protected GenericContainer createTargetContainer(int jmxPort) { return new GenericContainer<>("dajobe/hbase") diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/HadoopIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/HadoopIntegrationTest.java index b89225629..bc44ea36c 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/HadoopIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/HadoopIntegrationTest.java @@ -16,7 +16,7 @@ import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.utility.MountableFile; -public class HadoopIntegrationTest extends TargetSystemIntegrationTest { +class HadoopIntegrationTest extends TargetSystemIntegrationTest { private static final int HADOOP_PORT = 50070; diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JettyIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JettyIntegrationTest.java index 86097cbaa..8c91e0c85 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JettyIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JettyIntegrationTest.java @@ -16,7 +16,7 @@ import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.images.builder.ImageFromDockerfile; -public class JettyIntegrationTest extends TargetSystemIntegrationTest { +class JettyIntegrationTest extends TargetSystemIntegrationTest { private static final int JETTY_PORT = 8080; diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java index e29021a93..be8a04a53 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java @@ -15,7 +15,7 @@ import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; -public class JvmIntegrationTest extends TargetSystemIntegrationTest { +class JvmIntegrationTest extends TargetSystemIntegrationTest { @Override protected GenericContainer createTargetContainer(int jmxPort) { diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java index fbec81e2e..9cba55701 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java @@ -18,7 +18,7 @@ import org.testcontainers.containers.Network; import org.testcontainers.containers.wait.strategy.Wait; -public class SolrIntegrationTest extends TargetSystemIntegrationTest { +class SolrIntegrationTest extends TargetSystemIntegrationTest { @Override protected GenericContainer createTargetContainer(int jmxPort) { diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TomcatIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TomcatIntegrationTest.java index bec9453f8..b01f4485f 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TomcatIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TomcatIntegrationTest.java @@ -16,7 +16,7 @@ import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.images.builder.ImageFromDockerfile; -public class TomcatIntegrationTest extends TargetSystemIntegrationTest { +class TomcatIntegrationTest extends TargetSystemIntegrationTest { private static final int TOMCAT_PORT = 8080; diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/WildflyIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/WildflyIntegrationTest.java index 73e546b85..bb2787b0a 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/WildflyIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/WildflyIntegrationTest.java @@ -22,7 +22,7 @@ import org.testcontainers.images.builder.ImageFromDockerfile; import org.testcontainers.utility.MountableFile; -public class WildflyIntegrationTest extends TargetSystemIntegrationTest { +class WildflyIntegrationTest extends TargetSystemIntegrationTest { private static final int WILDFLY_SERVICE_PORT = 8080; private static final int WILDFLY_MANAGEMENT_PORT = 9990; diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaConsumerIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaConsumerIntegrationTest.java index ed61aabbb..9319baf65 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaConsumerIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaConsumerIntegrationTest.java @@ -25,7 +25,7 @@ import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.containers.wait.strategy.Wait; -public class KafkaConsumerIntegrationTest extends TargetSystemIntegrationTest { +class KafkaConsumerIntegrationTest extends TargetSystemIntegrationTest { @Override protected Collection> createPrerequisiteContainers() { diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaIntegrationTest.java index f59040509..17d38d995 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaIntegrationTest.java @@ -21,7 +21,7 @@ import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; -public class KafkaIntegrationTest extends TargetSystemIntegrationTest { +class KafkaIntegrationTest extends TargetSystemIntegrationTest { @Override protected Collection> createPrerequisiteContainers() { GenericContainer zookeeper = diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaProducerIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaProducerIntegrationTest.java index 155cb9fc5..37b141b01 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaProducerIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaProducerIntegrationTest.java @@ -24,7 +24,7 @@ import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.containers.wait.strategy.Wait; -public class KafkaProducerIntegrationTest extends TargetSystemIntegrationTest { +class KafkaProducerIntegrationTest extends TargetSystemIntegrationTest { @Override protected Collection> createPrerequisiteContainers() { diff --git a/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerConfigurationTest.java b/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerConfigurationTest.java index 21748cebb..ae8e4798b 100644 --- a/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerConfigurationTest.java +++ b/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerConfigurationTest.java @@ -12,7 +12,7 @@ import java.util.Map; import org.junit.jupiter.api.Test; -public class MojoGoalExecutionHandlerConfigurationTest { +class MojoGoalExecutionHandlerConfigurationTest { @Test public void mojoGoalExecutionHandlers() { diff --git a/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerTest.java b/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerTest.java index b193ccdb5..770ac9fa1 100644 --- a/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerTest.java +++ b/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerTest.java @@ -47,7 +47,7 @@ * https://github.com/takari/takari-lifecycle/blob/master/takari-lifecycle-plugin/src/test/java/io/takari/maven/plugins/plugin/PluginDescriptorMojoTest.java */ @SuppressWarnings({"DeduplicateConstants", "deprecation"}) -public class MojoGoalExecutionHandlerTest { +class MojoGoalExecutionHandlerTest { @Test public void testMavenDeploy() throws Exception { diff --git a/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeter.java b/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeter.java index e8a6b827c..2a080c8e8 100644 --- a/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeter.java +++ b/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/MicrometerMeter.java @@ -5,6 +5,8 @@ package io.opentelemetry.contrib.metrics.micrometer; +import static java.util.Objects.requireNonNull; + import io.opentelemetry.api.metrics.DoubleGaugeBuilder; import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.api.metrics.LongCounterBuilder; @@ -15,7 +17,6 @@ import io.opentelemetry.contrib.metrics.micrometer.internal.instruments.MicrometerLongCounter; import io.opentelemetry.contrib.metrics.micrometer.internal.instruments.MicrometerLongUpDownCounter; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterSharedState; -import java.util.Objects; final class MicrometerMeter implements Meter { final MeterSharedState meterSharedState; @@ -26,25 +27,25 @@ final class MicrometerMeter implements Meter { @Override public LongCounterBuilder counterBuilder(String name) { - Objects.requireNonNull(name, "name"); + requireNonNull(name, "name"); return MicrometerLongCounter.builder(meterSharedState, name); } @Override public LongUpDownCounterBuilder upDownCounterBuilder(String name) { - Objects.requireNonNull(name, "name"); + requireNonNull(name, "name"); return MicrometerLongUpDownCounter.builder(meterSharedState, name); } @Override public DoubleHistogramBuilder histogramBuilder(String name) { - Objects.requireNonNull(name, "name"); + requireNonNull(name, "name"); return MicrometerDoubleHistogram.builder(meterSharedState, name); } @Override public DoubleGaugeBuilder gaugeBuilder(String name) { - Objects.requireNonNull(name, "name"); + requireNonNull(name, "name"); return MicrometerDoubleGauge.builder(meterSharedState, name); } } diff --git a/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/ScheduledCallbackRegistrar.java b/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/ScheduledCallbackRegistrar.java index d9021a234..e3c34b2bb 100644 --- a/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/ScheduledCallbackRegistrar.java +++ b/micrometer-meter-provider/src/main/java/io/opentelemetry/contrib/metrics/micrometer/ScheduledCallbackRegistrar.java @@ -5,8 +5,9 @@ package io.opentelemetry.contrib.metrics.micrometer; +import static java.util.Objects.requireNonNull; + import java.util.List; -import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; @@ -39,7 +40,7 @@ public final class ScheduledCallbackRegistrar implements CallbackRegistrar { public static ScheduledCallbackRegistrarBuilder builder( ScheduledExecutorService scheduledExecutorService) { - Objects.requireNonNull(scheduledExecutorService, "scheduledExecutorService"); + requireNonNull(scheduledExecutorService, "scheduledExecutorService"); return new ScheduledCallbackRegistrarBuilder(scheduledExecutorService); } diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleHistogramTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleHistogramTest.java index 0b8d944f7..ab66ceadf 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleHistogramTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleHistogramTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.metrics.micrometer.internal.instruments; +import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; @@ -24,7 +25,6 @@ import io.opentelemetry.contrib.metrics.micrometer.internal.Constants; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterProviderSharedState; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterSharedState; -import java.util.Arrays; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -169,7 +169,7 @@ void addWithAttributesAndAttributesAdvice() { ((ExtendedDoubleHistogramBuilder) builder) .setAttributesAdvice( - Arrays.asList( + asList( AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_NAME), AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_VERSION), AttributeKey.stringKey("key"))); @@ -214,7 +214,7 @@ void addWithExplicitBucketBoundaries() { MicrometerDoubleHistogram.builder(meterSharedState, "histogram") .setDescription("description") .setUnit("unit") - .setExplicitBucketBoundariesAdvice(Arrays.asList(10.0, 20.0, 30.0)) + .setExplicitBucketBoundariesAdvice(asList(10.0, 20.0, 30.0)) .build(); underTest.record(5.0); diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleUpDownCounterTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleUpDownCounterTest.java index 536f18d91..21316b172 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleUpDownCounterTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleUpDownCounterTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.metrics.micrometer.internal.instruments; +import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import io.micrometer.core.instrument.Gauge; @@ -23,7 +24,6 @@ import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterProviderSharedState; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterSharedState; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -172,7 +172,7 @@ void addWithAttributesAndAttributesAdvice() { ((ExtendedDoubleUpDownCounterBuilder) builder) .setAttributesAdvice( - Arrays.asList( + asList( AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_NAME), AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_VERSION), AttributeKey.stringKey("key"))); @@ -309,7 +309,7 @@ void observableWithAttributesAndAttributesAdvice() { ((ExtendedDoubleUpDownCounterBuilder) builder) .setAttributesAdvice( - Arrays.asList( + asList( AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_NAME), AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_VERSION), AttributeKey.stringKey("key"))); diff --git a/resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/JettyServiceNameDetectorTest.java b/resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/JettyServiceNameDetectorTest.java index 5a63d28e7..75d5664a2 100644 --- a/resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/JettyServiceNameDetectorTest.java +++ b/resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/JettyServiceNameDetectorTest.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -public class JettyServiceNameDetectorTest { +class JettyServiceNameDetectorTest { @Test void testJettyBase(@TempDir Path tempDir) throws IOException { diff --git a/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AbstractAttachmentTest.java b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AbstractAttachmentTest.java index 43d89b2ef..611dde652 100644 --- a/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AbstractAttachmentTest.java +++ b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AbstractAttachmentTest.java @@ -8,7 +8,7 @@ import io.opentelemetry.javaagent.shaded.io.opentelemetry.api.trace.Span; import org.junit.jupiter.api.BeforeAll; -public class AbstractAttachmentTest { +class AbstractAttachmentTest { @BeforeAll static void disableMainThreadCheck() { diff --git a/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledByEnvironmentVariableTest.java b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledByEnvironmentVariableTest.java index 41571a2e4..91a67d3cd 100644 --- a/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledByEnvironmentVariableTest.java +++ b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledByEnvironmentVariableTest.java @@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.annotations.WithSpan; import org.junit.jupiter.api.Test; -public class AgentDisabledByEnvironmentVariableTest extends AbstractAttachmentTest { +class AgentDisabledByEnvironmentVariableTest extends AbstractAttachmentTest { @Test void shouldNotAttachWhenAgentDisabledWithEnvVariable() { diff --git a/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledBySystemPropertyTest.java b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledBySystemPropertyTest.java index a24c81296..39d941ff3 100644 --- a/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledBySystemPropertyTest.java +++ b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledBySystemPropertyTest.java @@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.annotations.WithSpan; import org.junit.jupiter.api.Test; -public class AgentDisabledBySystemPropertyTest extends AbstractAttachmentTest { +class AgentDisabledBySystemPropertyTest extends AbstractAttachmentTest { @Test void shouldNotAttachWhenAgentDisabledWithProperty() { diff --git a/span-stacktrace/src/test/java/io/opentelemetry/contrib/stacktrace/StackTraceAutoConfigTest.java b/span-stacktrace/src/test/java/io/opentelemetry/contrib/stacktrace/StackTraceAutoConfigTest.java index 4b8f999f4..ca1517480 100644 --- a/span-stacktrace/src/test/java/io/opentelemetry/contrib/stacktrace/StackTraceAutoConfigTest.java +++ b/span-stacktrace/src/test/java/io/opentelemetry/contrib/stacktrace/StackTraceAutoConfigTest.java @@ -15,7 +15,7 @@ import java.util.function.Predicate; import org.junit.jupiter.api.Test; -public class StackTraceAutoConfigTest { +class StackTraceAutoConfigTest { @Test void defaultConfig() { From f4c0cbef81dea999f5e1eeada0db4523198d0659 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 Aug 2025 02:02:40 +0000 Subject: [PATCH 10/12] Complete style guide improvements: add comprehensive static imports across all modules Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .../contrib/aws/resource/Ec2Resource.java | 3 +- .../resource/AzureVmResourceProvider.java | 3 +- ...entReservoirSamplingSpanProcessorTest.java | 3 +- ...thAutoConfigurationCustomizerProvider.java | 14 ++++---- ...toConfigurationCustomizerProviderTest.java | 35 +++++++++---------- .../auth/GcpAuthExtensionEndToEndTest.java | 6 ++-- .../inferredspans/internal/CallTreeTest.java | 4 +-- 7 files changed, 33 insertions(+), 35 deletions(-) diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2Resource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2Resource.java index d4bdb4228..1b75d8931 100644 --- a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2Resource.java +++ b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2Resource.java @@ -11,6 +11,7 @@ import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PROVIDER; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_REGION; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_EC2; +import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_ID; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_IMAGE_ID; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_NAME; @@ -89,7 +90,7 @@ static Resource buildResource(String endpoint) { String hostname = fetchHostname(hostnameUrl, token); AttributesBuilder attrBuilders = Attributes.builder(); - attrBuilders.put(CLOUD_PROVIDER, IncubatingAttributes.CloudProviderIncubatingValues.AWS); + attrBuilders.put(CLOUD_PROVIDER, AWS); attrBuilders.put(CLOUD_PLATFORM, AWS_EC2); try (JsonParser parser = JSON_FACTORY.createParser(identity)) { diff --git a/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureVmResourceProvider.java b/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureVmResourceProvider.java index 38c983b4a..8b7b61d78 100644 --- a/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureVmResourceProvider.java +++ b/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureVmResourceProvider.java @@ -16,6 +16,7 @@ import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.HOST_TYPE; import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.OS_TYPE; import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.OS_VERSION; +import static java.util.function.Function.identity; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -41,7 +42,7 @@ static class Entry { final Function transform; Entry(AttributeKey key) { - this(key, Function.identity()); + this(key, identity()); } Entry(AttributeKey key, Function transform) { diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java index 5eaefd482..2fe08bfa3 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java @@ -51,7 +51,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.mockito.ArgumentMatcher; -import org.mockito.ArgumentMatchers; class ConsistentReservoirSamplingSpanProcessorTest { @@ -266,7 +265,7 @@ void exporterThrowsException() { when(failingExporter.shutdown()).thenReturn(CompletableResultCode.ofSuccess()); doThrow(new IllegalArgumentException("No export for you.")) .when(failingExporter) - .export(ArgumentMatchers.anyList()); + .export(anyList()); WaitingSpanExporter workingExporter = new WaitingSpanExporter(1); diff --git a/gcp-auth-extension/src/main/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProvider.java b/gcp-auth-extension/src/main/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProvider.java index 1de583029..b00373317 100644 --- a/gcp-auth-extension/src/main/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProvider.java +++ b/gcp-auth-extension/src/main/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProvider.java @@ -5,9 +5,12 @@ package io.opentelemetry.contrib.gcp.auth; +import static io.opentelemetry.api.common.AttributeKey.stringKey; +import static java.util.stream.Collectors.joining; +import static java.util.stream.Collectors.toMap; + import com.google.auth.oauth2.GoogleCredentials; import com.google.auto.service.AutoService; -import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.contrib.gcp.auth.GoogleAuthException.Reason; import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter; @@ -32,7 +35,6 @@ import java.util.Optional; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import javax.annotation.Nonnull; /** @@ -206,13 +208,13 @@ private static Map getRequiredHeaderMap( Map flattenedHeaders = gcpHeaders.entrySet().stream() .collect( - Collectors.toMap( + toMap( Map.Entry::getKey, entry -> entry.getValue().stream() .filter(Objects::nonNull) // Filter nulls .filter(s -> !s.isEmpty()) // Filter empty strings - .collect(Collectors.joining(",")))); + .collect(joining(",")))); // Add quota user project header if not detected by the auth library and user provided it via // system properties. if (!flattenedHeaders.containsKey(QUOTA_USER_PROJECT_HEADER)) { @@ -230,9 +232,7 @@ private static Map getRequiredHeaderMap( private static Resource customizeResource(Resource resource, ConfigProperties configProperties) { String gcpProjectId = ConfigurableOption.GOOGLE_CLOUD_PROJECT.getConfiguredValue(configProperties); - Resource res = - Resource.create( - Attributes.of(AttributeKey.stringKey(GCP_USER_PROJECT_ID_KEY), gcpProjectId)); + Resource res = Resource.create(Attributes.of(stringKey(GCP_USER_PROJECT_ID_KEY), gcpProjectId)); return resource.merge(res); } } diff --git a/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java b/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java index be9ce7ff8..abb2df4b6 100644 --- a/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java +++ b/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProviderTest.java @@ -5,12 +5,14 @@ package io.opentelemetry.contrib.gcp.auth; +import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.GCP_USER_PROJECT_ID_KEY; import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.QUOTA_USER_PROJECT_HEADER; import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.SIGNAL_TYPE_ALL; import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.SIGNAL_TYPE_METRICS; import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.SIGNAL_TYPE_TRACES; import static java.util.Collections.singletonList; +import static java.util.concurrent.SECONDS; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -73,7 +75,6 @@ import java.util.Map.Entry; import java.util.Random; import java.util.Set; -import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Nonnull; @@ -170,7 +171,7 @@ public void testTraceCustomizerOtlpHttp() { OpenTelemetrySdk sdk = buildOpenTelemetrySdkWithExporter(mockOtlpHttpSpanExporter); generateTestSpan(sdk); CompletableResultCode code = sdk.shutdown(); - CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS); + CompletableResultCode joinResult = code.join(10, SECONDS); assertTrue(joinResult.isSuccess()); verify(mockOtlpHttpSpanExporter, times(1)).toBuilder(); @@ -188,9 +189,8 @@ public void testTraceCustomizerOtlpHttp() { spanData -> { assertThat(spanData.getResource().getAttributes().asMap()) .containsEntry( - AttributeKey.stringKey(GCP_USER_PROJECT_ID_KEY), - DUMMY_GCP_RESOURCE_PROJECT_ID) - .containsEntry(AttributeKey.stringKey("foo"), "bar"); + stringKey(GCP_USER_PROJECT_ID_KEY), DUMMY_GCP_RESOURCE_PROJECT_ID) + .containsEntry(stringKey("foo"), "bar"); assertThat(spanData.getAttributes().asMap()) .containsKey(AttributeKey.longKey("work_loop")); }); @@ -223,7 +223,7 @@ public void testTraceCustomizerOtlpGrpc() { OpenTelemetrySdk sdk = buildOpenTelemetrySdkWithExporter(mockOtlpGrpcSpanExporter); generateTestSpan(sdk); CompletableResultCode code = sdk.shutdown(); - CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS); + CompletableResultCode joinResult = code.join(10, SECONDS); assertTrue(joinResult.isSuccess()); verify(mockOtlpGrpcSpanExporter, times(1)).toBuilder(); @@ -241,9 +241,8 @@ public void testTraceCustomizerOtlpGrpc() { spanData -> { assertThat(spanData.getResource().getAttributes().asMap()) .containsEntry( - AttributeKey.stringKey(GCP_USER_PROJECT_ID_KEY), - DUMMY_GCP_RESOURCE_PROJECT_ID) - .containsEntry(AttributeKey.stringKey("foo"), "bar"); + stringKey(GCP_USER_PROJECT_ID_KEY), DUMMY_GCP_RESOURCE_PROJECT_ID) + .containsEntry(stringKey("foo"), "bar"); assertThat(spanData.getAttributes().asMap()) .containsKey(AttributeKey.longKey("work_loop")); }); @@ -278,7 +277,7 @@ public void testMetricCustomizerOtlpHttp() { OpenTelemetrySdk sdk = buildOpenTelemetrySdkWithExporter(mockOtlpHttpMetricExporter); generateTestMetric(sdk); CompletableResultCode code = sdk.shutdown(); - CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS); + CompletableResultCode joinResult = code.join(10, SECONDS); assertTrue(joinResult.isSuccess()); verify(mockOtlpHttpMetricExporter, times(1)).toBuilder(); @@ -296,9 +295,8 @@ public void testMetricCustomizerOtlpHttp() { metricData -> { assertThat(metricData.getResource().getAttributes().asMap()) .containsEntry( - AttributeKey.stringKey(GCP_USER_PROJECT_ID_KEY), - DUMMY_GCP_RESOURCE_PROJECT_ID) - .containsEntry(AttributeKey.stringKey("foo"), "bar"); + stringKey(GCP_USER_PROJECT_ID_KEY), DUMMY_GCP_RESOURCE_PROJECT_ID) + .containsEntry(stringKey("foo"), "bar"); assertThat(metricData.getLongSumData().getPoints()) .hasSizeGreaterThan(0) .allSatisfy( @@ -337,7 +335,7 @@ public void testMetricCustomizerOtlpGrpc() { OpenTelemetrySdk sdk = buildOpenTelemetrySdkWithExporter(mockOtlpGrpcMetricExporter); generateTestMetric(sdk); CompletableResultCode code = sdk.shutdown(); - CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS); + CompletableResultCode joinResult = code.join(10, SECONDS); assertTrue(joinResult.isSuccess()); verify(mockOtlpGrpcMetricExporter, times(1)).toBuilder(); @@ -355,9 +353,8 @@ public void testMetricCustomizerOtlpGrpc() { metricData -> { assertThat(metricData.getResource().getAttributes().asMap()) .containsEntry( - AttributeKey.stringKey(GCP_USER_PROJECT_ID_KEY), - DUMMY_GCP_RESOURCE_PROJECT_ID) - .containsEntry(AttributeKey.stringKey("foo"), "bar"); + stringKey(GCP_USER_PROJECT_ID_KEY), DUMMY_GCP_RESOURCE_PROJECT_ID) + .containsEntry(stringKey("foo"), "bar"); assertThat(metricData.getLongSumData().getPoints()) .hasSizeGreaterThan(0) .allSatisfy( @@ -440,7 +437,7 @@ public void testQuotaProjectBehavior(QuotaProjectIdTestBehavior testCase) throws OpenTelemetrySdk sdk = buildOpenTelemetrySdkWithExporter(mockOtlpGrpcSpanExporter); generateTestSpan(sdk); CompletableResultCode code = sdk.shutdown(); - CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS); + CompletableResultCode joinResult = code.join(10, SECONDS); assertTrue(joinResult.isSuccess()); verify(spyOtlpGrpcSpanExporterBuilder, times(1)) .setHeaders(traceHeaderSupplierCaptor.capture()); @@ -508,7 +505,7 @@ public void testTargetSignalsBehavior(TargetSignalBehavior testCase) { generateTestMetric(sdk); generateTestSpan(sdk); CompletableResultCode code = sdk.shutdown(); - CompletableResultCode joinResult = code.join(10, TimeUnit.SECONDS); + CompletableResultCode joinResult = code.join(10, SECONDS); assertTrue(joinResult.isSuccess()); // Check Traces modification conditions diff --git a/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.java b/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.java index 543dfb6d6..20d803919 100644 --- a/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.java +++ b/gcp-auth-extension/src/test/java/io/opentelemetry/contrib/gcp/auth/GcpAuthExtensionEndToEndTest.java @@ -7,6 +7,7 @@ import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.GCP_USER_PROJECT_ID_KEY; import static io.opentelemetry.contrib.gcp.auth.GcpAuthAutoConfigurationCustomizerProvider.QUOTA_USER_PROJECT_HEADER; +import static java.util.stream.Collectors.toList; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -28,7 +29,6 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; @@ -182,7 +182,7 @@ private static void verifyRequestHeaders(List extractedHeaders) { } private static List extractHeadersFromRequests(HttpRequest[] requests) { - return Arrays.stream(requests).map(HttpRequest::getHeaders).collect(Collectors.toList()); + return Arrays.stream(requests).map(HttpRequest::getHeaders).collect(toList()); } /** @@ -199,7 +199,7 @@ private static List extractResourceSpansFromRequests(HttpRequest[ .map(Optional::get) .flatMap( exportTraceServiceRequest -> exportTraceServiceRequest.getResourceSpansList().stream()) - .collect(Collectors.toList()); + .collect(toList()); } private static Optional getExportTraceServiceRequest(Body body) { diff --git a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeTest.java b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeTest.java index cd824fbc0..0c3a629c9 100644 --- a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeTest.java +++ b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeTest.java @@ -7,6 +7,7 @@ import static io.opentelemetry.contrib.inferredspans.internal.semconv.Attributes.LINK_IS_CHILD; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; +import static java.util.function.identity; import static java.util.stream.Collectors.toMap; import io.opentelemetry.api.trace.Span; @@ -28,7 +29,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import java.util.function.Function; import java.util.stream.Collectors; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -875,7 +875,7 @@ private Map assertCallTree( CallTree.DEFAULT_PARENT_OVERRIDE); Map spans = profilerSetup.getSpans().stream() - .collect(toMap(s -> s.getName().replaceAll(".*#", ""), Function.identity())); + .collect(toMap(s -> s.getName().replaceAll(".*#", ""), identity())); assertThat(profilerSetup.getSpans()).hasSize(expectedSpans.length + 1); for (int i = 0; i < expectedSpans.length; i++) { From fd59388b09d22c8d38077d8927666c0576dbf4e8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 Aug 2025 02:25:57 +0000 Subject: [PATCH 11/12] Continue comprehensive style guide improvements: fix test class visibility and add more static imports Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .../mapping/metrics/MetricDataMapperTest.java | 24 ++--- .../mapping/spans/SpanDataMapperTest.java | 12 +-- .../inferredspans/ProfilerTestSetup.java | 2 +- .../util/AutoConfigTestProperties.java | 2 +- .../contrib/jmxscraper/TestAppContainer.java | 2 +- .../contrib/jmxscraper/TestKeyStore.java | 2 +- .../contrib/jmxscraper/config/TestUtil.java | 2 +- .../contrib/jmxscraper/testapp/TestApp.java | 2 +- .../opentelemetry/contrib/kafka/TestUtil.java | 2 +- .../opentelemetry/maven/MavenUtilsTests.java | 2 +- .../handler/MojoGoalExecutionHandlerTest.java | 27 +++--- .../micrometer/TestCallbackRegistrar.java | 2 +- .../clientbridge/MetricAdapterTest.java | 92 ++++++------------- 13 files changed, 69 insertions(+), 104 deletions(-) diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapperTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapperTest.java index b4f7f64d9..8e8170421 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapperTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapperTest.java @@ -8,6 +8,8 @@ import static io.opentelemetry.contrib.disk.buffering.testutils.TestData.makeContext; import static io.opentelemetry.contrib.disk.buffering.testutils.TestData.makeLongGauge; import static io.opentelemetry.contrib.disk.buffering.testutils.TestData.makeLongPointData; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -44,8 +46,6 @@ import io.opentelemetry.sdk.metrics.internal.data.ImmutableSummaryPointData; import io.opentelemetry.sdk.metrics.internal.data.ImmutableValueAtQuantile; import io.opentelemetry.sdk.resources.Resource; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -106,9 +106,9 @@ void verifySummaryMapping() { ValueAtQuantile value = ImmutableValueAtQuantile.create(2.0, 1.0); SummaryPointData pointData = ImmutableSummaryPointData.create( - 1L, 2L, TestData.ATTRIBUTES, 1L, 2.0, Collections.singletonList(value)); + 1L, 2L, TestData.ATTRIBUTES, 1L, 2.0, singletonList(value)); - SummaryData data = ImmutableSummaryData.create(Collections.singletonList(pointData)); + SummaryData data = ImmutableSummaryData.create(singletonList(pointData)); MetricData summaryMetric = ImmutableMetricData.createDoubleSummary( @@ -163,7 +163,7 @@ private static MetricData makeDoubleGauge(TraceFlags flags) { "Double gauge name", "Double gauge description", "ms", - ImmutableGaugeData.create(Collections.singletonList(point))); + ImmutableGaugeData.create(singletonList(point))); } @NotNull @@ -171,7 +171,7 @@ private static List makeDoubleExemplars(TraceFlags flags) { SpanContext context = makeContext(flags); DoubleExemplarData doubleExemplarData = ImmutableDoubleExemplarData.create(TestData.ATTRIBUTES, 100L, context, 1.0); - return Collections.singletonList(doubleExemplarData); + return singletonList(doubleExemplarData); } @NotNull @@ -179,7 +179,7 @@ private static MetricData makeLongSum(TraceFlags flags) { LongPointData pointData = makeLongPointData(flags); SumData sumData = ImmutableSumData.create( - true, AggregationTemporality.DELTA, Collections.singletonList(pointData)); + true, AggregationTemporality.DELTA, singletonList(pointData)); return ImmutableMetricData.createLongSum( TestData.RESOURCE_FULL, TestData.INSTRUMENTATION_SCOPE_INFO_FULL, @@ -194,7 +194,7 @@ private static MetricData makeDoubleSum(TraceFlags flags) { DoublePointData doublePointData = makeDoublePointData(flags); SumData sumData = ImmutableSumData.create( - true, AggregationTemporality.DELTA, Collections.singletonList(doublePointData)); + true, AggregationTemporality.DELTA, singletonList(doublePointData)); return ImmutableMetricData.createDoubleSum( TestData.RESOURCE_FULL, @@ -216,7 +216,7 @@ private static MetricData makeExponentialHistogram(TraceFlags flags) { ExponentialHistogramBuckets positiveBucket = ImmutableExponentialHistogramBuckets.create(1, 10, Arrays.asList(1L, 10L)); ExponentialHistogramBuckets negativeBucket = - ImmutableExponentialHistogramBuckets.create(1, 0, Collections.emptyList()); + ImmutableExponentialHistogramBuckets.create(1, 0, emptyList()); ExponentialHistogramPointData pointData = ImmutableExponentialHistogramPointData.create( @@ -236,7 +236,7 @@ private static MetricData makeExponentialHistogram(TraceFlags flags) { ExponentialHistogramData histogramData = ImmutableExponentialHistogramData.create( - AggregationTemporality.CUMULATIVE, Collections.singletonList(pointData)); + AggregationTemporality.CUMULATIVE, singletonList(pointData)); return ImmutableMetricData.createExponentialHistogram( TestData.RESOURCE_FULL, @@ -259,13 +259,13 @@ private static MetricData makeHistogram(TraceFlags flags) { 4.0, true, 7.0, - Collections.singletonList(10.0), + singletonList(10.0), Arrays.asList(1L, 2L), makeDoubleExemplars(flags)); HistogramData data = ImmutableHistogramData.create( - AggregationTemporality.CUMULATIVE, Collections.singletonList(dataPoint)); + AggregationTemporality.CUMULATIVE, singletonList(dataPoint)); return ImmutableMetricData.createDoubleHistogram( TestData.RESOURCE_FULL, diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/spans/SpanDataMapperTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/spans/SpanDataMapperTest.java index de8f8ff78..a81b614f1 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/spans/SpanDataMapperTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/spans/SpanDataMapperTest.java @@ -5,6 +5,8 @@ package io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.spans; +import static java.util.Arrays.asList; +import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.assertEquals; import io.opentelemetry.api.trace.SpanKind; @@ -17,8 +19,6 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; -import java.util.Arrays; -import java.util.Collections; import org.junit.jupiter.api.Test; class SpanDataMapperTest { @@ -44,8 +44,8 @@ class SpanDataMapperTest { .setEndEpochNanos(2L) .setKind(SpanKind.CLIENT) .setStatus(StatusData.error()) - .setEvents(Collections.singletonList(EVENT_DATA)) - .setLinks(Arrays.asList(LINK_DATA, LINK_DATA_WITH_TRACE_STATE)) + .setEvents(singletonList(EVENT_DATA)) + .setLinks(asList(LINK_DATA, LINK_DATA_WITH_TRACE_STATE)) .setTotalAttributeCount(10) .setTotalRecordedEvents(2) .setTotalRecordedLinks(2) @@ -63,8 +63,8 @@ class SpanDataMapperTest { .setEndEpochNanos(2L) .setKind(SpanKind.CLIENT) .setStatus(StatusData.error()) - .setEvents(Collections.singletonList(EVENT_DATA)) - .setLinks(Collections.singletonList(LINK_DATA)) + .setEvents(singletonList(EVENT_DATA)) + .setLinks(singletonList(LINK_DATA)) .setTotalAttributeCount(10) .setTotalRecordedEvents(2) .setTotalRecordedLinks(2) diff --git a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/ProfilerTestSetup.java b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/ProfilerTestSetup.java index e4628b897..ae94a4fde 100644 --- a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/ProfilerTestSetup.java +++ b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/ProfilerTestSetup.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.function.Consumer; -public class ProfilerTestSetup implements AutoCloseable { +class ProfilerTestSetup implements AutoCloseable { public OpenTelemetrySdk sdk; diff --git a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/util/AutoConfigTestProperties.java b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/util/AutoConfigTestProperties.java index a9005efdf..ab37c3596 100644 --- a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/util/AutoConfigTestProperties.java +++ b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/util/AutoConfigTestProperties.java @@ -8,7 +8,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import javax.annotation.Nullable; -public class AutoConfigTestProperties extends TemporaryProperties { +class AutoConfigTestProperties extends TemporaryProperties { public AutoConfigTestProperties() { put("otel.java.global-autoconfigure.enabled", "true"); diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java index 7a8655a51..06010c329 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java @@ -22,7 +22,7 @@ import org.testcontainers.utility.MountableFile; /** Test container that allows to execute TestApp in an isolated container */ -public class TestAppContainer extends GenericContainer { +class TestAppContainer extends GenericContainer { private final Map properties; private String login; diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestKeyStore.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestKeyStore.java index e72ee86bb..898771bc2 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestKeyStore.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestKeyStore.java @@ -30,7 +30,7 @@ import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; /** Utility that allows to manage keystores programmatically without using 'keytool' CLI program */ -public class TestKeyStore { +class TestKeyStore { private static final String TYPE = "JKS"; diff --git a/jmx-scraper/src/test/java/io/opentelemetry/contrib/jmxscraper/config/TestUtil.java b/jmx-scraper/src/test/java/io/opentelemetry/contrib/jmxscraper/config/TestUtil.java index ef8ac68f5..33174233b 100644 --- a/jmx-scraper/src/test/java/io/opentelemetry/contrib/jmxscraper/config/TestUtil.java +++ b/jmx-scraper/src/test/java/io/opentelemetry/contrib/jmxscraper/config/TestUtil.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Properties; -public class TestUtil { +class TestUtil { private TestUtil() {} diff --git a/jmx-scraper/test-app/src/main/java/io/opentelemetry/contrib/jmxscraper/testapp/TestApp.java b/jmx-scraper/test-app/src/main/java/io/opentelemetry/contrib/jmxscraper/testapp/TestApp.java index 9883abceb..5f8a2f854 100644 --- a/jmx-scraper/test-app/src/main/java/io/opentelemetry/contrib/jmxscraper/testapp/TestApp.java +++ b/jmx-scraper/test-app/src/main/java/io/opentelemetry/contrib/jmxscraper/testapp/TestApp.java @@ -10,7 +10,7 @@ import javax.management.ObjectName; @SuppressWarnings("all") // for busy wait + stdout -public class TestApp implements TestAppMxBean { +class TestApp implements TestAppMxBean { private volatile boolean running; diff --git a/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/TestUtil.java b/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/TestUtil.java index 82e80d490..ff5d6bce1 100644 --- a/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/TestUtil.java +++ b/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/TestUtil.java @@ -12,7 +12,7 @@ import io.opentelemetry.sdk.trace.data.StatusData; import java.util.concurrent.TimeUnit; -public class TestUtil { +class TestUtil { private TestUtil() {} public static SpanData makeBasicSpan(String spanName) { diff --git a/maven-extension/src/test/java/io/opentelemetry/maven/MavenUtilsTests.java b/maven-extension/src/test/java/io/opentelemetry/maven/MavenUtilsTests.java index 9c4fee91b..637b4f841 100644 --- a/maven-extension/src/test/java/io/opentelemetry/maven/MavenUtilsTests.java +++ b/maven-extension/src/test/java/io/opentelemetry/maven/MavenUtilsTests.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; -public class MavenUtilsTests { +class MavenUtilsTests { @Test public void getPluginArtifactIdShortName_builtinPluginName() { diff --git a/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerTest.java b/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerTest.java index 770ac9fa1..11e32c246 100644 --- a/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerTest.java +++ b/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerTest.java @@ -5,6 +5,9 @@ package io.opentelemetry.maven.handler; +import static java.util.Arrays.asList; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanBuilder; @@ -19,8 +22,6 @@ import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.io.IOException; import java.io.InputStream; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import javax.annotation.Nullable; import org.apache.maven.artifact.InvalidRepositoryException; @@ -67,7 +68,7 @@ public void testMavenDeploy() throws Exception { List supportedGoals = mavenDeployHandler.getSupportedGoals(); assertThat(supportedGoals) .isEqualTo( - Collections.singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = @@ -109,7 +110,7 @@ public void testSpringBootBuildImage_springboot_1() throws Exception { List supportedGoals = buildImageHandler.getSupportedGoals(); assertThat(supportedGoals) .isEqualTo( - Collections.singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = @@ -126,7 +127,7 @@ public void testSpringBootBuildImage_springboot_1() throws Exception { assertThat(span.getAttribute(MavenOtelSemanticAttributes.MAVEN_BUILD_CONTAINER_IMAGE_NAME)) .isEqualTo("docker.io/john/${project.artifactId}"); assertThat(span.getAttribute(MavenOtelSemanticAttributes.MAVEN_BUILD_CONTAINER_IMAGE_TAGS)) - .isEqualTo(Collections.singletonList("latest")); + .isEqualTo(singletonList("latest")); assertThat(span.getAttribute(UrlAttributes.URL_FULL)).isEqualTo("https://docker.io"); assertThat(span.getAttribute(PeerIncubatingAttributes.PEER_SERVICE)).isEqualTo("docker.io"); @@ -153,7 +154,7 @@ public void testSpringBootBuildImage_springboot_2() throws Exception { List supportedGoals = buildImageHandler.getSupportedGoals(); assertThat(supportedGoals) .isEqualTo( - Collections.singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = @@ -170,7 +171,7 @@ public void testSpringBootBuildImage_springboot_2() throws Exception { assertThat(span.getAttribute(MavenOtelSemanticAttributes.MAVEN_BUILD_CONTAINER_IMAGE_NAME)) .isEqualTo("docker.io/john/${project.artifactId}"); assertThat(span.getAttribute(MavenOtelSemanticAttributes.MAVEN_BUILD_CONTAINER_IMAGE_TAGS)) - .isEqualTo(Collections.singletonList("${project.version}")); + .isEqualTo(singletonList("${project.version}")); assertThat(span.getAttribute(UrlAttributes.URL_FULL)).isEqualTo("https://docker.io"); assertThat(span.getAttribute(PeerIncubatingAttributes.PEER_SERVICE)).isEqualTo("docker.io"); @@ -197,7 +198,7 @@ public void testGoogleJibBuild_jib_1() throws Exception { List supportedGoals = buildImageHandler.getSupportedGoals(); assertThat(supportedGoals) .isEqualTo( - Collections.singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = @@ -211,7 +212,7 @@ public void testGoogleJibBuild_jib_1() throws Exception { assertThat(span.getAttribute(MavenOtelSemanticAttributes.MAVEN_BUILD_CONTAINER_IMAGE_NAME)) .isEqualTo("docker.io/john/${project.artifactId}"); assertThat(span.getAttribute(MavenOtelSemanticAttributes.MAVEN_BUILD_CONTAINER_IMAGE_TAGS)) - .isEqualTo(Arrays.asList("latest", "${project.version}")); + .isEqualTo(asList("latest", "${project.version}")); assertThat(span.getAttribute(UrlAttributes.URL_FULL)).isEqualTo("https://docker.io"); assertThat(span.getAttribute(PeerIncubatingAttributes.PEER_SERVICE)).isEqualTo("docker.io"); @@ -238,7 +239,7 @@ public void testGoogleJibBuild_jib_2() throws Exception { List supportedGoals = buildImageHandler.getSupportedGoals(); assertThat(supportedGoals) .isEqualTo( - Collections.singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = @@ -252,7 +253,7 @@ public void testGoogleJibBuild_jib_2() throws Exception { assertThat(span.getAttribute(MavenOtelSemanticAttributes.MAVEN_BUILD_CONTAINER_IMAGE_NAME)) .isEqualTo("gcr.io/my-gcp-project/my-app"); assertThat(span.getAttribute(MavenOtelSemanticAttributes.MAVEN_BUILD_CONTAINER_IMAGE_TAGS)) - .isEqualTo(Collections.singletonList("1.0-SNAPSHOT")); + .isEqualTo(singletonList("1.0-SNAPSHOT")); assertThat(span.getAttribute(UrlAttributes.URL_FULL)).isEqualTo("https://gcr.io"); assertThat(span.getAttribute(PeerIncubatingAttributes.PEER_SERVICE)).isEqualTo("gcr.io"); @@ -279,7 +280,7 @@ public void testSnykTest_snyk_1() throws Exception { List supportedGoals = snykTestHandler.getSupportedGoals(); assertThat(supportedGoals) .isEqualTo( - Collections.singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = @@ -315,7 +316,7 @@ public void testSnykMonitor_snyk_1() throws Exception { List supportedGoals = snykTestHandler.getSupportedGoals(); assertThat(supportedGoals) .isEqualTo( - Collections.singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/TestCallbackRegistrar.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/TestCallbackRegistrar.java index 2be705618..57fab9ac6 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/TestCallbackRegistrar.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/TestCallbackRegistrar.java @@ -7,7 +7,7 @@ import java.util.List; -public class TestCallbackRegistrar implements CallbackRegistrar, Runnable { +class TestCallbackRegistrar implements CallbackRegistrar, Runnable { private final List callbacks; diff --git a/prometheus-client-bridge/src/test/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/MetricAdapterTest.java b/prometheus-client-bridge/src/test/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/MetricAdapterTest.java index 7e5b064d6..e6b24f104 100644 --- a/prometheus-client-bridge/src/test/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/MetricAdapterTest.java +++ b/prometheus-client-bridge/src/test/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/MetricAdapterTest.java @@ -6,6 +6,8 @@ package io.opentelemetry.contrib.metrics.prometheus.clientbridge; import static io.opentelemetry.api.common.AttributeKey.stringKey; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import com.google.common.collect.ImmutableList; @@ -37,8 +39,6 @@ import java.io.IOException; import java.io.StringWriter; import java.io.UncheckedIOException; -import java.util.Arrays; -import java.util.Collections; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import org.assertj.core.presentation.StandardRepresentation; @@ -59,7 +59,7 @@ class MetricAdapterTest { ImmutableSumData.create( /* isMonotonic= */ true, AggregationTemporality.CUMULATIVE, - Collections.singletonList( + singletonList( ImmutableDoublePointData.create( 1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5)))); private static final MetricData NON_MONOTONIC_CUMULATIVE_DOUBLE_SUM = @@ -72,7 +72,7 @@ class MetricAdapterTest { ImmutableSumData.create( /* isMonotonic= */ false, AggregationTemporality.CUMULATIVE, - Collections.singletonList( + singletonList( ImmutableDoublePointData.create( 1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5)))); private static final MetricData MONOTONIC_DELTA_DOUBLE_SUM = @@ -85,7 +85,7 @@ class MetricAdapterTest { ImmutableSumData.create( /* isMonotonic= */ true, AggregationTemporality.DELTA, - Collections.singletonList( + singletonList( ImmutableDoublePointData.create( 1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5)))); private static final MetricData NON_MONOTONIC_DELTA_DOUBLE_SUM = @@ -98,7 +98,7 @@ class MetricAdapterTest { ImmutableSumData.create( /* isMonotonic= */ false, AggregationTemporality.DELTA, - Collections.singletonList( + singletonList( ImmutableDoublePointData.create( 1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5)))); private static final MetricData MONOTONIC_CUMULATIVE_LONG_SUM = @@ -111,7 +111,7 @@ class MetricAdapterTest { ImmutableSumData.create( /* isMonotonic= */ true, AggregationTemporality.CUMULATIVE, - Collections.singletonList( + singletonList( ImmutableLongPointData.create( 1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5)))); private static final MetricData NON_MONOTONIC_CUMULATIVE_LONG_SUM = @@ -124,7 +124,7 @@ class MetricAdapterTest { ImmutableSumData.create( /* isMonotonic= */ false, AggregationTemporality.CUMULATIVE, - Collections.singletonList( + singletonList( ImmutableLongPointData.create( 1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5)))); private static final MetricData MONOTONIC_DELTA_LONG_SUM = @@ -137,7 +137,7 @@ class MetricAdapterTest { ImmutableSumData.create( /* isMonotonic= */ true, AggregationTemporality.DELTA, - Collections.singletonList( + singletonList( ImmutableLongPointData.create( 1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5)))); private static final MetricData NON_MONOTONIC_DELTA_LONG_SUM = @@ -150,7 +150,7 @@ class MetricAdapterTest { ImmutableSumData.create( /* isMonotonic= */ false, AggregationTemporality.DELTA, - Collections.singletonList( + singletonList( ImmutableLongPointData.create( 1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5)))); @@ -162,7 +162,7 @@ class MetricAdapterTest { "description", "1", ImmutableGaugeData.create( - Collections.singletonList( + singletonList( ImmutableDoublePointData.create( 1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5)))); private static final MetricData LONG_GAUGE = @@ -173,7 +173,7 @@ class MetricAdapterTest { "description", "1", ImmutableGaugeData.create( - Collections.singletonList( + singletonList( ImmutableLongPointData.create( 1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5)))); private static final MetricData SUMMARY = @@ -184,7 +184,7 @@ class MetricAdapterTest { "description", "1", ImmutableSummaryData.create( - Collections.singletonList( + singletonList( ImmutableSummaryPointData.create( 1633947011000000000L, 1633950672000000000L, @@ -203,7 +203,7 @@ class MetricAdapterTest { "1", ImmutableHistogramData.create( AggregationTemporality.DELTA, - Collections.singletonList( + singletonList( ImmutableHistogramPointData.create( 1633947011000000000L, 1633950672000000000L, @@ -213,9 +213,9 @@ class MetricAdapterTest { 0.0, false, 0.0, - Collections.emptyList(), - Collections.singletonList(2L), - Collections.singletonList( + emptyList(), + singletonList(2L), + singletonList( ImmutableDoubleExemplarData.create( Attributes.empty(), TimeUnit.MILLISECONDS.toNanos(1L), @@ -320,8 +320,7 @@ void histogram() { @Test void toSamples_LongPoints() { - assertThat( - MetricAdapter.toSamples("full_name", MetricDataType.LONG_SUM, Collections.emptyList())) + assertThat(MetricAdapter.toSamples("full_name", MetricDataType.LONG_SUM, emptyList())) .isEmpty(); assertThat( @@ -334,13 +333,7 @@ void toSamples_LongPoints() { ImmutableLongPointData.create( 1633939689000000000L, 1633943350000000000L, KP_VP_ATTR, 7)))) .containsExactly( - new Sample( - "full_name", - Collections.emptyList(), - Collections.emptyList(), - 5, - null, - 1633950672000L), + new Sample("full_name", emptyList(), emptyList(), 5, null, 1633950672000L), new Sample( "full_name", ImmutableList.of("kp"), @@ -359,13 +352,7 @@ void toSamples_LongPoints() { ImmutableLongPointData.create( 1633939689000000000L, 1633943350000000000L, KP_VP_ATTR, 7)))) .containsExactly( - new Sample( - "full_name", - Collections.emptyList(), - Collections.emptyList(), - 5, - null, - 1633950672000L), + new Sample("full_name", emptyList(), emptyList(), 5, null, 1633950672000L), new Sample( "full_name", ImmutableList.of("kp"), @@ -377,16 +364,14 @@ void toSamples_LongPoints() { @Test void toSamples_DoublePoints() { - assertThat( - MetricAdapter.toSamples( - "full_name", MetricDataType.DOUBLE_SUM, Collections.emptyList())) + assertThat(MetricAdapter.toSamples("full_name", MetricDataType.DOUBLE_SUM, emptyList())) .isEmpty(); assertThat( MetricAdapter.toSamples( "full_name", MetricDataType.DOUBLE_SUM, - Collections.singletonList( + singletonList( ImmutableDoublePointData.create( 1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5)))) .containsExactly( @@ -408,13 +393,7 @@ void toSamples_DoublePoints() { ImmutableDoublePointData.create( 1633939689000000000L, 1633943350000000000L, KP_VP_ATTR, 7)))) .containsExactly( - new Sample( - "full_name", - Collections.emptyList(), - Collections.emptyList(), - 5, - null, - 1633950672000L), + new Sample("full_name", emptyList(), emptyList(), 5, null, 1633950672000L), new Sample( "full_name", ImmutableList.of("kp"), @@ -426,9 +405,7 @@ void toSamples_DoublePoints() { @Test void toSamples_SummaryPoints() { - assertThat( - MetricAdapter.toSamples("full_name", MetricDataType.SUMMARY, Collections.emptyList())) - .isEmpty(); + assertThat(MetricAdapter.toSamples("full_name", MetricDataType.SUMMARY, emptyList())).isEmpty(); assertThat( MetricAdapter.toSamples( @@ -476,7 +453,7 @@ void toSamples_SummaryPoints() { Attributes.empty(), 7, 15.3, - Collections.emptyList()), + emptyList()), ImmutableSummaryPointData.create( 1633939689000000000L, 1633943350000000000L, @@ -487,20 +464,8 @@ void toSamples_SummaryPoints() { ImmutableValueAtQuantile.create(0.9, 1.1), ImmutableValueAtQuantile.create(0.99, 12.3)))))) .containsExactly( - new Sample( - "full_name_count", - Collections.emptyList(), - Collections.emptyList(), - 7, - null, - 1633950672000L), - new Sample( - "full_name_sum", - Collections.emptyList(), - Collections.emptyList(), - 15.3, - null, - 1633950672000L), + new Sample("full_name_count", emptyList(), emptyList(), 7, null, 1633950672000L), + new Sample("full_name_sum", emptyList(), emptyList(), 15.3, null, 1633950672000L), new Sample( "full_name_count", ImmutableList.of("kp"), @@ -533,8 +498,7 @@ void toSamples_SummaryPoints() { @Test void toSamples_HistogramPoints() { - assertThat( - MetricAdapter.toSamples("full_name", MetricDataType.HISTOGRAM, Collections.emptyList())) + assertThat(MetricAdapter.toSamples("full_name", MetricDataType.HISTOGRAM, emptyList())) .isEmpty(); java.util.List result = From 4cc5d9160df6bd38e06ef0096ee031e8d2c0b85d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 Aug 2025 02:31:44 +0000 Subject: [PATCH 12/12] Apply comprehensive static imports across all remaining modules Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .../contrib/aws/resource/EcsResource.java | 4 ++-- .../awsxray/propagator/AwsXrayPropagator.java | 3 +-- .../AwsXrayLambdaPropagatorTest.java | 2 +- .../AwsXrayRemoteSamplerIntegrationTest.java | 3 +-- ...ributePropagatingSpanProcessorBuilder.java | 3 +-- .../awsxray/AlwaysRecordSamplerTest.java | 3 +-- ...AttributePropagatingSpanProcessorTest.java | 4 +--- .../AwsMetricAttributesSpanExporterTest.java | 23 +++++++++--------- .../awsxray/AwsSpanMetricsProcessorTest.java | 3 +-- .../awsxray/AwsXrayRemoteSamplerTest.java | 3 +-- .../contrib/awsxray/OrElseSamplerTest.java | 3 +-- .../awsxray/RateLimitingSamplerTest.java | 9 ++++--- .../awsxray/SamplingRuleApplierTest.java | 3 +-- .../contrib/awsxray/XrayRulesSamplerTest.java | 5 ++-- .../awsxray/XraySamplerClientTest.java | 8 ++----- .../BaggageProcessorCustomizerTest.java | 14 +++++------ .../zstd/ZstdCompressorProviderTest.java | 5 ++-- .../sampler/consistent/OtelTraceState.java | 5 ++-- .../sampler/consistent56/OtelTraceState.java | 7 ++---- .../ConsistentRateLimitingSamplerTest.java | 3 +-- ...entReservoirSamplingSpanProcessorTest.java | 5 ++-- .../consistent/ConsistentSamplerTest.java | 3 +-- .../ConsistentFixedThresholdSamplerTest.java | 3 +-- .../ConsistentRateLimitingSamplerTest.java | 3 +-- .../consistent56/ConsistentSamplerTest.java | 3 +-- .../buffering/FromDiskExporterImplTest.java | 3 +-- .../buffering/SpanFromDiskExporterTest.java | 9 ++++--- .../mapping/logs/ProtoLogsDataMapperTest.java | 5 ++-- .../mapping/metrics/MetricDataMapperTest.java | 9 +++---- .../metrics/ProtoMetricsDataMapperTest.java | 5 ++-- .../spans/ProtoSpansDataMapperTest.java | 13 +++++----- .../serializers/MetricDataSerializerTest.java | 3 +-- .../serializers/SpanDataSerializerTest.java | 7 +++--- .../disk/buffering/testutils/TestData.java | 7 ++---- .../InferredSpansProcessorBuilder.java | 3 +-- .../inferredspans/WildcardMatcher.java | 3 +-- .../internal/ProfilingActivationListener.java | 3 +-- .../internal/asyncprofiler/JfrParser.java | 3 +-- .../internal/CallTreeSpanifyTest.java | 21 +++++++--------- .../inferredspans/internal/CallTreeTest.java | 24 +++++++++---------- .../internal/ThreadMatcherTest.java | 3 +-- .../internal/asyncprofiler/JfrParserTest.java | 6 ++--- .../internal/util/OtelReflectionUtils.java | 3 +-- .../jmxmetrics/AbstractIntegrationTest.java | 4 ++-- .../CassandraIntegrationTest.java | 5 ++-- .../JvmTargetSystemIntegrationTest.java | 7 +++--- .../target_systems/KafkaIntegrationTest.java | 15 ++++++------ .../contrib/jmxmetrics/JmxClient.java | 4 ++-- .../contrib/jmxmetrics/JmxConfig.java | 8 +++---- .../contrib/jmxmetrics/GroovyRunnerTest.java | 7 +++--- .../contrib/jmxmetrics/MBeanHelperTest.java | 3 +-- .../handler/MojoGoalExecutionHandlerTest.java | 22 ++++++----------- .../MicrometerDoubleCounterTest.java | 5 ++-- .../MicrometerLongCounterTest.java | 13 +++++----- .../MicrometerLongHistogramTest.java | 6 ++--- .../MicrometerLongUpDownCounterTest.java | 5 ++-- .../impl/recipe/RecipeManagerTest.java | 3 +-- .../CommonAppServersServiceNameDetector.java | 3 +-- .../DelegatingServiceNameDetectorTest.java | 7 +++--- ...edRoutingSamplerComponentProviderTest.java | 5 ++-- .../sampler/LinksBasedSamplerTest.java | 5 ++-- 61 files changed, 154 insertions(+), 233 deletions(-) diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java index efb112de8..84e249f24 100644 --- a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java +++ b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java @@ -103,14 +103,14 @@ static void fetchMetadata( .getLogGroupArn() .ifPresent( logGroupArn -> { - attrBuilders.put(AWS_LOG_GROUP_ARNS, Collections.singletonList(logGroupArn)); + attrBuilders.put(AWS_LOG_GROUP_ARNS, singletonList(logGroupArn)); }); logArnBuilder .getLogStreamArn() .ifPresent( logStreamArn -> { - attrBuilders.put(AWS_LOG_STREAM_ARNS, Collections.singletonList(logStreamArn)); + attrBuilders.put(AWS_LOG_STREAM_ARNS, singletonList(logStreamArn)); }); } catch (IOException e) { logger.log(Level.WARNING, "Can't get ECS metadata", e); diff --git a/aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayPropagator.java b/aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayPropagator.java index 721d01443..b99013cd9 100644 --- a/aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayPropagator.java +++ b/aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayPropagator.java @@ -20,7 +20,6 @@ import io.opentelemetry.context.propagation.TextMapGetter; import io.opentelemetry.context.propagation.TextMapPropagator; import io.opentelemetry.context.propagation.TextMapSetter; -import java.util.Collections; import java.util.List; import java.util.Set; import java.util.logging.Logger; @@ -80,7 +79,7 @@ public final class AwsXrayPropagator implements TextMapPropagator { private static final String INVALID_LINEAGE = "-1:11111111:0"; private static final int NUM_OF_LINEAGE_DELIMITERS = 2; - private static final List FIELDS = Collections.singletonList(TRACE_HEADER_KEY); + private static final List FIELDS = singletonList(TRACE_HEADER_KEY); private static final AwsXrayPropagator INSTANCE = new AwsXrayPropagator(); diff --git a/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayLambdaPropagatorTest.java b/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayLambdaPropagatorTest.java index 957dcb0b6..4504e39c0 100644 --- a/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayLambdaPropagatorTest.java +++ b/aws-xray-propagator/src/test/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayLambdaPropagatorTest.java @@ -130,7 +130,7 @@ void addLink_SystemProperty() { assertThat(span.toSpanData().getLinks()) .isEqualTo( - Collections.singletonList( + singletonList( LinkData.create( SpanContext.createFromRemoteParent( "00000001240000000000000000000001", diff --git a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java index fe281e3e2..71aa15e09 100644 --- a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java +++ b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java @@ -14,7 +14,6 @@ import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.SamplingResult; import java.time.Duration; -import java.util.Collections; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,6 +83,6 @@ private static SamplingResult doSample(Sampler sampler) { "cat-service", SpanKind.SERVER, Attributes.empty(), - Collections.emptyList()); + emptyList()); } } diff --git a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AttributePropagatingSpanProcessorBuilder.java b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AttributePropagatingSpanProcessorBuilder.java index c4d6738a9..ef6e5c89b 100644 --- a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AttributePropagatingSpanProcessorBuilder.java +++ b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AttributePropagatingSpanProcessorBuilder.java @@ -9,7 +9,6 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.api.common.AttributeKey; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -23,7 +22,7 @@ public class AttributePropagatingSpanProcessorBuilder { private AttributeKey spanNamePropagationKey = AwsAttributeKeys.AWS_LOCAL_OPERATION; private List> attributesKeysToPropagate = - Arrays.asList(AwsAttributeKeys.AWS_REMOTE_SERVICE, AwsAttributeKeys.AWS_REMOTE_OPERATION); + asList(AwsAttributeKeys.AWS_REMOTE_SERVICE, AwsAttributeKeys.AWS_REMOTE_OPERATION); public static AttributePropagatingSpanProcessorBuilder create() { return new AttributePropagatingSpanProcessorBuilder(); diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AlwaysRecordSamplerTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AlwaysRecordSamplerTest.java index 42093c51f..cead60559 100644 --- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AlwaysRecordSamplerTest.java +++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AlwaysRecordSamplerTest.java @@ -20,7 +20,6 @@ import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.SamplingDecision; import io.opentelemetry.sdk.trace.samplers.SamplingResult; -import java.util.Collections; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -71,7 +70,7 @@ private void validateShouldSample( "name", SpanKind.CLIENT, Attributes.empty(), - Collections.emptyList()); + emptyList()); if (rootDecision.equals(expectedDecision)) { assertThat(actualResult).isEqualTo(rootResult); diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AttributePropagatingSpanProcessorTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AttributePropagatingSpanProcessorTest.java index b4f40e408..ab013e8da 100644 --- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AttributePropagatingSpanProcessorTest.java +++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AttributePropagatingSpanProcessorTest.java @@ -17,7 +17,6 @@ import io.opentelemetry.context.Context; import io.opentelemetry.sdk.trace.ReadableSpan; import io.opentelemetry.sdk.trace.SdkTracerProvider; -import java.util.Arrays; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -34,8 +33,7 @@ public void setup() { tracer = SdkTracerProvider.builder() .addSpanProcessor( - AttributePropagatingSpanProcessor.create( - spanNameKey, Arrays.asList(testKey1, testKey2))) + AttributePropagatingSpanProcessor.create(spanNameKey, asList(testKey1, testKey2))) .build() .get("awsxray"); } diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsMetricAttributesSpanExporterTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsMetricAttributesSpanExporterTest.java index aedf5fa06..c57348caa 100644 --- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsMetricAttributesSpanExporterTest.java +++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsMetricAttributesSpanExporterTest.java @@ -5,6 +5,8 @@ package io.opentelemetry.contrib.awsxray; +import static java.util.Arrays.asList; +import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -23,9 +25,7 @@ import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.sdk.trace.export.SpanExporter; -import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -78,7 +78,7 @@ public void testExportDelegationWithoutAttributeOrModification() { Attributes metricAttributes = buildMetricAttributes(CONTAINS_NO_ATTRIBUTES); configureMocksForExport(spanDataMock, metricAttributes); - awsMetricAttributesSpanExporter.export(Collections.singletonList(spanDataMock)); + awsMetricAttributesSpanExporter.export(singletonList(spanDataMock)); verify(delegateMock, times(1)).export(delegateExportCaptor.capture()); Collection exportedSpans = delegateExportCaptor.getValue(); assertThat(exportedSpans.size()).isEqualTo(1); @@ -94,7 +94,7 @@ public void testExportDelegationWithAttributeButWithoutModification() { Attributes metricAttributes = buildMetricAttributes(CONTAINS_NO_ATTRIBUTES); configureMocksForExport(spanDataMock, metricAttributes); - awsMetricAttributesSpanExporter.export(Collections.singletonList(spanDataMock)); + awsMetricAttributesSpanExporter.export(singletonList(spanDataMock)); verify(delegateMock, times(1)).export(delegateExportCaptor.capture()); Collection exportedSpans = delegateExportCaptor.getValue(); assertThat(exportedSpans.size()).isEqualTo(1); @@ -110,7 +110,7 @@ public void testExportDelegationWithoutAttributeButWithModification() { Attributes metricAttributes = buildMetricAttributes(CONTAINS_ATTRIBUTES); configureMocksForExport(spanDataMock, metricAttributes); - awsMetricAttributesSpanExporter.export(Collections.singletonList(spanDataMock)); + awsMetricAttributesSpanExporter.export(singletonList(spanDataMock)); verify(delegateMock, times(1)).export(delegateExportCaptor.capture()); List exportedSpans = (List) delegateExportCaptor.getValue(); assertThat(exportedSpans.size()).isEqualTo(1); @@ -130,7 +130,7 @@ public void testExportDelegationWithAttributeAndModification() { Attributes metricAttributes = buildMetricAttributes(CONTAINS_ATTRIBUTES); configureMocksForExport(spanDataMock, metricAttributes); - awsMetricAttributesSpanExporter.export(Collections.singletonList(spanDataMock)); + awsMetricAttributesSpanExporter.export(singletonList(spanDataMock)); verify(delegateMock, times(1)).export(delegateExportCaptor.capture()); List exportedSpans = (List) delegateExportCaptor.getValue(); assertThat(exportedSpans.size()).isEqualTo(1); @@ -162,8 +162,7 @@ public void testExportDelegationWithMultipleSpans() { Attributes metricAttributes3 = buildMetricAttributes(CONTAINS_NO_ATTRIBUTES); configureMocksForExport(spanDataMock3, metricAttributes3); - awsMetricAttributesSpanExporter.export( - Arrays.asList(spanDataMock1, spanDataMock2, spanDataMock3)); + awsMetricAttributesSpanExporter.export(asList(spanDataMock1, spanDataMock2, spanDataMock3)); verify(delegateMock, times(1)).export(delegateExportCaptor.capture()); List exportedSpans = (List) delegateExportCaptor.getValue(); assertThat(exportedSpans.size()).isEqualTo(3); @@ -201,7 +200,7 @@ public void testOverridenAttributes() { "new value3"); configureMocksForExport(spanDataMock, metricAttributes); - awsMetricAttributesSpanExporter.export(Collections.singletonList(spanDataMock)); + awsMetricAttributesSpanExporter.export(singletonList(spanDataMock)); verify(delegateMock, times(1)).export(delegateExportCaptor.capture()); List exportedSpans = (List) delegateExportCaptor.getValue(); assertThat(exportedSpans.size()).isEqualTo(1); @@ -223,7 +222,7 @@ public void testExportDelegatingSpanDataBehaviour() { Attributes metricAttributes = buildMetricAttributes(CONTAINS_ATTRIBUTES); configureMocksForExport(spanDataMock, metricAttributes); - awsMetricAttributesSpanExporter.export(Collections.singletonList(spanDataMock)); + awsMetricAttributesSpanExporter.export(singletonList(spanDataMock)); verify(delegateMock, times(1)).export(delegateExportCaptor.capture()); List exportedSpans = (List) delegateExportCaptor.getValue(); assertThat(exportedSpans.size()).isEqualTo(1); @@ -260,11 +259,11 @@ public void testExportDelegatingSpanDataBehaviour() { when(spanDataMock.getStartEpochNanos()).thenReturn(testStartEpochNanos); assertThat(exportedSpan.getStartEpochNanos()).isEqualTo(testStartEpochNanos); - List eventsMock = Collections.singletonList(mock(EventData.class)); + List eventsMock = singletonList(mock(EventData.class)); when(spanDataMock.getEvents()).thenReturn(eventsMock); assertThat(exportedSpan.getEvents()).isEqualTo(eventsMock); - List linksMock = Collections.singletonList(mock(LinkData.class)); + List linksMock = singletonList(mock(LinkData.class)); when(spanDataMock.getLinks()).thenReturn(linksMock); assertThat(exportedSpan.getLinks()).isEqualTo(linksMock); diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsSpanMetricsProcessorTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsSpanMetricsProcessorTest.java index 0836f5a8e..2d5611d3f 100644 --- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsSpanMetricsProcessorTest.java +++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsSpanMetricsProcessorTest.java @@ -30,7 +30,6 @@ import io.opentelemetry.sdk.trace.data.ExceptionEventData; import io.opentelemetry.sdk.trace.data.SpanData; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -252,7 +251,7 @@ private static ReadableSpan buildReadableSpanWithThrowableMock(Throwable throwab InstrumentationScopeInfo awsSdkScopeInfo = InstrumentationScopeInfo.builder("aws-sdk").setVersion("version").build(); ExceptionEventData mockEventData = mock(ExceptionEventData.class); - List events = new ArrayList<>(Arrays.asList(mockEventData)); + List events = new ArrayList<>(asList(mockEventData)); // Configure latency when(readableSpanMock.getLatencyNanos()).thenReturn(TEST_LATENCY_NANOS); diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerTest.java index d45e00ad2..5c8d3d5c9 100644 --- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerTest.java +++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerTest.java @@ -26,7 +26,6 @@ import java.io.IOException; import java.io.UncheckedIOException; import java.time.Duration; -import java.util.Collections; import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -213,7 +212,7 @@ private static SamplingDecision doSample(Sampler sampler, String name) { "span", SpanKind.SERVER, Attributes.of(AttributeKey.stringKey("test"), name), - Collections.emptyList()) + emptyList()) .getDecision(); } } diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/OrElseSamplerTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/OrElseSamplerTest.java index 570a5d078..5edfe2950 100644 --- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/OrElseSamplerTest.java +++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/OrElseSamplerTest.java @@ -14,7 +14,6 @@ import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.SamplingDecision; import io.opentelemetry.sdk.trace.samplers.SamplingResult; -import java.util.Collections; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; @@ -43,6 +42,6 @@ private static SamplingResult doSample(Sampler sampler) { "span", SpanKind.CLIENT, Attributes.empty(), - Collections.emptyList()); + emptyList()); } } diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/RateLimitingSamplerTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/RateLimitingSamplerTest.java index 490cf44c3..b43032cb8 100644 --- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/RateLimitingSamplerTest.java +++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/RateLimitingSamplerTest.java @@ -15,7 +15,6 @@ import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.SamplingDecision; import java.time.Duration; -import java.util.Collections; import org.junit.jupiter.api.Test; class RateLimitingSamplerTest { @@ -35,7 +34,7 @@ void limitsRate() { "span", SpanKind.CLIENT, Attributes.empty(), - Collections.emptyList()) + emptyList()) .getDecision()) .isEqualTo(SamplingDecision.RECORD_AND_SAMPLE); // Balanced used up @@ -47,7 +46,7 @@ void limitsRate() { "span", SpanKind.CLIENT, Attributes.empty(), - Collections.emptyList()) + emptyList()) .getDecision()) .isEqualTo(SamplingDecision.DROP); @@ -61,7 +60,7 @@ void limitsRate() { "span", SpanKind.CLIENT, Attributes.empty(), - Collections.emptyList()) + emptyList()) .getDecision()) .isEqualTo(SamplingDecision.DROP); clock.advance(Duration.ofMillis(900)); @@ -74,7 +73,7 @@ void limitsRate() { "span", SpanKind.CLIENT, Attributes.empty(), - Collections.emptyList()) + emptyList()) .getDecision()) .isEqualTo(SamplingDecision.RECORD_AND_SAMPLE); } diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplierTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplierTest.java index 920a5ffd4..c654683fa 100644 --- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplierTest.java +++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplierTest.java @@ -37,7 +37,6 @@ import java.io.UncheckedIOException; import java.time.Duration; import java.time.Instant; -import java.util.Collections; import java.util.Date; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; @@ -846,7 +845,7 @@ private static SamplingResult doSample(SamplingRuleApplier applier) { "span", SpanKind.CLIENT, Attributes.empty(), - Collections.emptyList()); + emptyList()); } private static GetSamplingRulesResponse.SamplingRule readSamplingRule(String resourcePath) { diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XrayRulesSamplerTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XrayRulesSamplerTest.java index 1ca8df347..db314d707 100644 --- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XrayRulesSamplerTest.java +++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XrayRulesSamplerTest.java @@ -21,7 +21,6 @@ import io.opentelemetry.sdk.trace.samplers.SamplingResult; import java.time.Duration; import java.time.Instant; -import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -103,7 +102,7 @@ void updateTargets() { Resource.getDefault(), clock, Sampler.alwaysOn(), - Arrays.asList(rule1, rule4, rule3, rule2)); + asList(rule1, rule4, rule3, rule2)); assertThat(doSample(sampler, "cat-service")) .isEqualTo(SamplingResult.create(SamplingDecision.RECORD_AND_SAMPLE)); @@ -176,6 +175,6 @@ private static SamplingResult doSample(Sampler sampler, String name) { name, SpanKind.CLIENT, Attributes.of(AttributeKey.stringKey("test"), name), - Collections.emptyList()); + emptyList()); } } diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XraySamplerClientTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XraySamplerClientTest.java index 283e3b3c9..916871117 100644 --- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XraySamplerClientTest.java +++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XraySamplerClientTest.java @@ -20,8 +20,6 @@ import java.io.UncheckedIOException; import java.nio.charset.StandardCharsets; import java.time.Instant; -import java.util.Arrays; -import java.util.Collections; import java.util.Date; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -110,7 +108,7 @@ void getSamplingTargets() throws Exception { Date timestamp2 = Date.from(Instant.parse("2018-07-07T00:20:06Z")); GetSamplingTargetsRequest samplingTargetsRequest = GetSamplingTargetsRequest.create( - Arrays.asList( + asList( GetSamplingTargetsRequest.SamplingStatisticsDocument.newBuilder() .setRuleName("Test") .setClientId("ABCDEF1234567890ABCDEF10") @@ -172,9 +170,7 @@ void getSamplingTargets() throws Exception { void getSamplingTargets_malformed() { server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.JSON, "notjson")); assertThatThrownBy( - () -> - client.getSamplingTargets( - GetSamplingTargetsRequest.create(Collections.emptyList()))) + () -> client.getSamplingTargets(GetSamplingTargetsRequest.create(emptyList()))) .isInstanceOf(UncheckedIOException.class) .hasMessage("Failed to deserialize response."); } diff --git a/baggage-processor/src/test/java/io/opentelemetry/contrib/baggage/processor/BaggageProcessorCustomizerTest.java b/baggage-processor/src/test/java/io/opentelemetry/contrib/baggage/processor/BaggageProcessorCustomizerTest.java index bfa8835ae..cd7312794 100644 --- a/baggage-processor/src/test/java/io/opentelemetry/contrib/baggage/processor/BaggageProcessorCustomizerTest.java +++ b/baggage-processor/src/test/java/io/opentelemetry/contrib/baggage/processor/BaggageProcessorCustomizerTest.java @@ -118,7 +118,7 @@ private static OpenTelemetrySdk getOpenTelemetrySdk( @Override public List load(Class spiClass) { if (spiClass == ConfigurableSpanExporterProvider.class) { - return Collections.singletonList( + return singletonList( spiClass.cast( new ConfigurableSpanExporterProvider() { @Override @@ -133,7 +133,7 @@ public String getName() { } })); } else if (spiClass == ConfigurableLogRecordExporterProvider.class) { - return Collections.singletonList( + return singletonList( spiClass.cast( new ConfigurableLogRecordExporterProvider() { @Override @@ -157,7 +157,7 @@ public String getName() { @Test public void test_baggageSpanProcessor_adds_attributes_to_spans(@Mock ReadWriteSpan span) { try (BaggageSpanProcessor processor = - BaggageProcessorCustomizer.createBaggageSpanProcessor(Collections.singletonList("*"))) { + BaggageProcessorCustomizer.createBaggageSpanProcessor(singletonList("*"))) { try (Scope ignore = Baggage.current().toBuilder().put("key", "value").build().makeCurrent()) { processor.onStart(Context.current(), span); verify(span).setAttribute("key", "value"); @@ -169,7 +169,7 @@ public void test_baggageSpanProcessor_adds_attributes_to_spans(@Mock ReadWriteSp public void test_baggageSpanProcessor_adds_attributes_to_spans_when_key_filter_matches( @Mock ReadWriteSpan span) { try (BaggageSpanProcessor processor = - BaggageProcessorCustomizer.createBaggageSpanProcessor(Collections.singletonList("key"))) { + BaggageProcessorCustomizer.createBaggageSpanProcessor(singletonList("key"))) { try (Scope ignore = Baggage.current().toBuilder() .put("key", "value") @@ -187,8 +187,7 @@ public void test_baggageSpanProcessor_adds_attributes_to_spans_when_key_filter_m public void test_baggageLogRecordProcessor_adds_attributes_to_logRecord( @Mock ReadWriteLogRecord logRecord) { try (BaggageLogRecordProcessor processor = - BaggageProcessorCustomizer.createBaggageLogRecordProcessor( - Collections.singletonList("*"))) { + BaggageProcessorCustomizer.createBaggageLogRecordProcessor(singletonList("*"))) { try (Scope ignore = Baggage.current().toBuilder().put("key", "value").build().makeCurrent()) { processor.onEmit(Context.current(), logRecord); verify(logRecord).setAttribute(AttributeKey.stringKey("key"), "value"); @@ -200,8 +199,7 @@ public void test_baggageLogRecordProcessor_adds_attributes_to_logRecord( public void test_baggageLogRecordProcessor_adds_attributes_to_spans_when_key_filter_matches( @Mock ReadWriteLogRecord logRecord) { try (BaggageLogRecordProcessor processor = - BaggageProcessorCustomizer.createBaggageLogRecordProcessor( - Collections.singletonList("key"))) { + BaggageProcessorCustomizer.createBaggageLogRecordProcessor(singletonList("key"))) { try (Scope ignore = Baggage.current().toBuilder() .put("key", "value") diff --git a/compressors/compressor-zstd/src/test/java/io/opentelemetry/contrib/compressor/zstd/ZstdCompressorProviderTest.java b/compressors/compressor-zstd/src/test/java/io/opentelemetry/contrib/compressor/zstd/ZstdCompressorProviderTest.java index b543990f4..104bfbc26 100644 --- a/compressors/compressor-zstd/src/test/java/io/opentelemetry/contrib/compressor/zstd/ZstdCompressorProviderTest.java +++ b/compressors/compressor-zstd/src/test/java/io/opentelemetry/contrib/compressor/zstd/ZstdCompressorProviderTest.java @@ -33,7 +33,6 @@ import java.io.IOException; import java.io.UncheckedIOException; import java.time.Instant; -import java.util.Collections; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -98,7 +97,7 @@ void exporterWithZstd() { .build()) { assertThat( exporter - .export(Collections.singletonList(generateFakeLogRecordData())) + .export(singletonList(generateFakeLogRecordData())) .join(10, TimeUnit.SECONDS) .isSuccess()) .isTrue(); @@ -123,7 +122,7 @@ void exporterWithZstd() { .isEqualTo("log body"); assertThat(logRecord.getAttributesList()) .isEqualTo( - Collections.singletonList( + singletonList( KeyValue.newBuilder() .setKey("key") .setValue( diff --git a/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/OtelTraceState.java b/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/OtelTraceState.java index 8de1fc396..a6853b9ce 100644 --- a/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/OtelTraceState.java +++ b/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/OtelTraceState.java @@ -6,7 +6,6 @@ package io.opentelemetry.contrib.sampler.consistent; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import javax.annotation.Nullable; @@ -34,7 +33,7 @@ private OtelTraceState(int rvalue, int pvalue, List otherKeyValuePairs) } private OtelTraceState() { - this(INVALID_R, INVALID_P, Collections.emptyList()); + this(INVALID_R, INVALID_P, emptyList()); } public boolean hasValidR() { @@ -232,7 +231,7 @@ public static OtelTraceState parse(@Nullable String ts) { } return new OtelTraceState( - r, p, (otherKeyValuePairs != null) ? otherKeyValuePairs : Collections.emptyList()); + r, p, (otherKeyValuePairs != null) ? otherKeyValuePairs : emptyList()); } public int getR() { diff --git a/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent56/OtelTraceState.java b/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent56/OtelTraceState.java index e546b184b..7d6e1fe8a 100644 --- a/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent56/OtelTraceState.java +++ b/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent56/OtelTraceState.java @@ -6,7 +6,6 @@ package io.opentelemetry.contrib.sampler.consistent56; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import javax.annotation.Nullable; @@ -33,7 +32,7 @@ private OtelTraceState() { this( ConsistentSamplingUtil.getInvalidRandomValue(), ConsistentSamplingUtil.getInvalidThreshold(), - Collections.emptyList()); + emptyList()); } public long getRandomValue() { @@ -249,8 +248,6 @@ public static OtelTraceState parse(@Nullable String ts) { } return new OtelTraceState( - randomValue, - threshold, - (otherKeyValuePairs != null) ? otherKeyValuePairs : Collections.emptyList()); + randomValue, threshold, (otherKeyValuePairs != null) ? otherKeyValuePairs : emptyList()); } } diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentRateLimitingSamplerTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentRateLimitingSamplerTest.java index 5097fdd2a..4714153c2 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentRateLimitingSamplerTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentRateLimitingSamplerTest.java @@ -14,7 +14,6 @@ import io.opentelemetry.sdk.trace.samplers.SamplingDecision; import io.opentelemetry.sdk.trace.samplers.SamplingResult; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.SplittableRandom; import java.util.concurrent.TimeUnit; @@ -43,7 +42,7 @@ void init() { name = "name"; spanKind = SpanKind.SERVER; attributes = Attributes.empty(); - parentLinks = Collections.emptyList(); + parentLinks = emptyList(); } private void advanceTime(long nanosIncrement) { diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java index 2fe08bfa3..58b3993a0 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java @@ -225,8 +225,7 @@ void exportSpansToMultipleServices() { SdkTracerProvider.builder() .addSpanProcessor( ConsistentReservoirSamplingSpanProcessor.create( - SpanExporter.composite( - Arrays.asList(waitingSpanExporter1, waitingSpanExporter2)), + SpanExporter.composite(asList(waitingSpanExporter1, waitingSpanExporter2)), RESERVOIR_SIZE, EXPORT_PERIOD_100_MILLIS_AS_NANOS)) .build(); @@ -273,7 +272,7 @@ void exporterThrowsException() { SdkTracerProvider.builder() .addSpanProcessor( ConsistentReservoirSamplingSpanProcessor.create( - SpanExporter.composite(Arrays.asList(failingExporter, workingExporter)), + SpanExporter.composite(asList(failingExporter, workingExporter)), RESERVOIR_SIZE, EXPORT_PERIOD_100_MILLIS_AS_NANOS)) .build(); diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentSamplerTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentSamplerTest.java index 082ac3068..b771a1bf2 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentSamplerTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentSamplerTest.java @@ -22,7 +22,6 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.samplers.SamplingDecision; import io.opentelemetry.sdk.trace.samplers.SamplingResult; -import java.util.Collections; import java.util.List; import java.util.OptionalInt; import java.util.SplittableRandom; @@ -161,7 +160,7 @@ private static void assertConsistentSampling( String name = "name"; SpanKind spanKind = SpanKind.SERVER; Attributes attributes = Attributes.empty(); - List parentLinks = Collections.emptyList(); + List parentLinks = emptyList(); Context parentContext = createParentContext(traceId, spanId, parentP, parentR, parentSampled); ConsistentSampler sampler = createConsistentSampler(samplerP, generatedR); diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentFixedThresholdSamplerTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentFixedThresholdSamplerTest.java index 57d0e3ced..56c50c6e2 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentFixedThresholdSamplerTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentFixedThresholdSamplerTest.java @@ -17,7 +17,6 @@ import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.SamplingDecision; import io.opentelemetry.sdk.trace.samplers.SamplingResult; -import java.util.Collections; import java.util.List; import java.util.SplittableRandom; import org.hipparchus.stat.inference.AlternativeHypothesis; @@ -40,7 +39,7 @@ public void init() { name = "name"; spanKind = SpanKind.SERVER; attributes = Attributes.empty(); - parentLinks = Collections.emptyList(); + parentLinks = emptyList(); } private void testSampling(SplittableRandom rng, double samplingProbability) { diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentRateLimitingSamplerTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentRateLimitingSamplerTest.java index d5cb6b640..eef1f57f5 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentRateLimitingSamplerTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentRateLimitingSamplerTest.java @@ -20,7 +20,6 @@ import io.opentelemetry.sdk.trace.samplers.SamplingDecision; import io.opentelemetry.sdk.trace.samplers.SamplingResult; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.SplittableRandom; import java.util.concurrent.TimeUnit; @@ -50,7 +49,7 @@ void init() { name = "name"; spanKind = SpanKind.SERVER; attributes = Attributes.empty(); - parentLinks = Collections.emptyList(); + parentLinks = emptyList(); random = new SplittableRandom(0L); } diff --git a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentSamplerTest.java b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentSamplerTest.java index 7725bb57a..750e4b40e 100644 --- a/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentSamplerTest.java +++ b/consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/ConsistentSamplerTest.java @@ -18,7 +18,6 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.samplers.SamplingDecision; import io.opentelemetry.sdk.trace.samplers.SamplingResult; -import java.util.Collections; import java.util.List; import java.util.OptionalLong; import org.junit.jupiter.api.Test; @@ -31,7 +30,7 @@ private static class Input { private static final String name = "name"; private static final SpanKind spanKind = SpanKind.SERVER; private static final Attributes attributes = Attributes.empty(); - private static final List parentLinks = Collections.emptyList(); + private static final List parentLinks = emptyList(); private boolean parentSampled = true; private OptionalLong parentThreshold = OptionalLong.empty(); diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/FromDiskExporterImplTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/FromDiskExporterImplTest.java index e7995c675..84cb8a866 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/FromDiskExporterImplTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/FromDiskExporterImplTest.java @@ -26,7 +26,6 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.BeforeEach; @@ -39,7 +38,7 @@ class FromDiskExporterImplTest { private SignalDeserializer deserializer; private Clock clock; private FromDiskExporterImpl exporter; - private final List deserializedData = Collections.emptyList(); + private final List deserializedData = emptyList(); @TempDir File rootDir; private static final String STORAGE_FOLDER_NAME = SignalTypes.spans.name(); diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/SpanFromDiskExporterTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/SpanFromDiskExporterTest.java index 2ea0d2b8a..92783400e 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/SpanFromDiskExporterTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/SpanFromDiskExporterTest.java @@ -33,7 +33,6 @@ import java.io.File; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -112,8 +111,8 @@ private static SpanData makeSpan1(TraceFlags parentSpanContextFlags, long now) { .setTotalRecordedEvents(0) .setTotalRecordedLinks(0) .setTotalAttributeCount(attributes.size()) - .setLinks(Collections.emptyList()) - .setEvents(Collections.emptyList()) + .setLinks(emptyList()) + .setEvents(emptyList()) .setResource(Resource.getDefault()) .build(); } @@ -137,8 +136,8 @@ private static SpanData makeSpan2(TraceFlags parentSpanContextFlags, long now) { .setTotalRecordedEvents(0) .setTotalRecordedLinks(0) .setTotalAttributeCount(attributes.size()) - .setLinks(Collections.emptyList()) - .setEvents(Collections.emptyList()) + .setLinks(emptyList()) + .setEvents(emptyList()) .setResource(Resource.getDefault()) .build(); } diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/ProtoLogsDataMapperTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/ProtoLogsDataMapperTest.java index 9a5d93cd8..9b66f4ee7 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/ProtoLogsDataMapperTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/ProtoLogsDataMapperTest.java @@ -19,7 +19,6 @@ import io.opentelemetry.sdk.logs.data.LogRecordData; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.List; import org.junit.jupiter.api.Test; @@ -102,7 +101,7 @@ class ProtoLogsDataMapperTest { @Test void verifyConversionDataStructure() { - List signals = Collections.singletonList(LOG_RECORD); + List signals = singletonList(LOG_RECORD); ExportLogsServiceRequest result = mapToProto(signals); @@ -181,7 +180,7 @@ void verifyMultipleLogsWithDifferentResource() { @Test void verifyLogWithEventName() { - List signals = Collections.singletonList(LOG_RECORD_WITH_EVENT_NAME); + List signals = singletonList(LOG_RECORD_WITH_EVENT_NAME); ExportLogsServiceRequest result = mapToProto(signals); diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapperTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapperTest.java index 8e8170421..6a47f78e7 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapperTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/MetricDataMapperTest.java @@ -178,8 +178,7 @@ private static List makeDoubleExemplars(TraceFlags flags) { private static MetricData makeLongSum(TraceFlags flags) { LongPointData pointData = makeLongPointData(flags); SumData sumData = - ImmutableSumData.create( - true, AggregationTemporality.DELTA, singletonList(pointData)); + ImmutableSumData.create(true, AggregationTemporality.DELTA, singletonList(pointData)); return ImmutableMetricData.createLongSum( TestData.RESOURCE_FULL, TestData.INSTRUMENTATION_SCOPE_INFO_FULL, @@ -193,8 +192,7 @@ private static MetricData makeLongSum(TraceFlags flags) { private static MetricData makeDoubleSum(TraceFlags flags) { DoublePointData doublePointData = makeDoublePointData(flags); SumData sumData = - ImmutableSumData.create( - true, AggregationTemporality.DELTA, singletonList(doublePointData)); + ImmutableSumData.create(true, AggregationTemporality.DELTA, singletonList(doublePointData)); return ImmutableMetricData.createDoubleSum( TestData.RESOURCE_FULL, @@ -264,8 +262,7 @@ private static MetricData makeHistogram(TraceFlags flags) { makeDoubleExemplars(flags)); HistogramData data = - ImmutableHistogramData.create( - AggregationTemporality.CUMULATIVE, singletonList(dataPoint)); + ImmutableHistogramData.create(AggregationTemporality.CUMULATIVE, singletonList(dataPoint)); return ImmutableMetricData.createDoubleHistogram( TestData.RESOURCE_FULL, diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/ProtoMetricsDataMapperTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/ProtoMetricsDataMapperTest.java index 59d369704..dd63df22f 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/ProtoMetricsDataMapperTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/metrics/ProtoMetricsDataMapperTest.java @@ -17,7 +17,6 @@ import io.opentelemetry.sdk.metrics.data.MetricData; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.List; import org.junit.jupiter.api.Test; @@ -26,9 +25,9 @@ class ProtoMetricsDataMapperTest { @Test void verifyConversionDataStructure() { MetricData gauge1 = TestData.makeLongGauge(TraceFlags.getDefault()); - List signals = Collections.singletonList(gauge1); + List signals = singletonList(gauge1); MetricData expectedGauge1 = TestData.makeLongGauge(TraceFlags.getSampled()); - List expectedSignals = Collections.singletonList(expectedGauge1); + List expectedSignals = singletonList(expectedGauge1); ExportMetricsServiceRequest proto = mapToProto(signals); diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/spans/ProtoSpansDataMapperTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/spans/ProtoSpansDataMapperTest.java index ca325496b..d64e6e008 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/spans/ProtoSpansDataMapperTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/spans/ProtoSpansDataMapperTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.spans; +import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -19,9 +20,7 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; -import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.List; import org.junit.jupiter.api.Test; @@ -48,7 +47,7 @@ class ProtoSpansDataMapperTest { .setEndEpochNanos(2L) .setKind(SpanKind.CLIENT) .setStatus(StatusData.error()) - .setEvents(Collections.singletonList(EVENT_DATA)) + .setEvents(singletonList(EVENT_DATA)) .setLinks(Arrays.asList(LINK_DATA, LINK_DATA_WITH_TRACE_STATE)) .setTotalAttributeCount(10) .setTotalRecordedEvents(2) @@ -67,7 +66,7 @@ class ProtoSpansDataMapperTest { .setEndEpochNanos(2L) .setKind(SpanKind.CLIENT) .setStatus(StatusData.error()) - .setEvents(Collections.singletonList(EVENT_DATA)) + .setEvents(singletonList(EVENT_DATA)) .setLinks(Arrays.asList(LINK_DATA, LINK_DATA_WITH_TRACE_STATE)) .setTotalAttributeCount(10) .setTotalRecordedEvents(2) @@ -86,7 +85,7 @@ class ProtoSpansDataMapperTest { .setEndEpochNanos(2L) .setKind(SpanKind.CLIENT) .setStatus(StatusData.error()) - .setEvents(Collections.singletonList(EVENT_DATA)) + .setEvents(singletonList(EVENT_DATA)) .setLinks(Arrays.asList(LINK_DATA, LINK_DATA_WITH_TRACE_STATE)) .setTotalAttributeCount(10) .setTotalRecordedEvents(2) @@ -105,7 +104,7 @@ class ProtoSpansDataMapperTest { .setEndEpochNanos(2L) .setKind(SpanKind.CLIENT) .setStatus(StatusData.error()) - .setEvents(Collections.singletonList(EVENT_DATA)) + .setEvents(singletonList(EVENT_DATA)) .setLinks(Arrays.asList(LINK_DATA, LINK_DATA_WITH_TRACE_STATE)) .setTotalAttributeCount(10) .setTotalRecordedEvents(2) @@ -114,7 +113,7 @@ class ProtoSpansDataMapperTest { @Test void verifyConversionDataStructure() { - List signals = Collections.singletonList(SPAN_DATA); + List signals = singletonList(SPAN_DATA); ExportTraceServiceRequest proto = mapToProto(signals); diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/serializers/MetricDataSerializerTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/serializers/MetricDataSerializerTest.java index 6d5b68418..9cc385279 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/serializers/MetricDataSerializerTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/serializers/MetricDataSerializerTest.java @@ -45,7 +45,6 @@ import io.opentelemetry.sdk.metrics.internal.data.ImmutableSummaryPointData; import io.opentelemetry.sdk.metrics.internal.data.ImmutableValueAtQuantile; import java.util.Arrays; -import java.util.Collections; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -212,7 +211,7 @@ private static MetricData makeExponentialHistogram(TraceFlags flags) { ImmutableExponentialHistogramBuckets.create(1, 10, Arrays.asList(1L, 10L)); ExponentialHistogramBuckets negativeBucket = - ImmutableExponentialHistogramBuckets.create(1, 0, Collections.emptyList()); + ImmutableExponentialHistogramBuckets.create(1, 0, emptyList()); DoubleExemplarData exemplar = makeDoubleExemplar(flags); ExponentialHistogramPointData pointData = diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/serializers/SpanDataSerializerTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/serializers/SpanDataSerializerTest.java index 20922241c..974ee18fa 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/serializers/SpanDataSerializerTest.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/serializers/SpanDataSerializerTest.java @@ -15,7 +15,6 @@ import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; import java.util.Arrays; -import java.util.Collections; import org.junit.jupiter.api.Test; class SpanDataSerializerTest extends BaseSignalSerializerTest { @@ -43,7 +42,7 @@ void verifySerialization_noFlagsNoState() { .setEndEpochNanos(2L) .setKind(SpanKind.CLIENT) .setStatus(StatusData.error()) - .setEvents(Collections.singletonList(EVENT_DATA)) + .setEvents(singletonList(EVENT_DATA)) .setLinks(Arrays.asList(LINK_DATA, LINK_DATA_WITH_TRACE_STATE)) .setTotalAttributeCount(10) .setTotalRecordedEvents(2) @@ -66,8 +65,8 @@ void verifySerialization_withTraceState() { .setEndEpochNanos(2L) .setKind(SpanKind.CLIENT) .setStatus(StatusData.error()) - .setEvents(Collections.singletonList(EVENT_DATA)) - .setLinks(Collections.singletonList(LINK_DATA)) + .setEvents(singletonList(EVENT_DATA)) + .setLinks(singletonList(LINK_DATA)) .setTotalAttributeCount(10) .setTotalRecordedEvents(2) .setTotalRecordedLinks(2) diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/testutils/TestData.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/testutils/TestData.java index ec69e8024..9dc96ed02 100644 --- a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/testutils/TestData.java +++ b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/testutils/TestData.java @@ -19,7 +19,6 @@ import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongPointData; import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData; import io.opentelemetry.sdk.resources.Resource; -import java.util.Collections; import org.jetbrains.annotations.NotNull; @SuppressWarnings("unchecked") @@ -97,8 +96,7 @@ public static MetricData makeLongGauge(TraceFlags flags, Resource resource) { public static MetricData makeLongGauge( TraceFlags flags, Resource resource, InstrumentationScopeInfo instrumentationScopeInfo) { LongPointData point = makeLongPointData(flags); - GaugeData gaugeData = - ImmutableGaugeData.create(Collections.singletonList(point)); + GaugeData gaugeData = ImmutableGaugeData.create(singletonList(point)); return ImmutableMetricData.createLongGauge( resource, instrumentationScopeInfo, @@ -111,8 +109,7 @@ public static MetricData makeLongGauge( @NotNull public static LongPointData makeLongPointData(TraceFlags flags) { LongExemplarData longExemplarData = makeLongExemplarData(flags); - return ImmutableLongPointData.create( - 1L, 2L, ATTRIBUTES, 1L, Collections.singletonList(longExemplarData)); + return ImmutableLongPointData.create(1L, 2L, ATTRIBUTES, 1L, singletonList(longExemplarData)); } @NotNull diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansProcessorBuilder.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansProcessorBuilder.java index b464f0f42..4ed6d1f39 100644 --- a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansProcessorBuilder.java +++ b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansProcessorBuilder.java @@ -12,7 +12,6 @@ import io.opentelemetry.contrib.inferredspans.internal.SpanAnchoredClock; import java.io.File; import java.time.Duration; -import java.util.Arrays; import java.util.List; import java.util.function.BiConsumer; import javax.annotation.Nullable; @@ -27,7 +26,7 @@ public class InferredSpansProcessorBuilder { private Duration inferredSpansMinDuration = Duration.ZERO; private List includedClasses = WildcardMatcher.matchAllList(); private List excludedClasses = - Arrays.asList( + asList( WildcardMatcher.caseSensitiveMatcher("java.*"), WildcardMatcher.caseSensitiveMatcher("javax.*"), WildcardMatcher.caseSensitiveMatcher("sun.*"), diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/WildcardMatcher.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/WildcardMatcher.java index b6b788c55..9a94cf5a7 100644 --- a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/WildcardMatcher.java +++ b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/WildcardMatcher.java @@ -6,7 +6,6 @@ package io.opentelemetry.contrib.inferredspans; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import javax.annotation.Nullable; @@ -32,7 +31,7 @@ public abstract class WildcardMatcher { private static final String CASE_SENSITIVE_PREFIX = "(?-i)"; private static final String WILDCARD = "*"; private static final WildcardMatcher MATCH_ALL = valueOf(WILDCARD); - private static final List MATCH_ALL_LIST = Collections.singletonList(MATCH_ALL); + private static final List MATCH_ALL_LIST = singletonList(MATCH_ALL); public static WildcardMatcher caseSensitiveMatcher(String matcher) { return valueOf(CASE_SENSITIVE_PREFIX + matcher); diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/ProfilingActivationListener.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/ProfilingActivationListener.java index 343acee39..2361eb59b 100644 --- a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/ProfilingActivationListener.java +++ b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/ProfilingActivationListener.java @@ -37,8 +37,7 @@ public static void ensureInitialized() { // (e.g. after SDK shutdown). However, in theory nothing prevents users from starting // two SDKs at the same time, so it is safest to use a List here. @SuppressWarnings("NonFinalStaticField") - private static volatile List activeListeners = - Collections.emptyList(); + private static volatile List activeListeners = emptyList(); private static class ContextStorageWrapper implements ContextStorage { diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/asyncprofiler/JfrParser.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/asyncprofiler/JfrParser.java index 44c6f9c13..d45b722a6 100644 --- a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/asyncprofiler/JfrParser.java +++ b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/asyncprofiler/JfrParser.java @@ -11,7 +11,6 @@ import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Locale; @@ -39,7 +38,7 @@ public class JfrParser implements Recyclable { private static final byte[] MAGIC_BYTES = new byte[] {'F', 'L', 'R', '\0'}; private static final Set JAVA_FRAME_TYPES = - new HashSet<>(Arrays.asList("Interpreted", "JIT compiled", "Inlined")); + new HashSet<>(asList("Interpreted", "JIT compiled", "Inlined")); private static final int BIG_FILE_BUFFER_SIZE = 5 * 1024 * 1024; private static final int SMALL_FILE_BUFFER_SIZE = 4 * 1024; private static final String SYMBOL_EXCLUDED = "3x cluded"; diff --git a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeSpanifyTest.java b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeSpanifyTest.java index 057fab819..137429c62 100644 --- a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeSpanifyTest.java +++ b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeSpanifyTest.java @@ -21,8 +21,6 @@ import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; import io.opentelemetry.semconv.CodeAttributes; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -104,7 +102,7 @@ void testCallTreeWithActiveSpan() { ObjectPool childPool = ObjectPool.createRecyclable(2, CallTree::new); CallTree.Root root = CallTree.createRoot(rootPool, rootContext.serialize(), 0); - root.addStackTrace(Collections.singletonList(StackFrame.of("A", "a")), 0, childPool, 0); + root.addStackTrace(singletonList(StackFrame.of("A", "a")), 0, childPool, 0); String childSpanId = "a1b2c3d4e5f64242"; TraceContext spanContext = @@ -115,12 +113,12 @@ void testCallTreeWithActiveSpan() { root.onActivation(spanContext.serialize(), TimeUnit.MILLISECONDS.toNanos(5)); root.addStackTrace( - Arrays.asList(StackFrame.of("A", "b"), StackFrame.of("A", "a")), + asList(StackFrame.of("A", "b"), StackFrame.of("A", "a")), TimeUnit.MILLISECONDS.toNanos(10), childPool, 0); root.addStackTrace( - Arrays.asList(StackFrame.of("A", "b"), StackFrame.of("A", "a")), + asList(StackFrame.of("A", "b"), StackFrame.of("A", "a")), TimeUnit.MILLISECONDS.toNanos(20), childPool, 0); @@ -128,10 +126,7 @@ void testCallTreeWithActiveSpan() { spanContext.serialize(), rootContext.serialize(), TimeUnit.MILLISECONDS.toNanos(25)); root.addStackTrace( - Collections.singletonList(StackFrame.of("A", "a")), - TimeUnit.MILLISECONDS.toNanos(30), - childPool, - 0); + singletonList(StackFrame.of("A", "a")), TimeUnit.MILLISECONDS.toNanos(30), childPool, 0); root.end(childPool, 0); assertThat(root.getCount()).isEqualTo(4); @@ -194,12 +189,12 @@ void testSpanWithInvertedActivation() { ObjectPool childPool = ObjectPool.createRecyclable(2, CallTree::new); CallTree.Root root = CallTree.createRoot(rootPool, childSpanContext.serialize(), 0); - root.addStackTrace(Collections.singletonList(StackFrame.of("A", "a")), 10_000, childPool, 0); + root.addStackTrace(singletonList(StackFrame.of("A", "a")), 10_000, childPool, 0); root.onActivation(rootContext.serialize(), 20_000); root.onDeactivation(rootContext.serialize(), childSpanContext.serialize(), 30_000); - root.addStackTrace(Collections.singletonList(StackFrame.of("A", "a")), 40_000, childPool, 0); + root.addStackTrace(singletonList(StackFrame.of("A", "a")), 40_000, childPool, 0); root.end(childPool, 0); InMemorySpanExporter exporter = InMemorySpanExporter.create(); @@ -238,12 +233,12 @@ void testSpanWithNestedActivation() { ObjectPool childPool = ObjectPool.createRecyclable(2, CallTree::new); CallTree.Root root = CallTree.createRoot(rootPool, rootContext.serialize(), 0); - root.addStackTrace(Collections.singletonList(StackFrame.of("A", "a")), 10_000, childPool, 0); + root.addStackTrace(singletonList(StackFrame.of("A", "a")), 10_000, childPool, 0); root.onActivation(rootContext.serialize(), 20_000); root.onDeactivation(rootContext.serialize(), rootContext.serialize(), 30_000); - root.addStackTrace(Collections.singletonList(StackFrame.of("A", "a")), 40_000, childPool, 0); + root.addStackTrace(singletonList(StackFrame.of("A", "a")), 40_000, childPool, 0); root.end(childPool, 0); InMemorySpanExporter exporter = InMemorySpanExporter.create(); diff --git a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeTest.java b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeTest.java index 0c3a629c9..3f540ffd0 100644 --- a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeTest.java +++ b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/CallTreeTest.java @@ -68,19 +68,19 @@ void testCallTree() { CallTree.createRoot( ObjectPool.createRecyclable(100, CallTree.Root::new), traceContext.serialize(), 0); ObjectPool callTreePool = ObjectPool.createRecyclable(100, CallTree::new); - root.addStackTrace(Arrays.asList(StackFrame.of("A", "a")), 0, callTreePool, 0); + root.addStackTrace(asList(StackFrame.of("A", "a")), 0, callTreePool, 0); root.addStackTrace( - Arrays.asList(StackFrame.of("A", "b"), StackFrame.of("A", "a")), + asList(StackFrame.of("A", "b"), StackFrame.of("A", "a")), TimeUnit.MILLISECONDS.toNanos(10), callTreePool, 0); root.addStackTrace( - Arrays.asList(StackFrame.of("A", "b"), StackFrame.of("A", "a")), + asList(StackFrame.of("A", "b"), StackFrame.of("A", "a")), TimeUnit.MILLISECONDS.toNanos(20), callTreePool, 0); root.addStackTrace( - Arrays.asList(StackFrame.of("A", "a")), TimeUnit.MILLISECONDS.toNanos(30), callTreePool, 0); + asList(StackFrame.of("A", "a")), TimeUnit.MILLISECONDS.toNanos(30), callTreePool, 0); root.end(callTreePool, 0); assertThat(root.getCount()).isEqualTo(4); @@ -161,7 +161,7 @@ void testShouldNotCreateInferredSpansForPillarsAndLeafShouldHaveStacktrace() thr }, new Object[][] { {"a", 3}, - {" d", 1, Arrays.asList("c", "b")} + {" d", 1, asList("c", "b")} }); } @@ -227,7 +227,7 @@ void testCallTreeWithSpanActivations() throws Exception { {" 2", 7}, {" b", 2}, {" c", 1}, - {" e", 1, Arrays.asList("d")}, + {" e", 1, asList("d")}, }); } @@ -308,7 +308,7 @@ void testDectivationBeforeEnd_DontStealChildIdsOfUnrelatedActivations() throws E new Object[][] { {"a", 9}, {" 1", 2}, - {" c", 3, Arrays.asList("b")}, + {" c", 3, asList("b")}, {" 2", 2}, }); assertThat(spans.get("a").getLinks()) @@ -339,7 +339,7 @@ void testDectivationBeforeEnd_DontStealChildIdsOfUnrelatedActivations_Nested() t new Object[][] { {"a", 11}, {" 1", 2}, - {" c", 4, Arrays.asList("b")}, + {" c", 4, asList("b")}, {" 2", 4}, {" 3", 2}, }); @@ -494,7 +494,7 @@ void testNestedActivationAfterMethodEnds_RootChangesToC() throws Exception { }, new Object[][] { {"1", 11}, - {" b", 2, Arrays.asList("a")}, + {" b", 2, asList("a")}, {" 2", 6}, {" 3", 4}, {" c", 2} @@ -520,7 +520,7 @@ void testRegularActivationFollowedByNestedActivationAfterMethodEnds() throws Exc }, new Object[][] { {"1", 13}, - {" b", 4, Arrays.asList("a")}, + {" b", 4, asList("a")}, {" 2", 2}, {" 3", 6}, {" 4", 4}, @@ -598,7 +598,7 @@ void testActivationAfterMethodEnds_RootChangesToB() throws Exception { {"1", 9}, {" a", 2}, {" 2", 4}, - {" c", 2, Arrays.asList("b")} + {" c", 2, asList("b")} }); } @@ -883,7 +883,7 @@ private Map assertCallTree( String spanName = ((String) expectedSpan[0]).trim(); int durationMs = (int) expectedSpan[1] * 10; List stackTrace = - expectedSpan.length == 3 ? (List) expectedSpan[2] : Arrays.asList(); + expectedSpan.length == 3 ? (List) expectedSpan[2] : asList(); int nestingLevel = getNestingLevel((String) expectedSpan[0]); String parentName = getParentName(expectedSpans, i, nestingLevel); if (parentName == null) { diff --git a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/ThreadMatcherTest.java b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/ThreadMatcherTest.java index 22afe15cf..7b6a615e9 100644 --- a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/ThreadMatcherTest.java +++ b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/ThreadMatcherTest.java @@ -8,7 +8,6 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; @@ -34,6 +33,6 @@ public void accept(Thread thread, List state) { } }, threads); - assertThat(threads).isEqualTo(Arrays.asList(Thread.currentThread())); + assertThat(threads).isEqualTo(asList(Thread.currentThread())); } } diff --git a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/asyncprofiler/JfrParserTest.java b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/asyncprofiler/JfrParserTest.java index 60273534b..00e5b7c03 100644 --- a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/asyncprofiler/JfrParserTest.java +++ b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/asyncprofiler/JfrParserTest.java @@ -13,7 +13,6 @@ import java.nio.ByteBuffer; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Collections; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.Test; @@ -42,9 +41,8 @@ void name() throws Exception { jfrParser.parse( file, - Collections.emptyList(), - Collections.singletonList( - caseSensitiveMatcher("io.opentelemetry.contrib.inferredspans.*"))); + emptyList(), + singletonList(caseSensitiveMatcher("io.opentelemetry.contrib.inferredspans.*"))); AtomicInteger stackTraces = new AtomicInteger(); ArrayList stackFrames = new ArrayList<>(); jfrParser.consumeStackTraces( diff --git a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/util/OtelReflectionUtils.java b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/util/OtelReflectionUtils.java index 45fe3043f..149238436 100644 --- a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/util/OtelReflectionUtils.java +++ b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/util/OtelReflectionUtils.java @@ -12,7 +12,6 @@ import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.SpanProcessor; import java.lang.reflect.Field; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; import org.junit.platform.commons.support.HierarchyTraversalMode; @@ -58,7 +57,7 @@ private static List flattenCompositeProcessor( return childProcessors; } } else { - return Collections.singletonList(active); + return singletonList(active); } } diff --git a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/AbstractIntegrationTest.java b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/AbstractIntegrationTest.java index e3a728f58..8f44827a5 100644 --- a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/AbstractIntegrationTest.java +++ b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/AbstractIntegrationTest.java @@ -102,7 +102,7 @@ protected GenericContainer buildScraper(String otlpEndpoint) { if (configFromStdin) { String cmd = String.join(" ", scraperCommand); - scraperCommand = Arrays.asList("sh", "-c", "cat /app/" + configName + " | " + cmd + " -"); + scraperCommand = asList("sh", "-c", "cat /app/" + configName + " | " + cmd + " -"); } else { scraperCommand.add("/app/" + configName); } @@ -175,7 +175,7 @@ private static void waitAndAssertMetrics(Runnable assertion) { @SafeVarargs @SuppressWarnings("varargs") protected final void waitAndAssertMetrics(Consumer... assertions) { - waitAndAssertMetrics(Arrays.asList(assertions)); + waitAndAssertMetrics(asList(assertions)); } protected void assertGauge(Metric metric, String name, String description, String unit) { diff --git a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/CassandraIntegrationTest.java b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/CassandraIntegrationTest.java index fa65e3dc5..dcf624235 100644 --- a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/CassandraIntegrationTest.java +++ b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/CassandraIntegrationTest.java @@ -8,7 +8,6 @@ import static org.assertj.core.api.Assertions.entry; import io.opentelemetry.contrib.jmxmetrics.AbstractIntegrationTest; -import java.util.Arrays; import java.util.List; import java.util.function.Consumer; import org.assertj.core.api.MapAssert; @@ -133,8 +132,8 @@ void endToEnd() { @SuppressWarnings("unchecked") private static Consumer>[] getRequestErrorCountAttributes() { - List operations = Arrays.asList("RangeSlice", "Read", "Write"); - List statuses = Arrays.asList("Timeout", "Failure", "Unavailable"); + List operations = asList("RangeSlice", "Read", "Write"); + List statuses = asList("Timeout", "Failure", "Unavailable"); return operations.stream() .flatMap( diff --git a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/JvmTargetSystemIntegrationTest.java b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/JvmTargetSystemIntegrationTest.java index 682e23957..86f93aa9f 100644 --- a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/JvmTargetSystemIntegrationTest.java +++ b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/JvmTargetSystemIntegrationTest.java @@ -6,7 +6,6 @@ package io.opentelemetry.contrib.jmxmetrics.target_systems; import io.opentelemetry.contrib.jmxmetrics.AbstractIntegrationTest; -import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; import org.testcontainers.containers.GenericContainer; @@ -23,7 +22,7 @@ class JvmTargetSystemIntegrationTest extends AbstractIntegrationTest { @Test void endToEnd() { List gcLabels = - Arrays.asList( + asList( "Code Cache", "Par Eden Space", "CMS Old Gen", @@ -38,14 +37,14 @@ void endToEnd() { "jvm.gc.collections.count", "total number of collections that have occurred", "{collection}", - Arrays.asList("ConcurrentMarkSweep", "ParNew")), + asList("ConcurrentMarkSweep", "ParNew")), metric -> assertTypedSum( metric, "jvm.gc.collections.elapsed", "the approximate accumulated collection elapsed time in milliseconds", "ms", - Arrays.asList("ConcurrentMarkSweep", "ParNew")), + asList("ConcurrentMarkSweep", "ParNew")), metric -> assertGauge(metric, "jvm.memory.heap.committed", "current heap usage", "By"), metric -> assertGauge(metric, "jvm.memory.heap.init", "current heap usage", "By"), metric -> assertGauge(metric, "jvm.memory.heap.max", "current heap usage", "By"), diff --git a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/KafkaIntegrationTest.java b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/KafkaIntegrationTest.java index 4c2c9293c..1c20be5c3 100644 --- a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/KafkaIntegrationTest.java +++ b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/KafkaIntegrationTest.java @@ -14,7 +14,6 @@ import java.io.IOException; import java.time.Duration; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Set; @@ -98,7 +97,7 @@ protected GenericContainer kafkaProducerContainer() { } List> kafkaBrokerAssertions() { - return Arrays.asList( + return asList( metric -> assertSumWithAttributes( metric, @@ -228,7 +227,7 @@ static class KafkaConsumerIntegrationTest extends KafkaIntegrationTest { @Test void endToEnd() { - List topics = Arrays.asList("test-topic-1", "test-topic-2", "test-topic-3"); + List topics = asList("test-topic-1", "test-topic-2", "test-topic-3"); waitAndAssertMetrics( metric -> assertKafkaGauge( @@ -293,7 +292,7 @@ static class KafkaProducerIntegrationTest extends KafkaIntegrationTest { @Test void endToEnd() { - List topics = Collections.singletonList("test-topic-1"); + List topics = singletonList("test-topic-1"); waitAndAssertMetrics( metric -> assertKafkaGauge( @@ -371,7 +370,7 @@ static class KafkaAndJvmIntegrationText extends KafkaIntegrationTest { @Test void endToEnd() { List gcLabels = - Arrays.asList( + asList( "CodeHeap 'non-nmethods'", "CodeHeap 'non-profiled nmethods'", "CodeHeap 'profiled nmethods'", @@ -382,7 +381,7 @@ void endToEnd() { "Metaspace"); List> assertions = new ArrayList<>(kafkaBrokerAssertions()); assertions.addAll( - Arrays.asList( + asList( metric -> assertGauge(metric, "jvm.classes.loaded", "number of loaded classes", "{class}"), metric -> @@ -391,14 +390,14 @@ void endToEnd() { "jvm.gc.collections.count", "total number of collections that have occurred", "{collection}", - Arrays.asList("G1 Young Generation", "G1 Old Generation")), + asList("G1 Young Generation", "G1 Old Generation")), metric -> assertTypedSum( metric, "jvm.gc.collections.elapsed", "the approximate accumulated collection elapsed time in milliseconds", "ms", - Arrays.asList("G1 Young Generation", "G1 Old Generation")), + asList("G1 Young Generation", "G1 Old Generation")), metric -> assertGauge(metric, "jvm.memory.heap.committed", "current heap usage", "By"), metric -> assertGauge(metric, "jvm.memory.heap.init", "current heap usage", "By"), diff --git a/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/JmxClient.java b/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/JmxClient.java index a725a77c8..d1e4e8d98 100644 --- a/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/JmxClient.java +++ b/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/JmxClient.java @@ -86,7 +86,7 @@ public MBeanServerConnection getConnection() { public List query(final ObjectName objectName) { MBeanServerConnection mbsc = getConnection(); if (mbsc == null) { - return Collections.emptyList(); + return emptyList(); } try { @@ -95,7 +95,7 @@ public List query(final ObjectName objectName) { return objectNames; } catch (IOException e) { logger.log(Level.WARNING, "Could not query remote JMX server: ", e); - return Collections.emptyList(); + return emptyList(); } } } diff --git a/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/JmxConfig.java b/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/JmxConfig.java index dde7b6f6c..2efa6bba6 100644 --- a/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/JmxConfig.java +++ b/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/JmxConfig.java @@ -5,7 +5,6 @@ package io.opentelemetry.contrib.jmxmetrics; -import java.util.Arrays; import java.util.LinkedHashSet; import java.util.List; import java.util.Properties; @@ -36,7 +35,7 @@ class JmxConfig { // These properties need to be copied into System Properties if provided via the property // file so that they are available to the JMX Connection builder static final List JAVA_SYSTEM_PROPERTIES = - Arrays.asList( + asList( "javax.net.ssl.keyStore", "javax.net.ssl.keyStorePassword", "javax.net.ssl.keyStoreType", @@ -45,7 +44,7 @@ class JmxConfig { "javax.net.ssl.trustStoreType"); static final List AVAILABLE_TARGET_SYSTEMS = - Arrays.asList( + asList( "activemq", "cassandra", "hbase", @@ -93,8 +92,7 @@ class JmxConfig { groovyScript = properties.getProperty(GROOVY_SCRIPT); targetSystem = properties.getProperty(TARGET_SYSTEM, "").toLowerCase().trim(); - List targets = - Arrays.asList(isBlank(targetSystem) ? new String[0] : targetSystem.split(",")); + List targets = asList(isBlank(targetSystem) ? new String[0] : targetSystem.split(",")); targetSystems = new LinkedHashSet<>(targets); int interval = getProperty(INTERVAL_MILLISECONDS, 10000); diff --git a/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/GroovyRunnerTest.java b/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/GroovyRunnerTest.java index 4a6338658..3962993dc 100644 --- a/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/GroovyRunnerTest.java +++ b/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/GroovyRunnerTest.java @@ -9,7 +9,6 @@ import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.Collections; import java.util.List; import javax.management.ObjectName; import org.junit.jupiter.api.Test; @@ -31,7 +30,7 @@ void loadTargetScript() throws Exception { new JmxClient(config) { @Override public List query(ObjectName objectName) { - return Collections.emptyList(); + return emptyList(); } }; @@ -69,7 +68,7 @@ void loadScriptAndTargetSystems() throws Exception { new JmxClient(config) { @Override public List query(ObjectName objectName) { - return Collections.emptyList(); + return emptyList(); } }; @@ -94,7 +93,7 @@ void loadScriptAndTargetSystemWithBlankInputForScript() throws Exception { new JmxClient(config) { @Override public List query(ObjectName objectName) { - return Collections.emptyList(); + return emptyList(); } }; diff --git a/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java b/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java index 6a9886fe8..7fdc93f27 100644 --- a/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java +++ b/jmx-metrics/src/test/java/io/opentelemetry/contrib/jmxmetrics/MBeanHelperTest.java @@ -11,7 +11,6 @@ import groovy.lang.Closure; import groovy.util.Eval; -import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Map; @@ -86,7 +85,7 @@ void multiObj() throws Exception { registerThings(thingName); MBeanHelper mBeanHelper = - new MBeanHelper(jmxClient, Arrays.asList(thingName + ",thing=0", thingName + ",thing=1")); + new MBeanHelper(jmxClient, asList(thingName + ",thing=0", thingName + ",thing=1")); mBeanHelper.fetch(); assertThat(mBeanHelper.getAttribute("SomeAttribute")) .hasSameElementsAs( diff --git a/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerTest.java b/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerTest.java index 11e32c246..b1fbe185a 100644 --- a/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerTest.java +++ b/maven-extension/src/test/java/io/opentelemetry/maven/handler/MojoGoalExecutionHandlerTest.java @@ -6,7 +6,6 @@ package io.opentelemetry.maven.handler; import static java.util.Arrays.asList; -import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; @@ -67,8 +66,7 @@ public void testMavenDeploy() throws Exception { List supportedGoals = mavenDeployHandler.getSupportedGoals(); assertThat(supportedGoals) - .isEqualTo( - singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + .isEqualTo(singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = @@ -109,8 +107,7 @@ public void testSpringBootBuildImage_springboot_1() throws Exception { List supportedGoals = buildImageHandler.getSupportedGoals(); assertThat(supportedGoals) - .isEqualTo( - singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + .isEqualTo(singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = @@ -153,8 +150,7 @@ public void testSpringBootBuildImage_springboot_2() throws Exception { List supportedGoals = buildImageHandler.getSupportedGoals(); assertThat(supportedGoals) - .isEqualTo( - singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + .isEqualTo(singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = @@ -197,8 +193,7 @@ public void testGoogleJibBuild_jib_1() throws Exception { List supportedGoals = buildImageHandler.getSupportedGoals(); assertThat(supportedGoals) - .isEqualTo( - singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + .isEqualTo(singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = @@ -238,8 +233,7 @@ public void testGoogleJibBuild_jib_2() throws Exception { List supportedGoals = buildImageHandler.getSupportedGoals(); assertThat(supportedGoals) - .isEqualTo( - singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + .isEqualTo(singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = @@ -279,8 +273,7 @@ public void testSnykTest_snyk_1() throws Exception { List supportedGoals = snykTestHandler.getSupportedGoals(); assertThat(supportedGoals) - .isEqualTo( - singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + .isEqualTo(singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = @@ -315,8 +308,7 @@ public void testSnykMonitor_snyk_1() throws Exception { List supportedGoals = snykTestHandler.getSupportedGoals(); assertThat(supportedGoals) - .isEqualTo( - singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); + .isEqualTo(singletonList(MavenGoal.create(mojoGroupId, mojoArtifactId, mojoGoal))); try (SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder().build()) { SpanBuilder spanBuilder = diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleCounterTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleCounterTest.java index 5b755da5f..649ada5a1 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleCounterTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerDoubleCounterTest.java @@ -24,7 +24,6 @@ import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterProviderSharedState; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterSharedState; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -188,7 +187,7 @@ void addWithAttributesAndAttributesAdvice() { ((ExtendedDoubleCounterBuilder) builder) .setAttributesAdvice( - Arrays.asList( + asList( AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_NAME), AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_VERSION), AttributeKey.stringKey("key"))); @@ -348,7 +347,7 @@ void observableWithAttributesAndAttributesAdvice() { ((ExtendedDoubleCounterBuilder) builder) .setAttributesAdvice( - Arrays.asList( + asList( AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_NAME), AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_VERSION), AttributeKey.stringKey("key"))); diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongCounterTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongCounterTest.java index 34423fb14..3a8810004 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongCounterTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongCounterTest.java @@ -24,7 +24,6 @@ import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterProviderSharedState; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterSharedState; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicLong; import org.junit.jupiter.api.BeforeEach; @@ -67,7 +66,7 @@ void add() { assertThat(id.getName()).isEqualTo("counter"); assertThat(id.getTags()) .isEqualTo( - Arrays.asList( + asList( Tag.of(Constants.OTEL_INSTRUMENTATION_NAME, "meter"), Tag.of(Constants.OTEL_INSTRUMENTATION_VERSION, "1.0"))); assertThat(id.getDescription()).isEqualTo("description"); @@ -110,7 +109,7 @@ void addWithAttributes() { assertThat(id.getName()).isEqualTo("counter"); assertThat(id.getTags()) .isEqualTo( - Arrays.asList( + asList( Tag.of("key", "value"), Tag.of(Constants.OTEL_INSTRUMENTATION_NAME, "meter"), Tag.of(Constants.OTEL_INSTRUMENTATION_VERSION, "1.0"))); @@ -154,7 +153,7 @@ void addWithAttributesAndContext() { assertThat(id.getName()).isEqualTo("counter"); assertThat(id.getTags()) .isEqualTo( - Arrays.asList( + asList( Tag.of("key", "value"), Tag.of(Constants.OTEL_INSTRUMENTATION_NAME, "meter"), Tag.of(Constants.OTEL_INSTRUMENTATION_VERSION, "1.0"))); @@ -188,7 +187,7 @@ void addWithAttributesAndAttributesAdvice() { ((ExtendedLongCounterBuilder) builder) .setAttributesAdvice( - Arrays.asList( + asList( AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_NAME), AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_VERSION), AttributeKey.stringKey("key"))); @@ -207,7 +206,7 @@ void addWithAttributesAndAttributesAdvice() { assertThat(id.getName()).isEqualTo("counter"); assertThat(id.getTags()) .isEqualTo( - Arrays.asList( + asList( Tag.of("key", "value"), Tag.of(Constants.OTEL_INSTRUMENTATION_NAME, "meter"), Tag.of(Constants.OTEL_INSTRUMENTATION_VERSION, "1.0"))); @@ -343,7 +342,7 @@ void observableWithAttributesAndAttributesAdvice() { ((ExtendedLongCounterBuilder) builder) .setAttributesAdvice( - Arrays.asList( + asList( AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_NAME), AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_VERSION), AttributeKey.stringKey("key"))); diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongHistogramTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongHistogramTest.java index 3d2edfeec..58de26786 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongHistogramTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongHistogramTest.java @@ -5,6 +5,7 @@ package io.opentelemetry.contrib.metrics.micrometer.internal.instruments; +import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; @@ -24,7 +25,6 @@ import io.opentelemetry.contrib.metrics.micrometer.internal.Constants; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterProviderSharedState; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterSharedState; -import java.util.Arrays; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -172,7 +172,7 @@ void addWithAttributesAndAttributesAdvice() { ((ExtendedLongHistogramBuilder) builder) .setAttributesAdvice( - Arrays.asList( + asList( AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_NAME), AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_VERSION), AttributeKey.stringKey("key"))); @@ -218,7 +218,7 @@ void addWithExplicitBucketBoundaries() { .ofLongs() .setDescription("description") .setUnit("unit") - .setExplicitBucketBoundariesAdvice(Arrays.asList(10L, 20L, 30L)) + .setExplicitBucketBoundariesAdvice(asList(10L, 20L, 30L)) .build(); underTest.record(5L); diff --git a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongUpDownCounterTest.java b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongUpDownCounterTest.java index bc73dcb5d..e088343ae 100644 --- a/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongUpDownCounterTest.java +++ b/micrometer-meter-provider/src/test/java/io/opentelemetry/contrib/metrics/micrometer/internal/instruments/MicrometerLongUpDownCounterTest.java @@ -23,7 +23,6 @@ import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterProviderSharedState; import io.opentelemetry.contrib.metrics.micrometer.internal.state.MeterSharedState; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicLong; import org.junit.jupiter.api.BeforeEach; @@ -184,7 +183,7 @@ void addWithAttributesAndAttributesAdvice() { ((ExtendedLongUpDownCounterBuilder) builder) .setAttributesAdvice( - Arrays.asList( + asList( AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_NAME), AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_VERSION), AttributeKey.stringKey("key"))); @@ -334,7 +333,7 @@ void observableWithAttributesAndAttributesAdvice() { ((ExtendedLongUpDownCounterBuilder) builder) .setAttributesAdvice( - Arrays.asList( + asList( AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_NAME), AttributeKey.stringKey(Constants.OTEL_INSTRUMENTATION_VERSION), AttributeKey.stringKey("key"))); diff --git a/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/recipe/RecipeManagerTest.java b/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/recipe/RecipeManagerTest.java index 2da1d13ec..1a3ac34dd 100644 --- a/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/recipe/RecipeManagerTest.java +++ b/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/recipe/RecipeManagerTest.java @@ -9,7 +9,6 @@ import io.opentelemetry.opamp.client.internal.request.Field; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.List; import javax.annotation.Nonnull; @@ -61,6 +60,6 @@ void verifyPreviousFields() { @Nonnull private static List getFieldsAsList(Field... fields) { - return new ArrayList<>(Arrays.asList(fields)); + return new ArrayList<>(asList(fields)); } } diff --git a/resource-providers/src/main/java/io/opentelemetry/contrib/resourceproviders/CommonAppServersServiceNameDetector.java b/resource-providers/src/main/java/io/opentelemetry/contrib/resourceproviders/CommonAppServersServiceNameDetector.java index 5dc2bf723..b36a869f2 100644 --- a/resource-providers/src/main/java/io/opentelemetry/contrib/resourceproviders/CommonAppServersServiceNameDetector.java +++ b/resource-providers/src/main/java/io/opentelemetry/contrib/resourceproviders/CommonAppServersServiceNameDetector.java @@ -6,7 +6,6 @@ package io.opentelemetry.contrib.resourceproviders; import java.net.URL; -import java.util.Arrays; import java.util.List; import javax.annotation.Nullable; @@ -24,7 +23,7 @@ private CommonAppServersServiceNameDetector() {} private static List detectors() { ResourceLocator locator = new ResourceLocatorImpl(); - return Arrays.asList( + return asList( detectorFor(new TomeeAppServer(locator)), detectorFor(new TomcatAppServer(locator)), detectorFor(new JettyAppServer(locator)), diff --git a/resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/DelegatingServiceNameDetectorTest.java b/resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/DelegatingServiceNameDetectorTest.java index 2fa490afc..ade21fe1d 100644 --- a/resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/DelegatingServiceNameDetectorTest.java +++ b/resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/DelegatingServiceNameDetectorTest.java @@ -10,7 +10,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; @@ -21,7 +20,7 @@ void detect() throws Exception { ServiceNameDetector d1 = mock(ServiceNameDetector.class); ServiceNameDetector d2 = mock(ServiceNameDetector.class); when(d2.detect()).thenReturn("zzz"); - List delegates = Arrays.asList(d1, d2); + List delegates = asList(d1, d2); DelegatingServiceNameDetector detector = new DelegatingServiceNameDetector(delegates); String result = detector.detect(); @@ -33,7 +32,7 @@ void detect() throws Exception { void detectNothing() throws Exception { ServiceNameDetector d1 = mock(ServiceNameDetector.class); ServiceNameDetector d2 = mock(ServiceNameDetector.class); - List delegates = Arrays.asList(d1, d2); + List delegates = asList(d1, d2); DelegatingServiceNameDetector detector = new DelegatingServiceNameDetector(delegates); String result = detector.detect(); @@ -48,7 +47,7 @@ void delegateThrowsButIterationContinues() throws Exception { ServiceNameDetector d2 = mock(ServiceNameDetector.class); when(d1.detect()).thenThrow(new RuntimeException("kablooey!")); when(d2.detect()).thenReturn("bbb"); - List delegates = Arrays.asList(d1, d2); + List delegates = asList(d1, d2); DelegatingServiceNameDetector detector = new DelegatingServiceNameDetector(delegates); String result = detector.detect(); diff --git a/samplers/src/test/java/internal/RuleBasedRoutingSamplerComponentProviderTest.java b/samplers/src/test/java/internal/RuleBasedRoutingSamplerComponentProviderTest.java index 02611c9d5..f9b6b30c6 100644 --- a/samplers/src/test/java/internal/RuleBasedRoutingSamplerComponentProviderTest.java +++ b/samplers/src/test/java/internal/RuleBasedRoutingSamplerComponentProviderTest.java @@ -23,7 +23,6 @@ import io.opentelemetry.sdk.trace.samplers.SamplingResult; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; -import java.util.Collections; import java.util.stream.Stream; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -79,7 +78,7 @@ void endToEnd() { "GET /actuator/health", SpanKind.SERVER, Attributes.builder().put("url.path", "/actuator/health").build(), - Collections.emptyList())) + emptyList())) .isEqualTo(SamplingResult.drop()); // SERVER span to other path should be recorded and sampled @@ -90,7 +89,7 @@ void endToEnd() { "GET /actuator/health", SpanKind.SERVER, Attributes.builder().put("url.path", "/v1/users").build(), - Collections.emptyList())) + emptyList())) .isEqualTo(SamplingResult.recordAndSample()); } diff --git a/samplers/src/test/java/io/opentelemetry/contrib/sampler/LinksBasedSamplerTest.java b/samplers/src/test/java/io/opentelemetry/contrib/sampler/LinksBasedSamplerTest.java index fd46d8134..4180f8b2e 100644 --- a/samplers/src/test/java/io/opentelemetry/contrib/sampler/LinksBasedSamplerTest.java +++ b/samplers/src/test/java/io/opentelemetry/contrib/sampler/LinksBasedSamplerTest.java @@ -20,7 +20,6 @@ import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.SamplingDecision; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -57,7 +56,7 @@ void testEmptyAlwaysTrueRoot() { SPAN_NAME, SPAN_KIND, Attributes.empty(), - Collections.emptyList()) + emptyList()) .getDecision()) .isEqualTo(SamplingDecision.RECORD_AND_SAMPLE); } @@ -72,7 +71,7 @@ void testEmptyAlwaysFalseRoot() { SPAN_NAME, SPAN_KIND, Attributes.empty(), - Collections.emptyList()) + emptyList()) .getDecision()) .isEqualTo(SamplingDecision.DROP); }