Skip to content

Commit 62f060e

Browse files
fix(deps): update dependency io.grpc:grpc-bom to v1.69.0 (#6938)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jason Plumb <[email protected]>
1 parent e3cfede commit 62f060e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
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
"com.linecorp.armeria:armeria-bom:1.31.2",
1515
"com.squareup.okhttp3:okhttp-bom:4.12.0",
1616
"com.squareup.okio:okio-bom:3.9.1", // applies to transitive dependencies of okhttp
17-
"io.grpc:grpc-bom:1.68.2",
17+
"io.grpc:grpc-bom:1.69.0",
1818
"io.netty:netty-bom:4.1.115.Final",
1919
"io.zipkin.brave:brave-bom:6.0.3",
2020
"io.zipkin.reporter2:zipkin-reporter-bom:3.4.3",

exporters/sender/grpc-managed-channel/src/main/java/io/opentelemetry/exporter/sender/grpc/managedchannel/internal/UpstreamGrpcSender.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import io.opentelemetry.exporter.internal.grpc.MarshalerServiceStub;
2020
import io.opentelemetry.exporter.internal.marshal.Marshaler;
2121
import io.opentelemetry.sdk.common.CompletableResultCode;
22+
import java.time.Duration;
2223
import java.util.List;
2324
import java.util.Map;
24-
import java.util.concurrent.TimeUnit;
2525
import java.util.function.Consumer;
2626
import java.util.function.Supplier;
2727
import javax.annotation.Nullable;
@@ -55,7 +55,7 @@ public UpstreamGrpcSender(
5555
public void send(T request, Consumer<GrpcResponse> onResponse, Consumer<Throwable> onError) {
5656
MarshalerServiceStub<T, ?, ?> stub = this.stub;
5757
if (timeoutNanos > 0) {
58-
stub = stub.withDeadlineAfter(timeoutNanos, TimeUnit.NANOSECONDS);
58+
stub = stub.withDeadlineAfter(Duration.ofNanos(timeoutNanos));
5959
}
6060
Map<String, List<String>> headers = headersSupplier.get();
6161
if (headers != null) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.opentelemetry.exporter.internal.grpc.ManagedChannelUtil;
1212
import io.opentelemetry.exporter.internal.grpc.MarshalerServiceStub;
1313
import io.opentelemetry.sdk.common.CompletableResultCode;
14-
import java.util.concurrent.TimeUnit;
14+
import java.time.Duration;
1515
import java.util.logging.Level;
1616
import java.util.logging.Logger;
1717

@@ -48,7 +48,7 @@ public SamplingStrategyResponseUnMarshaler execute(
4848
SamplingStrategyParametersMarshaler, SamplingStrategyResponseUnMarshaler, ?>
4949
stub = this.stub;
5050
if (timeoutNanos > 0) {
51-
stub = stub.withDeadlineAfter(timeoutNanos, TimeUnit.NANOSECONDS);
51+
stub = stub.withDeadlineAfter(Duration.ofNanos(timeoutNanos));
5252
}
5353

5454
try {

0 commit comments

Comments
 (0)