Fix tracing logic

Signed-off-by: Ian Costanzo <ian@anon-solutions.ca>

aries_cloudagent/utils/tracing.py

@@ -57,11 +57,16 @@ def tracing_enabled(context, message) -> bool:
                 return True
         elif isinstance(message, dict):
             # if there is a trace decorator on the messages then continue to trace
-            if message.get("~trace") or message.get("trace"):
+            if message.get("~trace"):
                 return True
+            if message.get("trace"):
+                return message.get("trace")
         elif isinstance(message, str):
-            if "~trace" in message or "trace" in message:
+            if "~trace" in message:
                 return True
+            if "trace" in message:
+                msg = json.loads(message)
+                return msg.get("trace")
         elif isinstance(message, OutboundMessage):
             if message.payload and isinstance(message.payload, AgentMessage):
                 if message.payload._trace:

demo/EFK-stack/search.py

@@ -26,6 +26,7 @@
 sorted_events = sorted(events, key = lambda i: i['timestamp']) 
 
 threads = {}
+thread_count = 0
 agents = {}
 with open('agent-events.csv', 'w', newline='') as csvfile:
     spamwriter = csv.writer(csvfile)
@@ -47,8 +48,11 @@
                 print(i, delta_thread)
         else:
             delta_thread = 0
+            thread_count = thread_count + 1
         threads[x["thread_id"]] = x["timestamp"]
         i = i + 1
         spamwriter.writerow(
             [i, x["str_time"], x["timestamp"], x["handler"], x["ellapsed_milli"], x["thread_id"], x["msg_id"], x["outcome"], x["traced_type"], delta_agent, delta_thread]
         )
+
+print("Total threads=", thread_count)