open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <jplumb@splunk.com>
This commit is contained in:
renovate[bot] 2024-12-11 17:10:43 -08:00 committed by GitHub
parent e3cfedee7d
commit 62f060ed9a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependencyManagement/build.gradle.kts
View File

@ -14,7 +14,7 @@ val DEPENDENCY_BOMS = listOf(
"com.linecorp.armeria:armeria-bom:1.31.2",
"com.squareup.okhttp3:okhttp-bom:4.12.0",
"com.squareup.okio:okio-bom:3.9.1", // applies to transitive dependencies of okhttp
"io.grpc:grpc-bom:1.68.2",
"io.grpc:grpc-bom:1.69.0",
"io.netty:netty-bom:4.1.115.Final",
"io.zipkin.brave:brave-bom:6.0.3",
"io.zipkin.reporter2:zipkin-reporter-bom:3.4.3",

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

@ -19,9 +19,9 @@ import io.opentelemetry.exporter.internal.grpc.GrpcSender;
import io.opentelemetry.exporter.internal.grpc.MarshalerServiceStub;
import io.opentelemetry.exporter.internal.marshal.Marshaler;
import io.opentelemetry.sdk.common.CompletableResultCode;
import java.time.Duration;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.function.Supplier;
import javax.annotation.Nullable;
@ -55,7 +55,7 @@ public final class UpstreamGrpcSender<T extends Marshaler> implements GrpcSender
public void send(T request, Consumer<GrpcResponse> onResponse, Consumer<Throwable> onError) {
MarshalerServiceStub<T, ?, ?> stub = this.stub;
if (timeoutNanos > 0) {
stub = stub.withDeadlineAfter(timeoutNanos, TimeUnit.NANOSECONDS);
stub = stub.withDeadlineAfter(Duration.ofNanos(timeoutNanos));
}
Map<String, List<String>> headers = headersSupplier.get();
if (headers != null) {

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

@ -11,7 +11,7 @@ import io.grpc.Status;
import io.opentelemetry.exporter.internal.grpc.ManagedChannelUtil;
import io.opentelemetry.exporter.internal.grpc.MarshalerServiceStub;
import io.opentelemetry.sdk.common.CompletableResultCode;
import java.util.concurrent.TimeUnit;
import java.time.Duration;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -48,7 +48,7 @@ final class UpstreamGrpcService implements GrpcService {
SamplingStrategyParametersMarshaler, SamplingStrategyResponseUnMarshaler, ?>
stub = this.stub;
if (timeoutNanos > 0) {
stub = stub.withDeadlineAfter(timeoutNanos, TimeUnit.NANOSECONDS);
stub = stub.withDeadlineAfter(Duration.ofNanos(timeoutNanos));
}
try {