Skip to content

Commit 3b8cc32

Browse files
atoulmeatoulme
committed
Add Traces.initialize to all tests
Signed-off-by: Antoine Toulme <[email protected]>
1 parent 9e2d029 commit 3b8cc32

File tree

6 files changed

+24
-1
lines changed

6 files changed

+24
-1
lines changed

‎fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChaincodeBaseTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.hyperledger.fabric.metrics.Metrics;
3030
import org.hyperledger.fabric.protos.peer.ChaincodeShim;
3131
import org.hyperledger.fabric.shim.chaincode.EmptyChaincode;
32+
import org.hyperledger.fabric.traces.Traces;
3233
import org.junit.Ignore;
3334
import org.junit.Rule;
3435
import org.junit.Test;
@@ -299,6 +300,7 @@ public void connectChaincodeBase() throws IOException {
299300

300301
final Properties props = cb.getChaincodeConfig();
301302
Metrics.initialize(props);
303+
Traces.initialize(props);
302304

303305
cb.connectToPeer(new StreamObserver<ChaincodeShim.ChaincodeMessage>() {
304306
@Override

‎fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/ChatChaincodeWithPeerTest.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.hyperledger.fabric.protos.peer.ChaincodeShim;
1313
import org.hyperledger.fabric.shim.chaincode.EmptyChaincode;
1414
import org.hyperledger.fabric.shim.utils.MessageUtil;
15+
import org.hyperledger.fabric.traces.Traces;
1516
import org.junit.Rule;
1617
import org.junit.contrib.java.lang.system.EnvironmentVariables;
1718
import org.junit.jupiter.api.AfterEach;
@@ -103,6 +104,7 @@ void initEmptyId() throws IOException {
103104

104105
Properties props = chaincodeBase.getChaincodeConfig();
105106
Metrics.initialize(props);
107+
Traces.initialize(props);
106108
ChatChaincodeWithPeer chatChaincodeWithPeer = new ChatChaincodeWithPeer(chaincodeBase);
107109
},
108110
"chaincode id not set, set env 'CORE_CHAINCODE_ID_NAME', for example 'CORE_CHAINCODE_ID_NAME=mycc'"
@@ -130,7 +132,7 @@ void connectNull() throws IOException {
130132

131133
Properties props = chaincodeBase.getChaincodeConfig();
132134
Metrics.initialize(props);
133-
135+
Traces.initialize(props);
134136
ChatChaincodeWithPeer chatChaincodeWithPeer = new ChatChaincodeWithPeer(chaincodeBase);
135137
assertNull(chatChaincodeWithPeer.connect(null));
136138
}
@@ -143,6 +145,7 @@ void connectAndReceiveRegister() throws IOException {
143145
chaincodeBase.validateOptions();
144146

145147
Properties props = chaincodeBase.getChaincodeConfig();
148+
Traces.initialize(props);
146149
Metrics.initialize(props);
147150

148151
ChatChaincodeWithPeer chatChaincodeWithPeer = new ChatChaincodeWithPeer(chaincodeBase);
@@ -213,6 +216,7 @@ void connectAndReceiveRegisterComplete() throws IOException {
213216
chaincodeBase.validateOptions();
214217

215218
Properties props = chaincodeBase.getChaincodeConfig();
219+
Traces.initialize(props);
216220
Metrics.initialize(props);
217221

218222
ChatChaincodeWithPeer chatChaincodeWithPeer = new ChatChaincodeWithPeer(chaincodeBase);
@@ -243,6 +247,7 @@ void connectAndReceiveRegisterException() throws IOException {
243247
chaincodeBase.validateOptions();
244248

245249
Properties props = chaincodeBase.getChaincodeConfig();
250+
Traces.initialize(props);
246251
Metrics.initialize(props);
247252

248253
ChatChaincodeWithPeer chatChaincodeWithPeer = new ChatChaincodeWithPeer(chaincodeBase);
@@ -271,6 +276,7 @@ void connectOnCompletedException() throws IOException {
271276

272277
Properties props = chaincodeBase.getChaincodeConfig();
273278
Metrics.initialize(props);
279+
Traces.initialize(props);
274280

275281
ChatChaincodeWithPeer chatChaincodeWithPeer = new ChatChaincodeWithPeer(chaincodeBase);
276282

‎fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/NettyGrpcServerTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import org.hyperledger.fabric.metrics.Metrics;
99
import org.hyperledger.fabric.shim.chaincode.EmptyChaincode;
10+
import org.hyperledger.fabric.traces.Traces;
1011
import org.junit.Rule;
1112
import org.junit.contrib.java.lang.system.EnvironmentVariables;
1213
import org.junit.jupiter.api.AfterEach;
@@ -221,6 +222,7 @@ void initEnvSetPortChaincodeServerAndCoreChaincodeIdName() throws IOException {
221222

222223
Properties props = chaincodeBase.getChaincodeConfig();
223224
Metrics.initialize(props);
225+
Traces.initialize(props);
224226

225227
ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, new ChaincodeServerProperties());
226228

@@ -235,6 +237,7 @@ void startAndStopSetCoreChaincodeIdName() {
235237
chaincodeBase.processEnvironmentOptions();
236238
Properties props = chaincodeBase.getChaincodeConfig();
237239
Metrics.initialize(props);
240+
Traces.initialize(props);
238241

239242
ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, new ChaincodeServerProperties());
240243
new Thread(() -> {

‎fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/ChaincodeSupportClientTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.hyperledger.fabric.protos.peer.ChaincodeShim;
1313
import org.hyperledger.fabric.shim.ChaincodeBase;
1414
import org.hyperledger.fabric.shim.chaincode.EmptyChaincode;
15+
import org.hyperledger.fabric.traces.Traces;
1516
import org.junit.Rule;
1617
import org.junit.contrib.java.lang.system.EnvironmentVariables;
1718
import org.junit.jupiter.api.Assertions;
@@ -33,6 +34,7 @@ void testStartInvocationTaskManagerAndRequestObserverNull() throws IOException {
3334

3435
Properties props = chaincodeBase.getChaincodeConfig();
3536
Metrics.initialize(props);
37+
Traces.initialize(props);
3638

3739
final ManagedChannelBuilder<?> managedChannelBuilder = chaincodeBase.newChannelBuilder();
3840
ChaincodeSupportClient chaincodeSupportClient = new ChaincodeSupportClient(managedChannelBuilder);
@@ -60,6 +62,7 @@ void testStartInvocationTaskManagerNullAndRequestObserver() throws IOException {
6062

6163
Properties props = chaincodeBase.getChaincodeConfig();
6264
Metrics.initialize(props);
65+
Traces.initialize(props);
6366

6467
final ManagedChannelBuilder<?> managedChannelBuilder = chaincodeBase.newChannelBuilder();
6568
ChaincodeSupportClient chaincodeSupportClient = new ChaincodeSupportClient(managedChannelBuilder);

‎fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InnvocationTaskManagerTest.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ void getManagerChaincodeIDNull() throws IOException {
7474

7575
Properties props = chaincodeBase.getChaincodeConfig();
7676
Metrics.initialize(props);
77+
Traces.initialize(props);
7778

7879
Assertions.assertThrows(
7980
IllegalArgumentException.class, () -> {
@@ -105,6 +106,7 @@ void onChaincodeMessage() throws IOException {
105106

106107
Properties props = chaincodeBase.getChaincodeConfig();
107108
Metrics.initialize(props);
109+
Traces.initialize(props);
108110

109111
final Chaincode.ChaincodeID chaincodeId = Chaincode.ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
110112
final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
@@ -124,6 +126,7 @@ void setResponseConsumer() throws IOException {
124126

125127
Properties props = chaincodeBase.getChaincodeConfig();
126128
Metrics.initialize(props);
129+
Traces.initialize(props);
127130

128131
final Chaincode.ChaincodeID chaincodeId = Chaincode.ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
129132
final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
@@ -139,6 +142,7 @@ void registerException() {
139142

140143
Properties props = chaincodeBase.getChaincodeConfig();
141144
Metrics.initialize(props);
145+
Traces.initialize(props);
142146

143147
final Chaincode.ChaincodeID chaincodeId = Chaincode.ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
144148
final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
@@ -159,6 +163,7 @@ void onChaincodeMessageREGISTER() {
159163

160164
Properties props = chaincodeBase.getChaincodeConfig();
161165
Metrics.initialize(props);
166+
Traces.initialize(props);
162167

163168
final Chaincode.ChaincodeID chaincodeId = Chaincode.ChaincodeID.newBuilder().setName("chaincodeIdNumber12345").build();
164169
final InvocationTaskManager itm = InvocationTaskManager.getManager(chaincodeBase, chaincodeId);
@@ -180,6 +185,7 @@ void onChaincodeMessageInvokeChaincode() {
180185

181186
Properties props = chaincodeBase.getChaincodeConfig();
182187
Metrics.initialize(props);
188+
Traces.initialize(props);
183189

184190
final String chaincodeIdNumber = "chaincodeIdNumber12345";
185191
final Chaincode.ChaincodeID chaincodeId = Chaincode.ChaincodeID.newBuilder().setName(chaincodeIdNumber).build();
@@ -203,6 +209,7 @@ void onChaincodeMessagePutState() {
203209

204210
Properties props = chaincodeBase.getChaincodeConfig();
205211
Metrics.initialize(props);
212+
Traces.initialize(props);
206213

207214
final String chaincodeIdNumber = "chaincodeIdNumber12345";
208215
final Chaincode.ChaincodeID chaincodeId = Chaincode.ChaincodeID.newBuilder().setName(chaincodeIdNumber).build();

‎fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/impl/InvocationTaskManagerTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.hyperledger.fabric.protos.peer.Chaincode.ChaincodeID;
1818
import org.hyperledger.fabric.protos.peer.ChaincodeShim.ChaincodeMessage;
1919
import org.hyperledger.fabric.shim.ChaincodeBase;
20+
import org.hyperledger.fabric.traces.Traces;
2021
import org.junit.jupiter.api.AfterEach;
2122
import org.junit.jupiter.api.BeforeEach;
2223
import org.junit.jupiter.api.Test;
@@ -33,6 +34,7 @@ public final class InvocationTaskManagerTest {
3334
@BeforeEach
3435
public void setup() {
3536
Metrics.initialize(new Properties());
37+
Traces.initialize(new Properties());
3638

3739
chaincode = Mockito.mock(ChaincodeBase.class);
3840
final ChaincodeID id = ChaincodeID.newBuilder().setName("randomname").build();

0 commit comments

Comments
 (0)