Skip to content

Commit

Permalink
Update opentelemetry to 1.22.0
Browse files Browse the repository at this point in the history
Signed-off-by: Nicu Reut <[email protected]>
(cherry picked from commit bba9f4e)
  • Loading branch information
nicu-da authored and bestbeforetoday committed Jan 16, 2023
1 parent c6d05c0 commit 9eb8f30
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>1.12.0</version>
<version>1.22.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
<version>1.12.0-alpha</version>
<version>1.22.0-alpha</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/hyperledger/fabric/sdk/Endpoint.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import io.grpc.netty.shaded.io.netty.handler.ssl.SslContextBuilder;
import io.grpc.netty.shaded.io.netty.handler.ssl.SslProvider;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.grpc.v1_6.GrpcTracing;
import io.opentelemetry.instrumentation.grpc.v1_6.GrpcTelemetry;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Expand All @@ -71,7 +71,7 @@ class Endpoint {
private static final String SSLPROVIDER = Config.getConfig().getDefaultSSLProvider();
private static final String SSLNEGOTIATION = Config.getConfig().getDefaultSSLNegotiationType();
private static final OpenTelemetry openTelemetry = Config.getConfig().getOpenTelemetry();
private static final GrpcTracing grpcTracing = GrpcTracing.create(openTelemetry);
private static final GrpcTelemetry grpcTelemetry = GrpcTelemetry.create(openTelemetry);

private final String addr;
private final int port;
Expand Down Expand Up @@ -241,7 +241,7 @@ class Endpoint {
}

try {
ClientInterceptor clientInterceptor = grpcTracing.newClientInterceptor();
ClientInterceptor clientInterceptor = grpcTelemetry.newClientInterceptor();
if (protocol.equalsIgnoreCase("grpc")) {
this.channelBuilder = NettyChannelBuilder.forAddress(addr, port).negotiationType(NegotiationType.PLAINTEXT).intercept(clientInterceptor);
addNettyBuilderProps(channelBuilder, properties);
Expand Down

0 comments on commit 9eb8f30

Please sign in to comment.