Merge branch '2.0' into tonycthsu/grape-on-error-2.0

DataDog · Jan 10, 2024 · 8f1c670 · 8f1c670
2 parents a8a0a4f + dd655fb
commit 8f1c670
Show file tree

Hide file tree

Showing 118 changed files with 353 additions and 387 deletions.
diff --git a/lib/datadog/kit/appsec/events.rb b/lib/datadog/kit/appsec/events.rb
@@ -160,7 +160,7 @@ def set_trace_and_span_context(method, trace = nil, span = nil)
           end
 
           def check_trace_span_integrity(trace, span)
-            raise ArgumentError, "span #{span.span_id} does not belong to trace #{trace.id}" if trace.id != span.trace_id
+            raise ArgumentError, "span #{span.id} does not belong to trace #{trace.id}" if trace.id != span.trace_id
           end
         end
       end

diff --git a/lib/datadog/kit/identity.rb b/lib/datadog/kit/identity.rb
@@ -94,7 +94,7 @@ def set_trace_and_span_context(method, trace = nil, span = nil)
             return
           end
 
-          raise ArgumentError, "span #{span.span_id} does not belong to trace #{trace.id}" if trace.id != span.trace_id
+          raise ArgumentError, "span #{span.id} does not belong to trace #{trace.id}" if trace.id != span.trace_id
 
           yield(trace, span)
         end

diff --git a/lib/datadog/tracing/contrib/action_cable/events/broadcast.rb b/lib/datadog/tracing/contrib/action_cable/events/broadcast.rb
@@ -35,7 +35,7 @@ def span_type
             def process(span, _event, _id, payload)
               channel = payload[:broadcasting] # Channel has high cardinality
               span.service = configuration[:service_name] if configuration[:service_name]
-              span.span_type = span_type
+              span.type = span_type
 
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])

diff --git a/lib/datadog/tracing/contrib/action_cable/events/perform_action.rb b/lib/datadog/tracing/contrib/action_cable/events/perform_action.rb
@@ -37,7 +37,7 @@ def process(span, _event, _id, payload)
 
               span.service = configuration[:service_name] if configuration[:service_name]
               span.resource = "#{channel_class}##{action}"
-              span.span_type = span_type
+              span.type = span_type
 
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])

diff --git a/lib/datadog/tracing/contrib/action_cable/events/transmit.rb b/lib/datadog/tracing/contrib/action_cable/events/transmit.rb
@@ -36,7 +36,7 @@ def process(span, _event, _id, payload)
 
               span.service = configuration[:service_name] if configuration[:service_name]
               span.resource = channel_class
-              span.span_type = span_type
+              span.type = span_type
 
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])

diff --git a/lib/datadog/tracing/contrib/action_cable/instrumentation.rb b/lib/datadog/tracing/contrib/action_cable/instrumentation.rb
@@ -14,7 +14,7 @@ def on_open
               Tracing.trace(Ext::SPAN_ON_OPEN) do |span, trace|
                 begin
                   span.resource = "#{self.class}#on_open"
-                  span.span_type = Tracing::Metadata::Ext::AppTypes::TYPE_WEB
+                  span.type = Tracing::Metadata::Ext::AppTypes::TYPE_WEB
 
                   span.set_tag(Ext::TAG_ACTION, 'on_open')
                   span.set_tag(Ext::TAG_CONNECTION, self.class.to_s)
@@ -61,7 +61,7 @@ def self.trace(channel, hook)
                 Tracing.trace("action_cable.#{hook}") do |span|
                   span.service = configuration[:service_name] if configuration[:service_name]
                   span.resource = "#{channel.class}##{hook}"
-                  span.span_type = Tracing::Metadata::Ext::AppTypes::TYPE_WEB
+                  span.type = Tracing::Metadata::Ext::AppTypes::TYPE_WEB
 
                   # Set analytics sample rate
                   if Contrib::Analytics.enabled?(configuration[:analytics_enabled])

diff --git a/lib/datadog/tracing/contrib/action_mailer/events/deliver.rb b/lib/datadog/tracing/contrib/action_mailer/events/deliver.rb
@@ -31,7 +31,7 @@ def span_type
             def process(span, event, _id, payload)
               super
 
-              span.span_type = span_type
+              span.type = span_type
               span.set_tag(Ext::TAG_MAILER, payload[:mailer])
               span.set_tag(Ext::TAG_MSG_ID, payload[:message_id])
 

diff --git a/lib/datadog/tracing/contrib/action_mailer/events/process.rb b/lib/datadog/tracing/contrib/action_mailer/events/process.rb
@@ -31,7 +31,7 @@ def span_type
             def process(span, event, _id, payload)
               super
 
-              span.span_type = span_type
+              span.type = span_type
               span.set_tag(Ext::TAG_ACTION, payload[:action])
               span.set_tag(Ext::TAG_MAILER, payload[:mailer])
 

diff --git a/lib/datadog/tracing/contrib/action_pack/action_controller/instrumentation.rb b/lib/datadog/tracing/contrib/action_pack/action_controller/instrumentation.rb
@@ -24,7 +24,7 @@ def start_processing(payload)
               span = Tracing.trace(
                 Ext::SPAN_ACTION_CONTROLLER,
                 service: service,
-                span_type: type,
+                type: type,
                 resource: "#{payload.fetch(:controller)}##{payload.fetch(:action)}",
               )
               trace = Tracing.active_trace

diff --git a/lib/datadog/tracing/contrib/action_view/events/render_partial.rb b/lib/datadog/tracing/contrib/action_view/events/render_partial.rb
@@ -27,7 +27,7 @@ def span_name
 
             def process(span, _event, _id, payload)
               span.service = configuration[:service_name] if configuration[:service_name]
-              span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE
+              span.type = Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_RENDER_PARTIAL)

diff --git a/lib/datadog/tracing/contrib/action_view/events/render_template.rb b/lib/datadog/tracing/contrib/action_view/events/render_template.rb
@@ -27,7 +27,7 @@ def span_name
 
             def process(span, _event, _id, payload)
               span.service = configuration[:service_name] if configuration[:service_name]
-              span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE
+              span.type = Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_RENDER_TEMPLATE)

diff --git a/lib/datadog/tracing/contrib/active_model_serializers/event.rb b/lib/datadog/tracing/contrib/active_model_serializers/event.rb
@@ -43,7 +43,7 @@ def set_common_tags(span, payload)
               span.resource = res
               span.set_tag(Ext::TAG_SERIALIZER, res)
 
-              span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE
+              span.type = Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE
 
               # Will be nil in 0.9
               span.set_tag(Ext::TAG_ADAPTER, payload[:adapter].class) unless payload[:adapter].nil?

diff --git a/lib/datadog/tracing/contrib/active_record/events/instantiation.rb b/lib/datadog/tracing/contrib/active_record/events/instantiation.rb
@@ -31,7 +31,7 @@ def span_name
 
             def process(span, event, _id, payload)
               span.resource = payload.fetch(:class_name)
-              span.span_type = Ext::SPAN_TYPE_INSTANTIATION
+              span.type = Ext::SPAN_TYPE_INSTANTIATION
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_INSTANTIATION)
 

diff --git a/lib/datadog/tracing/contrib/active_record/events/sql.rb b/lib/datadog/tracing/contrib/active_record/events/sql.rb
@@ -40,7 +40,7 @@ def process(span, event, _id, payload)
               span.name = "#{adapter_name}.query"
               span.service = service_name
               span.resource = payload.fetch(:sql)
-              span.span_type = Tracing::Metadata::Ext::SQL::TYPE
+              span.type = Tracing::Metadata::Ext::SQL::TYPE
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SQL)

diff --git a/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb b/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb
@@ -22,7 +22,7 @@ def trace(action, store, key: nil, multi_key: nil)
               # create a new ``Span`` and add it to the tracing context
               Tracing.trace(
                 Ext::SPAN_CACHE,
-                span_type: Ext::SPAN_TYPE_CACHE,
+                type: Ext::SPAN_TYPE_CACHE,
                 service: Datadog.configuration.tracing[:active_support][:cache_service],
                 resource: action
               ) do |span|

diff --git a/lib/datadog/tracing/contrib/aws/instrumentation.rb b/lib/datadog/tracing/contrib/aws/instrumentation.rb
@@ -31,7 +31,7 @@ def call(context)
           # rubocop:disable Metrics/AbcSize
           def annotate!(span, context)
             span.service = configuration[:service_name]
-            span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
+            span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
             span.name = Ext::SPAN_COMMAND
             span.resource = context.safely(:resource)
             aws_service = span.resource.split('.')[0]

diff --git a/lib/datadog/tracing/contrib/dalli/instrumentation.rb b/lib/datadog/tracing/contrib/dalli/instrumentation.rb
@@ -20,7 +20,7 @@ def request(op, *args)
               Tracing.trace(Ext::SPAN_COMMAND) do |span|
                 span.resource = op.to_s.upcase
                 span.service = datadog_configuration[:service_name]
-                span.span_type = Ext::SPAN_TYPE_COMMAND
+                span.type = Ext::SPAN_TYPE_COMMAND
 
                 if datadog_configuration[:peer_service]
                   span.set_tag(

diff --git a/lib/datadog/tracing/contrib/delayed_job/plugin.rb b/lib/datadog/tracing/contrib/delayed_job/plugin.rb
@@ -30,7 +30,7 @@ def self.instrument_invoke(job, &block)
               span.set_tag(Ext::TAG_QUEUE, job.queue) if job.queue
               span.set_tag(Ext::TAG_PRIORITY, job.priority)
               span.set_tag(Ext::TAG_ATTEMPTS, job.attempts)
-              span.span_type = Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
+              span.type = Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_JOB)
@@ -58,7 +58,7 @@ def self.instrument_enqueue(job, &block)
 
               span.set_tag(Ext::TAG_QUEUE, job.queue) if job.queue
               span.set_tag(Ext::TAG_PRIORITY, job.priority)
-              span.span_type = Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
+              span.type = Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ENQUEUE)

diff --git a/lib/datadog/tracing/contrib/delayed_job/server_internal_tracer/worker.rb b/lib/datadog/tracing/contrib/delayed_job/server_internal_tracer/worker.rb
@@ -11,7 +11,7 @@ def reserve_job
               configuration = Datadog.configuration.tracing[:delayed_job]
 
               Datadog::Tracing.trace(Ext::SPAN_RESERVE_JOB, service: configuration[:service_name]) do |span|
-                span.span_type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
+                span.type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
                 span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
 

diff --git a/lib/datadog/tracing/contrib/elasticsearch/patcher.rb b/lib/datadog/tracing/contrib/elasticsearch/patcher.rb
@@ -82,7 +82,7 @@ def perform_request(*args)
                     span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
                   end
 
-                  span.span_type = Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_TYPE_QUERY
+                  span.type = Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_TYPE_QUERY
 
                   span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                   span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)

diff --git a/lib/datadog/tracing/contrib/ethon/easy_patch.rb b/lib/datadog/tracing/contrib/ethon/easy_patch.rb
@@ -101,7 +101,7 @@ def datadog_before_request(continue_from: nil)
               @datadog_span = Tracing.trace(
                 Ext::SPAN_REQUEST,
                 service: uri ? service_name(uri.host, datadog_configuration) : datadog_configuration[:service_name],
-                span_type: Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND,
+                type: Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND,
                 **trace_options
               )
               datadog_trace = Tracing.active_trace

diff --git a/lib/datadog/tracing/contrib/excon/middleware.rb b/lib/datadog/tracing/contrib/excon/middleware.rb
@@ -112,7 +112,7 @@ def error_status_codes
           def annotate!(span, datum)
             span.resource = datum[:method].to_s.upcase
             span.service = service_name(datum[:host], @options)
-            span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
+            span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
             if @options[:peer_service]
               span.set_tag(

diff --git a/lib/datadog/tracing/contrib/faraday/middleware.rb b/lib/datadog/tracing/contrib/faraday/middleware.rb
@@ -38,7 +38,7 @@ def call(env)
           def annotate!(span, env, options)
             span.resource = resource_name(env)
             span.service = service_name(env[:url].host, options)
-            span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
+            span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
             if options[:peer_service]
               span.set_tag(

diff --git a/lib/datadog/tracing/contrib/grape/endpoint.rb b/lib/datadog/tracing/contrib/grape/endpoint.rb
@@ -48,7 +48,7 @@ def endpoint_start_process(_name, _start, _finish, _id, payload)
               span = Tracing.trace(
                 Ext::SPAN_ENDPOINT_RUN,
                 service: service_name,
-                span_type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
+                type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
                 resource: resource
               )
               trace = Tracing.active_trace
@@ -116,7 +116,7 @@ def endpoint_start_render(*)
               span = Tracing.trace(
                 Ext::SPAN_ENDPOINT_RENDER,
                 service: service_name,
-                span_type: Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE
+                type: Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE
               )
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
@@ -163,7 +163,7 @@ def endpoint_run_filters(name, start, finish, id, payload)
               span = Tracing.trace(
                 Ext::SPAN_ENDPOINT_RUN_FILTERS,
                 service: service_name,
-                span_type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
+                type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
                 start_time: start
               )
 

diff --git a/lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb b/lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb
@@ -20,7 +20,7 @@ def trace(keywords)
               formatter = GRPC::Formatting::FullMethodStringFormatter.new(keywords[:method])
 
               options = {
-                span_type: Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND,
+                type: Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND,
                 service: service_name, # Maintain client-side service name configuration
                 resource: formatter.resource_name,
                 on_error: on_error

diff --git a/lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb b/lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb
@@ -21,7 +21,7 @@ def trace(keywords)
               formatter = GRPC::Formatting::MethodObjectFormatter.new(keywords[:method])
 
               options = {
-                span_type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
+                type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
                 service: service_name, # TODO: Remove server-side service name configuration
                 resource: formatter.resource_name,
                 on_error: on_error

diff --git a/lib/datadog/tracing/contrib/hanami/action_tracer.rb b/lib/datadog/tracing/contrib/hanami/action_tracer.rb
@@ -20,7 +20,7 @@ def call(env)
               Ext::SPAN_ACTION,
               resource: @action.to_s,
               service: configuration[:service_name],
-              span_type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
+              type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span_op, trace_op|
               span_op.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ACTION)

diff --git a/lib/datadog/tracing/contrib/hanami/renderer_policy_tracing.rb b/lib/datadog/tracing/contrib/hanami/renderer_policy_tracing.rb
@@ -22,7 +22,7 @@ def render(env, response)
               Ext::SPAN_RENDER,
               service: configuration[:service_name],
               resource: action_klass.to_s,
-              span_type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
+              type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span_op, _trace_op|
               span_op.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_RENDER)

diff --git a/lib/datadog/tracing/contrib/hanami/router_tracing.rb b/lib/datadog/tracing/contrib/hanami/router_tracing.rb
@@ -15,7 +15,7 @@ def call(env)
             Tracing.trace(
               Ext::SPAN_ROUTING,
               service: configuration[:service_name],
-              span_type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
+              type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span_op, trace_op|
               begin
                 span_op.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

diff --git a/lib/datadog/tracing/contrib/http/instrumentation.rb b/lib/datadog/tracing/contrib/http/instrumentation.rb
@@ -41,7 +41,7 @@ def request(req, body = nil, &block)
               Tracing.trace(Ext::SPAN_REQUEST, on_error: method(:annotate_span_with_error!)) do |span, trace|
                 begin
                   span.service = service_name(host, request_options, client_config)
-                  span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
+                  span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
                   span.resource = req.method
 
                   if Tracing.enabled? && !Contrib::HTTP.should_skip_distributed_tracing?(client_config)

diff --git a/lib/datadog/tracing/contrib/httpclient/instrumentation.rb b/lib/datadog/tracing/contrib/httpclient/instrumentation.rb
@@ -25,7 +25,7 @@ def do_get_block(req, proxy, conn, &block)
               Tracing.trace(Ext::SPAN_REQUEST, on_error: method(:annotate_span_with_error!)) do |span, trace|
                 begin
                   span.service = service_name(host, request_options, client_config)
-                  span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
+                  span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
                   if Tracing.enabled? && !should_skip_distributed_tracing?(client_config)
                     Tracing::Propagation::HTTP.inject!(trace, req.header)

diff --git a/lib/datadog/tracing/contrib/httprb/instrumentation.rb b/lib/datadog/tracing/contrib/httprb/instrumentation.rb
@@ -25,7 +25,7 @@ def perform(req, options)
               Tracing.trace(Ext::SPAN_REQUEST, on_error: method(:annotate_span_with_error!)) do |span, trace|
                 begin
                   span.service = service_name(host, request_options, client_config)
-                  span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
+                  span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
                   if Tracing.enabled? && !should_skip_distributed_tracing?(client_config)
                     Tracing::Propagation::HTTP.inject!(trace, req)

diff --git a/lib/datadog/tracing/contrib/mongodb/subscribers.rb b/lib/datadog/tracing/contrib/mongodb/subscribers.rb
@@ -23,7 +23,7 @@ def started(event)
             # thread is involved in this execution so thread-local storage should be safe. Reference:
             # https://github.com/mongodb/mongo-ruby-driver/blob/master/lib/mongo/monitoring.rb#L70
             # https://github.com/mongodb/mongo-ruby-driver/blob/master/lib/mongo/monitoring/publishable.rb#L38-L56
-            span = Tracing.trace(Ext::SPAN_COMMAND, service: service, span_type: Ext::SPAN_TYPE_COMMAND)
+            span = Tracing.trace(Ext::SPAN_COMMAND, service: service, type: Ext::SPAN_TYPE_COMMAND)
             set_span(event, span)
 
             # build a quantized Query using the Parser module

diff --git a/lib/datadog/tracing/contrib/mysql2/instrumentation.rb b/lib/datadog/tracing/contrib/mysql2/instrumentation.rb
@@ -25,7 +25,7 @@ def query(sql, options = {})
 
               Tracing.trace(Ext::SPAN_QUERY, service: service, on_error: on_error) do |span, trace_op|
                 span.resource = sql
-                span.span_type = Tracing::Metadata::Ext::SQL::TYPE
+                span.type = Tracing::Metadata::Ext::SQL::TYPE
 
                 if datadog_configuration[:peer_service]
                   span.set_tag(

diff --git a/lib/datadog/tracing/contrib/presto/instrumentation.rb b/lib/datadog/tracing/contrib/presto/instrumentation.rb
@@ -23,7 +23,7 @@ def run(query)
                   begin
                     decorate!(span, Ext::TAG_OPERATION_QUERY)
                     span.resource = query
-                    span.span_type = Tracing::Metadata::Ext::SQL::TYPE
+                    span.type = Tracing::Metadata::Ext::SQL::TYPE
                     span.set_tag(Ext::TAG_QUERY_ASYNC, false)
                   rescue StandardError => e
                     Datadog.logger.debug("error preparing span for presto: #{e}")
@@ -41,7 +41,7 @@ def query(query, &blk)
                   begin
                     decorate!(span, Ext::TAG_OPERATION_QUERY)
                     span.resource = query
-                    span.span_type = Tracing::Metadata::Ext::SQL::TYPE
+                    span.type = Tracing::Metadata::Ext::SQL::TYPE
                     span.set_tag(Ext::TAG_QUERY_ASYNC, !blk.nil?)
                   rescue StandardError => e
                     Datadog.logger.debug("error preparing span for presto: #{e}")
@@ -59,7 +59,7 @@ def kill(query_id)
                   begin
                     decorate!(span, Ext::TAG_OPERATION_KILL)
                     span.resource = Ext::SPAN_KILL
-                    span.span_type = Tracing::Metadata::Ext::AppTypes::TYPE_DB
+                    span.type = Tracing::Metadata::Ext::AppTypes::TYPE_DB
                     # ^ not an SQL type span, since there's no SQL query
                     span.set_tag(Ext::TAG_QUERY_ID, query_id)
                   rescue StandardError => e

diff --git a/lib/datadog/tracing/contrib/qless/qless_job.rb b/lib/datadog/tracing/contrib/qless/qless_job.rb
@@ -14,7 +14,7 @@ def around_perform(job)
 
             Tracing.trace(Ext::SPAN_JOB, **span_options) do |span|
               span.resource = job.klass_name
-              span.span_type = Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
+              span.type = Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
               span.set_tag(Ext::TAG_JOB_ID, job.jid)
               span.set_tag(Ext::TAG_JOB_QUEUE, job.queue_name)
 

diff --git a/lib/datadog/tracing/contrib/que/tracer.rb b/lib/datadog/tracing/contrib/que/tracer.rb
@@ -11,7 +11,7 @@ class Tracer
           def call(job)
             trace_options = {
               service: configuration[:service_name],
-              span_type: Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
+              type: Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
               on_error: configuration[:on_error]
             }