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] <support@github.com> * spotless --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jack Berg <jberg@newrelic.com>
This commit is contained in:
parent
79e0a7219c
commit
38e38cb29f
|
@ -56,8 +56,8 @@ public interface SpanContext {
|
||||||
spanIdHex,
|
spanIdHex,
|
||||||
traceFlags,
|
traceFlags,
|
||||||
traceState,
|
traceState,
|
||||||
/* remote=*/ false,
|
/* remote= */ false,
|
||||||
/* skipIdValidation=*/ false);
|
/* skipIdValidation= */ false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -82,8 +82,8 @@ public interface SpanContext {
|
||||||
spanIdHex,
|
spanIdHex,
|
||||||
traceFlags,
|
traceFlags,
|
||||||
traceState,
|
traceState,
|
||||||
/* remote=*/ true,
|
/* remote= */ true,
|
||||||
/* skipIdValidation=*/ false);
|
/* skipIdValidation= */ false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -33,7 +33,7 @@ repositories {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("com.google.auto.value:auto-value-annotations:1.10.1")
|
implementation("com.google.auto.value:auto-value-annotations:1.10.1")
|
||||||
// When updating, update above in plugins too
|
// 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.
|
// Needed for japicmp but not automatically brought in for some reason.
|
||||||
implementation("com.google.guava:guava:31.1-jre")
|
implementation("com.google.guava:guava:31.1-jre")
|
||||||
implementation("com.squareup:javapoet:1.13.0")
|
implementation("com.squareup:javapoet:1.13.0")
|
||||||
|
|
|
@ -210,39 +210,39 @@ final class TraceConfigzZPageHandler extends ZPageHandler {
|
||||||
emitActiveTableRow(
|
emitActiveTableRow(
|
||||||
/* out= */ out,
|
/* out= */ out,
|
||||||
/* paramName= */ "Sampler",
|
/* paramName= */ "Sampler",
|
||||||
/* paramValue=*/ configSupplier.getSampler().getDescription(),
|
/* paramValue= */ configSupplier.getSampler().getDescription(),
|
||||||
/* zebraStripeColor= */ ZEBRA_STRIPE_COLOR,
|
/* zebraStripeColor= */ ZEBRA_STRIPE_COLOR,
|
||||||
/* zebraStripe= */ false);
|
/* zebraStripe= */ false);
|
||||||
emitActiveTableRow(
|
emitActiveTableRow(
|
||||||
/* out= */ out,
|
/* out= */ out,
|
||||||
/* paramName= */ "MaxNumOfAttributes",
|
/* paramName= */ "MaxNumOfAttributes",
|
||||||
/* paramValue=*/ Integer.toString(configSupplier.get().getMaxNumberOfAttributes()),
|
/* paramValue= */ Integer.toString(configSupplier.get().getMaxNumberOfAttributes()),
|
||||||
/* zebraStripeColor= */ ZEBRA_STRIPE_COLOR,
|
/* zebraStripeColor= */ ZEBRA_STRIPE_COLOR,
|
||||||
/* zebraStripe= */ true);
|
/* zebraStripe= */ true);
|
||||||
emitActiveTableRow(
|
emitActiveTableRow(
|
||||||
/* out= */ out,
|
/* out= */ out,
|
||||||
/* paramName= */ "MaxNumOfEvents",
|
/* paramName= */ "MaxNumOfEvents",
|
||||||
/* paramValue=*/ Integer.toString(configSupplier.get().getMaxNumberOfEvents()),
|
/* paramValue= */ Integer.toString(configSupplier.get().getMaxNumberOfEvents()),
|
||||||
/* zebraStripeColor= */ ZEBRA_STRIPE_COLOR,
|
/* zebraStripeColor= */ ZEBRA_STRIPE_COLOR,
|
||||||
/* zebraStripe= */ false);
|
/* zebraStripe= */ false);
|
||||||
emitActiveTableRow(
|
emitActiveTableRow(
|
||||||
/* out= */ out,
|
/* out= */ out,
|
||||||
/* paramName= */ "MaxNumOfLinks",
|
/* paramName= */ "MaxNumOfLinks",
|
||||||
/* paramValue=*/ Integer.toString(configSupplier.get().getMaxNumberOfLinks()),
|
/* paramValue= */ Integer.toString(configSupplier.get().getMaxNumberOfLinks()),
|
||||||
/* zebraStripeColor= */ ZEBRA_STRIPE_COLOR,
|
/* zebraStripeColor= */ ZEBRA_STRIPE_COLOR,
|
||||||
/* zebraStripe= */ true);
|
/* zebraStripe= */ true);
|
||||||
emitActiveTableRow(
|
emitActiveTableRow(
|
||||||
/* out= */ out,
|
/* out= */ out,
|
||||||
/* paramName= */ "MaxNumOfAttributesPerEvent",
|
/* paramName= */ "MaxNumOfAttributesPerEvent",
|
||||||
/* paramValue=*/ Integer.toString(configSupplier.get().getMaxNumberOfAttributesPerEvent()),
|
/* paramValue= */ Integer.toString(configSupplier.get().getMaxNumberOfAttributesPerEvent()),
|
||||||
/* zebraStripeColor= */ ZEBRA_STRIPE_COLOR,
|
/* zebraStripeColor= */ ZEBRA_STRIPE_COLOR,
|
||||||
/* zebraStripe= */ false);
|
/* zebraStripe= */ false);
|
||||||
emitActiveTableRow(
|
emitActiveTableRow(
|
||||||
/* out= */ out,
|
/* out= */ out,
|
||||||
/* paramName= */ "MaxNumOfAttributesPerLink",
|
/* paramName= */ "MaxNumOfAttributesPerLink",
|
||||||
/* paramValue=*/ Integer.toString(configSupplier.get().getMaxNumberOfAttributesPerLink()),
|
/* paramValue= */ Integer.toString(configSupplier.get().getMaxNumberOfAttributesPerLink()),
|
||||||
/* zebraStripeColor= */ ZEBRA_STRIPE_COLOR,
|
/* zebraStripeColor= */ ZEBRA_STRIPE_COLOR,
|
||||||
/* zebraStripe=*/ true);
|
/* zebraStripe= */ true);
|
||||||
out.print("</table>");
|
out.print("</table>");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -157,7 +157,8 @@ class PeriodicMetricReaderTest {
|
||||||
@Timeout(2)
|
@Timeout(2)
|
||||||
@SuppressLogger(PeriodicMetricReader.class)
|
@SuppressLogger(PeriodicMetricReader.class)
|
||||||
public void intervalExport_exporterThrowsException() throws Exception {
|
public void intervalExport_exporterThrowsException() throws Exception {
|
||||||
WaitingMetricExporter waitingMetricExporter = new WaitingMetricExporter(/* shouldThrow=*/ true);
|
WaitingMetricExporter waitingMetricExporter =
|
||||||
|
new WaitingMetricExporter(/* shouldThrow= */ true);
|
||||||
PeriodicMetricReader reader =
|
PeriodicMetricReader reader =
|
||||||
PeriodicMetricReader.builder(waitingMetricExporter)
|
PeriodicMetricReader.builder(waitingMetricExporter)
|
||||||
.setInterval(Duration.ofMillis(100))
|
.setInterval(Duration.ofMillis(100))
|
||||||
|
|
|
@ -117,7 +117,7 @@ class SdkSpanTest {
|
||||||
START_EPOCH_NANOS,
|
START_EPOCH_NANOS,
|
||||||
START_EPOCH_NANOS,
|
START_EPOCH_NANOS,
|
||||||
StatusData.unset(),
|
StatusData.unset(),
|
||||||
/*hasEnded=*/ true);
|
/* hasEnded= */ true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -148,7 +148,7 @@ class SdkSpanTest {
|
||||||
START_EPOCH_NANOS,
|
START_EPOCH_NANOS,
|
||||||
0,
|
0,
|
||||||
StatusData.unset(),
|
StatusData.unset(),
|
||||||
/*hasEnded=*/ false);
|
/* hasEnded= */ false);
|
||||||
assertThat(span.hasEnded()).isFalse();
|
assertThat(span.hasEnded()).isFalse();
|
||||||
assertThat(span.isRecording()).isTrue();
|
assertThat(span.isRecording()).isTrue();
|
||||||
} finally {
|
} finally {
|
||||||
|
@ -179,7 +179,7 @@ class SdkSpanTest {
|
||||||
START_EPOCH_NANOS,
|
START_EPOCH_NANOS,
|
||||||
testClock.now(),
|
testClock.now(),
|
||||||
StatusData.create(StatusCode.ERROR, "CANCELLED"),
|
StatusData.create(StatusCode.ERROR, "CANCELLED"),
|
||||||
/*hasEnded=*/ true);
|
/* hasEnded= */ true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in New Issue