Skip to content

Commit f22b5fc

Browse files
committed
gRPC
1 parent 021dd86 commit f22b5fc

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

exporters/sender/grpc-managed-channel/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@ dependencies {
1414

1515
implementation("io.grpc:grpc-stub")
1616
}
17+
18+
tasks.withType<Test> {
19+
enabled = false
20+
}

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/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,7 @@ tasks {
7979
}
8080
}
8181
}
82+
83+
tasks.withType<Test> {
84+
enabled = false
85+
}

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)