New getGuid() API for NR Transaction

k2io · Sep 26, 2022 · 4e24ce7 · 4e24ce7
1 parent a7d56cb
commit 4e24ce7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/agent-bridge/src/main/java/com/newrelic/agent/bridge/NoOpTransaction.java b/agent-bridge/src/main/java/com/newrelic/agent/bridge/NoOpTransaction.java
@@ -313,6 +313,11 @@ public void insertDistributedTraceHeaders(Headers headers) {
     public void acceptDistributedTraceHeaders(TransportType transportType, Headers headers) {
     }
 
+    @Override
+    public String getGuid() {
+        return null;
+    }
+
     @Override
     public void setTransportType(TransportType transportType) {
     }

diff --git a/newrelic-agent/src/main/java/com/newrelic/agent/TransactionApiImpl.java b/newrelic-agent/src/main/java/com/newrelic/agent/TransactionApiImpl.java
@@ -508,6 +508,12 @@ public void acceptDistributedTraceHeaders(TransportType transportType, Headers h
         HeadersUtil.parseAndAcceptDistributedTraceHeaders(tx, headers);
     }
 
+    @Override
+    public String getGuid() {
+        Transaction tx = getTransactionIfExists();
+        return (tx == null) ? null : tx.getGuid();
+    }
+
     @Override
     public void setTransportType(TransportType transportType) {
         Transaction tx = getTransactionIfExists();

diff --git a/newrelic-api/src/main/java/com/newrelic/api/agent/NoOpAgent.java b/newrelic-api/src/main/java/com/newrelic/api/agent/NoOpAgent.java
@@ -176,6 +176,11 @@ public void insertDistributedTraceHeaders(Headers headers) {
         @Override
         public void acceptDistributedTraceHeaders(TransportType transportType, Headers headers) {
         }
+
+        @Override
+        public String getGuid() {
+            return null;
+        }
     };
 
     private static final Token TOKEN = new Token() {

diff --git a/newrelic-api/src/main/java/com/newrelic/api/agent/Transaction.java b/newrelic-api/src/main/java/com/newrelic/api/agent/Transaction.java
@@ -355,4 +355,11 @@ public interface Transaction {
      */
     void acceptDistributedTraceHeaders(TransportType transportType, Headers headers);
 
+
+    /**
+     * Return the GUID for this transaction.
+     *
+     * @return the GUID for this transaction.
+     */
+    String getGuid();
 }