fix(deps): update errorproneversion to v2.39.0 (#7448)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: John Watson <jkwatson@gmail.com>
This commit is contained in:
parent
40f71ed52a
commit
804d5f3a07
|
@ -25,7 +25,7 @@ import io.opentelemetry.internal.testing.slf4j.SuppressLogger;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
/** Unit tests for No-op {@link Meter}. */
|
/** Unit tests for No-op {@link Meter}. */
|
||||||
@SuppressLogger()
|
@SuppressLogger
|
||||||
public abstract class AbstractDefaultMeterTest {
|
public abstract class AbstractDefaultMeterTest {
|
||||||
private final Meter meter = getMeter();
|
private final Meter meter = getMeter();
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ val DEPENDENCY_BOMS = listOf(
|
||||||
)
|
)
|
||||||
|
|
||||||
val autoValueVersion = "1.11.0"
|
val autoValueVersion = "1.11.0"
|
||||||
val errorProneVersion = "2.38.0"
|
val errorProneVersion = "2.39.0"
|
||||||
val jmhVersion = "1.37"
|
val jmhVersion = "1.37"
|
||||||
// Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0
|
// Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0
|
||||||
val mockitoVersion = "4.11.0"
|
val mockitoVersion = "4.11.0"
|
||||||
|
|
|
@ -36,7 +36,7 @@ class ExporterInstrumentationTest {
|
||||||
Supplier<MeterProvider> meterProviderSupplier = mock(Supplier.class);
|
Supplier<MeterProvider> meterProviderSupplier = mock(Supplier.class);
|
||||||
|
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@EnumSource()
|
@EnumSource
|
||||||
void validMeterProvider(InternalTelemetryVersion schemaVersion) {
|
void validMeterProvider(InternalTelemetryVersion schemaVersion) {
|
||||||
when(meterProviderSupplier.get())
|
when(meterProviderSupplier.get())
|
||||||
.thenReturn(
|
.thenReturn(
|
||||||
|
@ -84,7 +84,7 @@ class ExporterInstrumentationTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@EnumSource()
|
@EnumSource
|
||||||
void noopMeterProvider(InternalTelemetryVersion schemaVersion) {
|
void noopMeterProvider(InternalTelemetryVersion schemaVersion) {
|
||||||
|
|
||||||
when(meterProviderSupplier.get()).thenReturn(MeterProvider.noop());
|
when(meterProviderSupplier.get()).thenReturn(MeterProvider.noop());
|
||||||
|
|
|
@ -75,6 +75,7 @@ public final class OkHttpGrpcSender<T extends Marshaler> implements GrpcSender<T
|
||||||
@Nullable private final Compressor compressor;
|
@Nullable private final Compressor compressor;
|
||||||
|
|
||||||
/** Creates a new {@link OkHttpGrpcSender}. */
|
/** Creates a new {@link OkHttpGrpcSender}. */
|
||||||
|
@SuppressWarnings("TooManyParameters")
|
||||||
public OkHttpGrpcSender(
|
public OkHttpGrpcSender(
|
||||||
String endpoint,
|
String endpoint,
|
||||||
@Nullable Compressor compressor,
|
@Nullable Compressor compressor,
|
||||||
|
|
|
@ -129,12 +129,12 @@ final class OpenTelemetrySpanBuilderImpl extends SpanBuilder {
|
||||||
Boolean hasRemoteParent = null;
|
Boolean hasRemoteParent = null;
|
||||||
if (ocRemoteParentSpanContext != null && ocRemoteParentSpanContext.isValid()) {
|
if (ocRemoteParentSpanContext != null && ocRemoteParentSpanContext.isValid()) {
|
||||||
ocParentContext = ocRemoteParentSpanContext;
|
ocParentContext = ocRemoteParentSpanContext;
|
||||||
hasRemoteParent = Boolean.TRUE;
|
hasRemoteParent = true;
|
||||||
ocTraceId = ocParentContext.getTraceId();
|
ocTraceId = ocParentContext.getTraceId();
|
||||||
ocTracestate = ocParentContext.getTracestate();
|
ocTracestate = ocParentContext.getTracestate();
|
||||||
} else if (ocParent != null && ocParent.getContext().isValid()) {
|
} else if (ocParent != null && ocParent.getContext().isValid()) {
|
||||||
ocParentContext = ocParent.getContext();
|
ocParentContext = ocParent.getContext();
|
||||||
hasRemoteParent = Boolean.FALSE;
|
hasRemoteParent = false;
|
||||||
ocTraceId = ocParentContext.getTraceId();
|
ocTraceId = ocParentContext.getTraceId();
|
||||||
ocTracestate = ocParentContext.getTracestate();
|
ocTracestate = ocParentContext.getTracestate();
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -39,7 +39,7 @@ final class OpenTelemetryConfigurationFactory
|
||||||
// TODO(jack-berg): log warning if version is not exact match, which may result in unexpected
|
// TODO(jack-berg): log warning if version is not exact match, which may result in unexpected
|
||||||
// behavior for experimental properties.
|
// behavior for experimental properties.
|
||||||
|
|
||||||
if (Objects.equals(Boolean.TRUE, model.getDisabled())) {
|
if (Objects.equals(true, model.getDisabled())) {
|
||||||
return builder.build();
|
return builder.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,7 @@ public class MutableHistogramPointDataTest {
|
||||||
assertThat(anotherPointData.hashCode()).isNotEqualTo(pointData.hashCode());
|
assertThat(anotherPointData.hashCode()).isNotEqualTo(pointData.hashCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test()
|
@Test
|
||||||
void testBoundaries() {
|
void testBoundaries() {
|
||||||
MutableHistogramPointData pointData = new MutableHistogramPointData(10);
|
MutableHistogramPointData pointData = new MutableHistogramPointData(10);
|
||||||
assertThatThrownBy(
|
assertThatThrownBy(
|
||||||
|
|
Loading…
Reference in New Issue