Merge branch 'logging-cordapp' of https://github.com/corda/samples-java into logging-cordapp

Author: davidawad

Features/customlogging-yocordapp/README.md

@@ -19,19 +19,45 @@ In this example not only do the node logs output in json but we can add arbitrar
     logger.info("Initializing the transaction.");
 ```
 
-When we log this informational message, it gets output along with the other key value pairs we've specified.
+When we log this informational message, it gets output along with the other key value pairs we've specified in a JSON formatt: 
+```
+{
+  "instant": {
+    "epochSecond": 1612982209,
+    "nanoOfSecond": 487000000
+  },
+  "thread": "Node thread-1",
+  "level": "INFO",
+  "loggerName": "net.corda",
+  "message": "Initializing the transaction.",
+  "endOfBatch": true,
+  "loggerFqcn": "org.apache.logging.slf4j.Log4jLogger",
+  "contextMap": {
+    "actor_id": "internalShell",
+    "actor_owning_identity": "O=PartyA, L=London, C=GB",
+    "actor_store_id": "NODE_CONFIG",
+    "fiber-id": "10000001",
+    "flow-id": "94543b19-b949-441e-9962-bc50dcd7ad55",
+    "initiator": "O=PartyA, L=London, C=GB",
+    "invocation_id": "a53a3a5d-b450-456e-a0f1-dfb7dcdce6dd",
+    "invocation_timestamp": "2021-02-10T18:36:49.312Z",
+    "origin": "internalShell",
+    "session_id": "e8ba737e-e809-4a14-8c3b-284b7ae5ed88",
+    "session_timestamp": "2021-02-10T18:36:49.022Z",
+    "target": "O=PartyB, L=New York, C=US",
+    "thread-id": "168"
+  },
+  "threadId": 168,
+  "threadPriority": 5
+}
+```
 This can be quite powerful if you're looking to produce a consumable output stream to a log aggregator like splunk.
 
 You can end up getting log feeds in json that look something like this:
 
 ```json
 {"instant":{"epochSecond":1612369055,"nanoOfSecond":12000000},"thread":"main","level":"INFO","loggerName":"net.corda.node.internal.Node","message":"Vendor: Corda Open Source","endOfBatch":true,"loggerFqcn":"org.apache.logging.slf4j.Log4jLogger","threadId":1,"threadPriority":5}
-{"instant":{"epochSecond":1612369055,"nanoOfSecond":12000000},"thread":"main","level":"INFO","loggerName":"net.corda.node.internal.Node","message":"Release: 4.6","endOfBatch":false,"loggerFqcn":"org.apache.logging.slf4j.Log4jLogger","threadId":1,"threadPriority":5}
-{"instant":{"epochSecond":1612369055,"nanoOfSecond":12000000},"thread":"main","level":"INFO","loggerName":"net.corda.node.internal.Node","message":"Platform Version: 8","endOfBatch":false,"loggerFqcn":"org.apache.logging.slf4j.Log4jLogger","threadId":1,"threadPriority":5}
-{"instant":{"epochSecond":1612369055,"nanoOfSecond":12000000},"thread":"main","level":"INFO","loggerName":"net.corda.node.internal.Node","message":"Revision: 85e387ea730d9be7d6dc2b23caba1ee18305af74","endOfBatch":false,"loggerFqcn":"org.apache.logging.slf4j.Log4jLogger","threadId":1,"threadPriority":5}
-{"instant":{"epochSecond":1612369055,"nanoOfSecond":13000000},"thread":"main","level":"INFO","loggerName":"net.corda.node.internal.Node","message":"PID: 94369","endOfBatch":false,"loggerFqcn":"org.apache.logging.slf4j.Log4jLogger","threadId":1,"threadPriority":5}
-. . .
-
+. . .More Node Startup loggings
 
 // when our flow is run we see the log we specified
 {"instant":{"epochSecond":1612460471,"nanoOfSecond":866000000},"thread":"pool-10-thread-2","level":"INFO","loggerName":"net.corda.tools.shell.FlowShellCommand","message":"Executing command \"flow start net.corda.samples.logging.flows.YoFlow target: PartyA\",","endOfBatch":true,"loggerFqcn":"org.apache.logging.slf4j.Log4jLogger","threadId":224,"threadPriority":5}
@@ -40,58 +66,6 @@ You can end up getting log feeds in json that look something like this:
 ```
 
 
-## Concepts
-
-In the original yo application that this sample was based on, the app sent what is essentially a "yo" state from one node to another.
-Here we're highlighting how easy it is to issue log messages with arbitrary key value pairs, we have an example of this in our YoFlow.
-
-```java
-public SignedTransaction call() throws FlowException {
-    // note we're creating a logger first with the shared name from our other example.
-    Logger logger = LoggerFactory.getLogger("net.corda");
-
-    progressTracker.setCurrentStep(CREATING);
-
-    Party me = getOurIdentity();
-
-    // here we have our first opportunity to log out the contents of the flow arguments.
-    ThreadContext.put("initiator", me.getName().toString());
-    ThreadContext.put("target", target.getName().toString());
-    // publish to the log with the additional context
-    logger.info("Initializing the transaction.");
-    // flush the threadContext
-    ThreadContext.removeAll(Arrays.asList("initiator", "target"));
-
-    // Obtain a reference to a notary.
-    final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
-
-    Command<YoContract.Commands.Send> command = new Command<YoContract.Commands.Send>(new YoContract.Commands.Send(), Arrays.asList(me.getOwningKey()));
-    YoState state = new YoState(me, target);
-    StateAndContract stateAndContract = new StateAndContract(state, YoContract.ID);
-    TransactionBuilder utx = new TransactionBuilder(notary).withItems(stateAndContract, command);
-
-    progressTracker.setCurrentStep(VERIFYING);
-    utx.verify(getServiceHub());
-
-    progressTracker.setCurrentStep(SIGNING);
-    SignedTransaction stx = getServiceHub().signInitialTransaction(utx);
-
-    // inject details to the threadcontext to be exported as json
-    ThreadContext.put("tx_id", stx.getId().toString());
-    ThreadContext.put("notary", notary.getName().toString());
-    // publish to the log with the additional context
-    logger.info("Finalizing the transaction.");
-    // flush the threadContext
-    ThreadContext.removeAll(Arrays.asList("tx_id", "notary"));
-
-    progressTracker.setCurrentStep(FINALISING);
-    FlowSession targetSession = initiateFlow(target);
-    return subFlow(new FinalityFlow(stx, Arrays.asList(targetSession), Objects.requireNonNull(FINALISING.childProgressTracker())));
-}
-```
-
-
-
 ## Usage