Add new agentBridge API to report http method to some instr modules

Author: obenkenobi

agent-bridge/src/main/java/com/newrelic/agent/bridge/Agent.java

@@ -9,6 +9,7 @@
 
 import com.newrelic.api.agent.Logs;
 import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.Segment;
 
 /**
  * The internal bridge version of the Agent API.
@@ -28,6 +29,12 @@ public interface Agent extends com.newrelic.api.agent.Agent {
     @Deprecated
     TracedMethod getTracedMethod();
 
+    /**
+     * Reports the HTTP method to a segment's underlying tracer. This should ONLY be used if the segment is reported as an external HTTP trace.
+     *
+     */
+    void setHttpMethod(Segment segment, String httpMethod);
+
     /**
      * Returns the current transaction.
      *

agent-bridge/src/main/java/com/newrelic/agent/bridge/NoOpAgent.java

@@ -15,6 +15,7 @@
 import com.newrelic.api.agent.Logger;
 import com.newrelic.api.agent.Logs;
 import com.newrelic.api.agent.MetricAggregator;
+import com.newrelic.api.agent.Segment;
 import com.newrelic.api.agent.TraceMetadata;
 
 import java.util.Collections;
@@ -44,6 +45,11 @@ public TracedMethod getTracedMethod() {
         return NoOpTracedMethod.INSTANCE;
     }
 
+    @Override
+    public void setHttpMethod(Segment segment, String httpMethod) {
+
+    }
+
     @Override
     public Transaction getTransaction() {
         return NoOpTransaction.INSTANCE;

agent-bridge/src/main/java/com/newrelic/agent/bridge/NoOpTracedMethod.java

@@ -121,6 +121,11 @@ public boolean isTrackCallbackRunnable() {
         return false;
     }
 
+    @Override
+    public void setHttpMethod(String httpVerb) {
+
+    }
+
     @Override
     public void excludeLeaf() {
     }

agent-bridge/src/main/java/com/newrelic/agent/bridge/TracedMethod.java

@@ -128,6 +128,11 @@ default String getSpanId() {
 
     public boolean isTrackCallbackRunnable();
 
+    /**
+     * Reports the HTTP method (i.e. GET, POST, PUT, etc). This is added as the span attribute `http.request.method`
+     */
+    void setHttpMethod(String httpVerb);
+
     /**
      * Mark a leaf tracer as excluded, similar to how excludeFromTransactionTrace works.
      */

functional_test/src/test/java/com/newrelic/agent/bridge/MockTracer.java

@@ -137,6 +137,11 @@ public boolean isTrackCallbackRunnable() {
         return false;
     }
 
+    @Override
+    public void setHttpMethod(String httpVerb) {
+
+    }
+
     @Override
     public void addOutboundRequestHeaders(OutboundHeaders outboundHeaders) {
     }

functional_test/src/test/java/com/newrelic/agent/extension/FakeExtensionAgent.java

@@ -18,6 +18,7 @@
 import com.newrelic.api.agent.Logger;
 import com.newrelic.api.agent.Logs;
 import com.newrelic.api.agent.MetricAggregator;
+import com.newrelic.api.agent.Segment;
 import com.newrelic.api.agent.TraceMetadata;
 
 import java.util.Map;
@@ -62,6 +63,11 @@ public Cloud getCloud() {
     @Override
     public TracedMethod getTracedMethod() { throw new RuntimeException(); }
 
+    @Override
+    public void setHttpMethod(Segment segment, String httpMethod) {
+
+    }
+
     @Override
     public Transaction getTransaction() { throw new RuntimeException(); }
 

instrumentation/akka-http-core-10.0/src/main/scala/com/nr/instrumentation/akkahttpcore/AkkaHttpUtils.scala

@@ -32,6 +32,7 @@ object AkkaHttpUtils {
             .procedure(httpRequest.method.value)
             .inboundHeaders(new AkkaHttpInboundHeaders(httpRequest))
             .build())
+          AgentBridge.getAgent().setHttpMethod(segment, httpRequest.method.value);
           segment.end()
         } catch {
           case t: Throwable => AgentBridge.instrumentation.noticeInstrumentationError(t, Weaver.getImplementationTitle)

instrumentation/akka-http-core-10.2.0/src/main/scala/com/nr/instrumentation/akkahttpcore/AkkaHttpUtils.scala

@@ -32,6 +32,7 @@ object AkkaHttpUtils {
             .procedure(httpRequest.method.value)
             .inboundHeaders(new AkkaHttpInboundHeaders(httpRequest))
             .build())
+          AgentBridge.getAgent().setHttpMethod(segment, httpRequest.method.value);
           segment.end()
         } catch {
           case t: Throwable => AgentBridge.instrumentation.noticeInstrumentationError(t, Weaver.getImplementationTitle)

instrumentation/akka-http-core-2.13_10.1.8/src/main/scala/com/nr/instrumentation/akkahttpcore/AkkaHttpUtils.scala

@@ -32,6 +32,7 @@ object AkkaHttpUtils {
             .procedure(httpRequest.method.value)
             .inboundHeaders(new AkkaHttpInboundHeaders(httpRequest))
             .build())
+          AgentBridge.getAgent().setHttpMethod(segment, httpRequest.method.value)
           segment.end()
         } catch {
           case t: Throwable => AgentBridge.instrumentation.noticeInstrumentationError(t, Weaver.getImplementationTitle)

instrumentation/akka-http-core-2.13_10.2.0/src/main/scala/com/nr/instrumentation/akkahttpcore/AkkaHttpUtils.scala

@@ -32,6 +32,7 @@ object AkkaHttpUtils {
             .procedure(httpRequest.method.value)
             .inboundHeaders(new AkkaHttpInboundHeaders(httpRequest))
             .build())
+          AgentBridge.getAgent().setHttpMethod(segment, httpRequest.method.value);
           segment.end()
         } catch {
           case t: Throwable => AgentBridge.instrumentation.noticeInstrumentationError(t, Weaver.getImplementationTitle)