Skip to content

Commit 34aad13

Browse files
committed
Add OpenTelemetry
Signed-off-by: Antoine Toulme <[email protected]>
1 parent 09a791c commit 34aad13

File tree

24 files changed

+995
-81
lines changed

24 files changed

+995
-81
lines changed

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

Lines changed: 174 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ message MetadataSignature {
6868
message Header {
6969
bytes channel_header = 1;
7070
bytes signature_header = 2;
71+
string b3_header = 3;
7172
}
7273

7374
// Header is a generic replay prevention and identity message to include in a signed payload

fabric-chaincode-shim/build.gradle

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,22 @@ dependencies {
4949
implementation group: 'org.json', name: 'json', version: '20180813'
5050
implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.11.1'
5151
// Required if using Java 11+ as no longer bundled in the core libraries
52-
testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
52+
testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
5353
implementation 'io.grpc:grpc-netty-shaded:1.31.1'
5454
implementation 'io.grpc:grpc-protobuf:1.31.1'
5555
implementation 'io.grpc:grpc-stub:1.31.1'
56+
compile 'io.grpc:grpc-netty-shaded:1.34.1'
57+
compile 'io.grpc:grpc-protobuf:1.34.1'
58+
compile 'io.grpc:grpc-stub:1.34.1'
59+
compile platform("io.opentelemetry:opentelemetry-bom:0.13.1")
60+
61+
compile "io.opentelemetry:opentelemetry-api"
62+
compile "io.opentelemetry:opentelemetry-proto"
63+
compile "io.opentelemetry:opentelemetry-sdk"
64+
compile "io.opentelemetry:opentelemetry-sdk-trace"
65+
compile 'io.opentelemetry:opentelemetry-exporter-otlp'
66+
compile 'io.opentelemetry:opentelemetry-exporter-otlp-metrics:0.13.1-alpha'
67+
compile 'io.opentelemetry:opentelemetry-extension-trace-propagators'
5668
}
5769

5870
dependencyCheck {

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractRouter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.hyperledger.fabric.shim.ChaincodeServer;
2929
import org.hyperledger.fabric.shim.ChaincodeStub;
3030
import org.hyperledger.fabric.shim.ResponseUtils;
31+
import org.hyperledger.fabric.traces.Traces;
3132

3233
/**
3334
* Router class routes Init/Invoke requests to contracts. Implements
@@ -61,6 +62,7 @@ public ContractRouter(final String[] args) {
6162

6263
final Properties props = super.getChaincodeConfig();
6364
Metrics.initialize(props);
65+
Traces.initialize(props);
6466

6567
logger.fine("ContractRouter<init>");
6668
registry = new RoutingRegistryImpl();

0 commit comments

Comments
 (0)