From 38e38cb29ffdc27a0018dd8ea22b89cd09bca32b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 15:13:11 -0500 Subject: [PATCH] Bump com.diffplug.spotless:spotless-plugin-gradle from 6.17.0 to 6.18.0 (#5352) * Bump com.diffplug.spotless:spotless-plugin-gradle from 6.17.0 to 6.18.0 Bumps [com.diffplug.spotless:spotless-plugin-gradle](https://github.com/diffplug/spotless) from 6.17.0 to 6.18.0. - [Release notes](https://github.com/diffplug/spotless/releases) - [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md) - [Commits](https://github.com/diffplug/spotless/compare/gradle/6.17.0...gradle/6.18.0) --- updated-dependencies: - dependency-name: com.diffplug.spotless:spotless-plugin-gradle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * spotless --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jack Berg --- .../io/opentelemetry/api/trace/SpanContext.java | 8 ++++---- buildSrc/build.gradle.kts | 2 +- .../trace/zpages/TraceConfigzZPageHandler.java | 14 +++++++------- .../metrics/export/PeriodicMetricReaderTest.java | 3 ++- .../io/opentelemetry/sdk/trace/SdkSpanTest.java | 6 +++--- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/api/all/src/main/java/io/opentelemetry/api/trace/SpanContext.java b/api/all/src/main/java/io/opentelemetry/api/trace/SpanContext.java index 2c19fc387a..f7832c62b0 100644 --- a/api/all/src/main/java/io/opentelemetry/api/trace/SpanContext.java +++ b/api/all/src/main/java/io/opentelemetry/api/trace/SpanContext.java @@ -56,8 +56,8 @@ public interface SpanContext { spanIdHex, traceFlags, traceState, - /* remote=*/ false, - /* skipIdValidation=*/ false); + /* remote= */ false, + /* skipIdValidation= */ false); } /** @@ -82,8 +82,8 @@ public interface SpanContext { spanIdHex, traceFlags, traceState, - /* remote=*/ true, - /* skipIdValidation=*/ false); + /* remote= */ true, + /* skipIdValidation= */ false); } /** diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 1719d9be1b..b31d839fd6 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -33,7 +33,7 @@ repositories { dependencies { implementation("com.google.auto.value:auto-value-annotations:1.10.1") // When updating, update above in plugins too - implementation("com.diffplug.spotless:spotless-plugin-gradle:6.17.0") + implementation("com.diffplug.spotless:spotless-plugin-gradle:6.18.0") // Needed for japicmp but not automatically brought in for some reason. implementation("com.google.guava:guava:31.1-jre") implementation("com.squareup:javapoet:1.13.0") diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/zpages/TraceConfigzZPageHandler.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/zpages/TraceConfigzZPageHandler.java index 52e00c2155..3369e6a876 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/zpages/TraceConfigzZPageHandler.java +++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/zpages/TraceConfigzZPageHandler.java @@ -210,39 +210,39 @@ final class TraceConfigzZPageHandler extends ZPageHandler { emitActiveTableRow( /* out= */ out, /* paramName= */ "Sampler", - /* paramValue=*/ configSupplier.getSampler().getDescription(), + /* paramValue= */ configSupplier.getSampler().getDescription(), /* zebraStripeColor= */ ZEBRA_STRIPE_COLOR, /* zebraStripe= */ false); emitActiveTableRow( /* out= */ out, /* paramName= */ "MaxNumOfAttributes", - /* paramValue=*/ Integer.toString(configSupplier.get().getMaxNumberOfAttributes()), + /* paramValue= */ Integer.toString(configSupplier.get().getMaxNumberOfAttributes()), /* zebraStripeColor= */ ZEBRA_STRIPE_COLOR, /* zebraStripe= */ true); emitActiveTableRow( /* out= */ out, /* paramName= */ "MaxNumOfEvents", - /* paramValue=*/ Integer.toString(configSupplier.get().getMaxNumberOfEvents()), + /* paramValue= */ Integer.toString(configSupplier.get().getMaxNumberOfEvents()), /* zebraStripeColor= */ ZEBRA_STRIPE_COLOR, /* zebraStripe= */ false); emitActiveTableRow( /* out= */ out, /* paramName= */ "MaxNumOfLinks", - /* paramValue=*/ Integer.toString(configSupplier.get().getMaxNumberOfLinks()), + /* paramValue= */ Integer.toString(configSupplier.get().getMaxNumberOfLinks()), /* zebraStripeColor= */ ZEBRA_STRIPE_COLOR, /* zebraStripe= */ true); emitActiveTableRow( /* out= */ out, /* paramName= */ "MaxNumOfAttributesPerEvent", - /* paramValue=*/ Integer.toString(configSupplier.get().getMaxNumberOfAttributesPerEvent()), + /* paramValue= */ Integer.toString(configSupplier.get().getMaxNumberOfAttributesPerEvent()), /* zebraStripeColor= */ ZEBRA_STRIPE_COLOR, /* zebraStripe= */ false); emitActiveTableRow( /* out= */ out, /* paramName= */ "MaxNumOfAttributesPerLink", - /* paramValue=*/ Integer.toString(configSupplier.get().getMaxNumberOfAttributesPerLink()), + /* paramValue= */ Integer.toString(configSupplier.get().getMaxNumberOfAttributesPerLink()), /* zebraStripeColor= */ ZEBRA_STRIPE_COLOR, - /* zebraStripe=*/ true); + /* zebraStripe= */ true); out.print(""); } diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/export/PeriodicMetricReaderTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/export/PeriodicMetricReaderTest.java index 09a806237e..142e881636 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/export/PeriodicMetricReaderTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/export/PeriodicMetricReaderTest.java @@ -157,7 +157,8 @@ class PeriodicMetricReaderTest { @Timeout(2) @SuppressLogger(PeriodicMetricReader.class) public void intervalExport_exporterThrowsException() throws Exception { - WaitingMetricExporter waitingMetricExporter = new WaitingMetricExporter(/* shouldThrow=*/ true); + WaitingMetricExporter waitingMetricExporter = + new WaitingMetricExporter(/* shouldThrow= */ true); PeriodicMetricReader reader = PeriodicMetricReader.builder(waitingMetricExporter) .setInterval(Duration.ofMillis(100)) diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java index dd4a45e983..c4630f64bd 100644 --- a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java +++ b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java @@ -117,7 +117,7 @@ class SdkSpanTest { START_EPOCH_NANOS, START_EPOCH_NANOS, StatusData.unset(), - /*hasEnded=*/ true); + /* hasEnded= */ true); } @Test @@ -148,7 +148,7 @@ class SdkSpanTest { START_EPOCH_NANOS, 0, StatusData.unset(), - /*hasEnded=*/ false); + /* hasEnded= */ false); assertThat(span.hasEnded()).isFalse(); assertThat(span.isRecording()).isTrue(); } finally { @@ -179,7 +179,7 @@ class SdkSpanTest { START_EPOCH_NANOS, testClock.now(), StatusData.create(StatusCode.ERROR, "CANCELLED"), - /*hasEnded=*/ true); + /* hasEnded= */ true); } @Test