Skip to content

Commit a1fed61

Browse files
fix(deps): update dependency com.google.guava:guava-bom to v33.4.5-jre (#7213)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jack Berg <[email protected]>
1 parent 3c12e3a commit a1fed61

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ val DEPENDENCY_BOMS = listOf(
1414
// by FOSSA for containing EPL-licensed)
1515

1616
"com.fasterxml.jackson:jackson-bom:2.18.3",
17-
"com.google.guava:guava-bom:33.4.0-jre",
17+
"com.google.guava:guava-bom:33.4.5-jre",
1818
"com.google.protobuf:protobuf-bom:4.29.3",
1919
"com.squareup.okhttp3:okhttp-bom:4.12.0",
2020
"com.squareup.okio:okio-bom:3.10.2", // applies to transitive dependencies of okhttp

sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/UpstreamGrpcService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import io.opentelemetry.exporter.internal.grpc.MarshalerServiceStub;
1313
import io.opentelemetry.sdk.common.CompletableResultCode;
1414
import java.time.Duration;
15+
import java.util.Objects;
1516
import java.util.logging.Level;
1617
import java.util.logging.Logger;
1718

@@ -52,7 +53,7 @@ public SamplingStrategyResponseUnMarshaler execute(
5253
}
5354

5455
try {
55-
return Futures.getUnchecked(stub.export(exportRequest));
56+
return Objects.requireNonNull(Futures.getUnchecked(stub.export(exportRequest)));
5657
} catch (Throwable t) {
5758
Status status = Status.fromThrowable(t);
5859

sdk/trace/src/test/java/io/opentelemetry/sdk/trace/samplers/ParentBasedSamplerTest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,13 @@ void getDescription() {
410410

411411
@Test
412412
void equals() {
413-
EqualsVerifier.forClass(ParentBasedSampler.class).verify();
413+
EqualsVerifier.forClass(ParentBasedSampler.class)
414+
.withNonnullFields(
415+
"root",
416+
"remoteParentSampled",
417+
"remoteParentNotSampled",
418+
"localParentSampled",
419+
"localParentNotSampled")
420+
.verify();
414421
}
415422
}

0 commit comments

Comments
 (0)