Use gRPC header data instead of a dedicated field

Signed-off-by: Antoine Toulme <[email protected]>

Author: atoulme

fabric-chaincode-protos/src/main/java/org/hyperledger/fabric/protos/common/Common.java

@@ -68,7 +68,6 @@ message MetadataSignature {
 message Header {
     bytes channel_header = 1;
     bytes signature_header = 2;
-    string b3_header = 3;
 }
 
 // Header is a generic replay prevention and identity message to include in a signed payload

fabric-chaincode-protos/src/main/protos/common/common.proto

@@ -56,15 +56,19 @@ dependencies {
     compile 'io.grpc:grpc-netty-shaded:1.34.1'
     compile 'io.grpc:grpc-protobuf:1.34.1'
     compile 'io.grpc:grpc-stub:1.34.1'
-    compile platform("io.opentelemetry:opentelemetry-bom:0.13.1")
+    testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.0'
+
+
+    compile platform("io.opentelemetry:opentelemetry-bom:0.14.1")
 
     compile "io.opentelemetry:opentelemetry-api"
     compile "io.opentelemetry:opentelemetry-proto"
     compile "io.opentelemetry:opentelemetry-sdk"
     compile "io.opentelemetry:opentelemetry-sdk-trace"
     compile 'io.opentelemetry:opentelemetry-exporter-otlp'
-    compile 'io.opentelemetry:opentelemetry-exporter-otlp-metrics:0.13.1-alpha'
+    compile 'io.opentelemetry:opentelemetry-exporter-otlp-metrics:0.14.1-alpha'
     compile 'io.opentelemetry:opentelemetry-extension-trace-propagators'
+    compile "io.opentelemetry.instrumentation:opentelemetry-grpc-1.5:0.14.0"
 }
 
 dependencyCheck {

fabric-chaincode-shim/build.gradle

@@ -79,15 +79,6 @@ public interface ChaincodeStub {
      */
     String getTxId();
 
-    /**
-     * Return the combined B3 header of the caller for this particular contract invocation.
-     * <p>
-     * This allows correlation of the caller to this contract invocation.
-     *
-     * @return the remote trace ID, or null.
-     */
-    String getB3Header();
-
     /**
      * Returns the channel id for the current proposal.
      * <p>

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeStub.java

@@ -11,6 +11,7 @@
 import java.util.function.Consumer;
 import java.util.logging.Logger;
 
+import io.grpc.ClientInterceptor;
 import org.hyperledger.fabric.Logging;
 import org.hyperledger.fabric.protos.peer.ChaincodeShim.ChaincodeMessage;
 import org.hyperledger.fabric.protos.peer.ChaincodeSupportGrpc;
@@ -19,6 +20,7 @@
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.stub.StreamObserver;
+import org.hyperledger.fabric.traces.Traces;
 
 public class ChaincodeSupportClient {
     private static final int DEFAULT_TIMEOUT = 5;
@@ -31,6 +33,10 @@ public class ChaincodeSupportClient {
      * @param channelBuilder
      */
     public ChaincodeSupportClient(final ManagedChannelBuilder<?> channelBuilder) {
+        ClientInterceptor interceptor = Traces.getProvider().createInterceptor();
+        if (interceptor != null) {
+            channelBuilder.intercept(interceptor);
+        }
         this.channel = channelBuilder.build();
         this.stub = ChaincodeSupportGrpc.newStub(channel);
     }