faraday.rb in elastic-apm-2.11.0

- old
+ new

@@ -3,10 +3,13 @@
 module ElasticAPM
   # @api private
   module Spies
     # @api private
     class FaradaySpy
+      TYPE = 'ext'
+      SUBTYPE = 'faraday'
+
       def self.without_net_http
         return yield unless defined?(NetHTTPSpy)
 
         ElasticAPM::Spies::NetHTTPSpy.disable_in do
           yield
@@ -35,12 +38,16 @@
                    else
                      URI(url).host
                    end
 
             name = "#{method.upcase} #{host}"
-            type = "ext.faraday.#{method}"
 
-            ElasticAPM.with_span name, type do |span|
+            ElasticAPM.with_span(
+              name,
+              TYPE,
+              subtype: SUBTYPE,
+              action: method.to_s
+            ) do |span|
               ElasticAPM::Spies::FaradaySpy.without_net_http do
                 trace_context = span&.trace_context || transaction.trace_context
 
                 run_request_without_apm(method, url, body, headers) do |req|
                   req['Elastic-Apm-Traceparent'] = trace_context.to_header