ddtrace 1.0.0 → 1.10.1

data/lib/datadog/tracing/contrib/presto/patcher.rb

@@ -1,9 +1,7 @@
-# typed: true
-
-require 'datadog/core/utils/only_once'
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/presto/ext'
-require 'datadog/tracing/contrib/presto/instrumentation'
+require_relative '../../../core/utils/only_once'
+require_relative '../patcher'
+require_relative 'ext'
+require_relative 'instrumentation'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/propagation/sql_comment/comment.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'erb'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Propagation
+        module SqlComment
+          # To be prepended to a sql statement.
+          class Comment
+            def initialize(hash)
+              @hash = hash
+            end
+
+            def to_s
+              @string ||= begin
+                ret = String.new
+
+                @hash.each do |key, value|
+                  next if value.nil?
+
+                  # Url encode
+                  value = ERB::Util.url_encode(value)
+
+                  # Escape SQL
+                  ret << "#{key}='#{value}',"
+                end
+
+                # Remove the last `,`
+                ret.chop!
+
+                "/*#{ret}*/"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/contrib/propagation/sql_comment/ext.rb

@@ -0,0 +1,31 @@
+module Datadog
+  module Tracing
+    module Contrib
+      module Propagation
+        module SqlComment
+          module Ext
+            ENV_DBM_PROPAGATION_MODE = 'DD_DBM_PROPAGATION_MODE'.freeze
+
+            # The default mode for sql comment propagation
+            DISABLED = 'disabled'.freeze
+
+            # The `service` mode propagates service configuration
+            SERVICE = 'service'.freeze
+
+            # The `full` mode propagates service configuration + trace context
+            FULL = 'full'.freeze
+
+            # The value should be `true` when `full` mode
+            TAG_DBM_TRACE_INJECTED = '_dd.dbm_trace_injected'.freeze
+
+            KEY_DATABASE_SERVICE = 'dddbs'.freeze
+            KEY_ENVIRONMENT = 'dde'.freeze
+            KEY_PARENT_SERVICE = 'ddps'.freeze
+            KEY_VERSION = 'ddpv'.freeze
+            KEY_TRACEPARENT = 'traceparent'.freeze
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/contrib/propagation/sql_comment/mode.rb

@@ -0,0 +1,26 @@
+require_relative 'ext'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Propagation
+        # Implements sql comment propagation related contracts.
+        module SqlComment
+          Mode = Struct.new(:mode) do
+            def enabled?
+              service? || full?
+            end
+
+            def service?
+              mode == Ext::SERVICE
+            end
+
+            def full?
+              mode == Ext::FULL
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/contrib/propagation/sql_comment.rb

@@ -0,0 +1,45 @@
+require_relative 'sql_comment/comment'
+require_relative 'sql_comment/ext'
+
+require_relative '../../distributed/trace_context'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Propagation
+        # Implements sql comment propagation related contracts.
+        module SqlComment
+          def self.annotate!(span_op, mode)
+            return unless mode.enabled?
+
+            span_op.set_tag(Ext::TAG_DBM_TRACE_INJECTED, true) if mode.full?
+          end
+
+          # Inject span_op and trace_op instead of TraceDigest to improve memory usage
+          # for `disabled` and `service` mode
+          def self.prepend_comment(sql, span_op, trace_op, mode)
+            return sql unless mode.enabled?
+
+            tags = {
+              Ext::KEY_DATABASE_SERVICE => span_op.service,
+              Ext::KEY_ENVIRONMENT => datadog_configuration.env,
+              Ext::KEY_PARENT_SERVICE => datadog_configuration.service,
+              Ext::KEY_VERSION => datadog_configuration.version
+            }
+
+            if mode.full?
+              tags[Ext::KEY_TRACEPARENT] =
+                Tracing::Distributed::TraceContext.new(fetcher: nil).send(:build_traceparent, trace_op.to_digest)
+            end
+
+            "#{Comment.new(tags)} #{sql}"
+          end
+
+          def self.datadog_configuration
+            Datadog.configuration
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/contrib/qless/configuration/settings.rb

@@ -1,7 +1,5 @@
-# typed: false
-
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/qless/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/qless/ext.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/qless/integration.rb

@@ -1,8 +1,6 @@
-# typed: false
-
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/qless/configuration/settings'
-require 'datadog/tracing/contrib/qless/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/qless/patcher.rb

@@ -1,8 +1,4 @@
-# typed: true
-
-require 'datadog/tracing'
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/qless/integration'
+require_relative '../patcher'
 
 module Datadog
   module Tracing
@@ -10,7 +6,6 @@ module Datadog
       module Qless
         # Patcher enables patching of 'qless' module.
         module Patcher
-          include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
           include Contrib::Patcher
 
           module_function

data/lib/datadog/tracing/contrib/qless/qless_job.rb

@@ -1,10 +1,7 @@
-# typed: false
-
 require 'qless'
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
 
 module Datadog
   module Tracing
@@ -36,6 +33,9 @@ module Datadog
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_JOB)
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER)
+
+              span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
 
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])

data/lib/datadog/tracing/contrib/qless/tracer_cleaner.rb

@@ -1,7 +1,3 @@
-# typed: true
-
-require 'datadog/tracing'
-
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/que/configuration/settings.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-# typed: false
-
-require 'datadog/tracing/span_operation'
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/que/ext'
+require_relative '../../../span_operation'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/que/ext.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# typed: strict
-
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/que/integration.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-# typed: false
-
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/que/ext'
-require 'datadog/tracing/contrib/que/configuration/settings'
-require 'datadog/tracing/contrib/que/patcher'
+require_relative '../integration'
+require_relative 'ext'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/que/patcher.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-# typed: false
-
-require 'datadog/tracing/contrib/que/integration'
-require 'datadog/tracing/contrib/que/tracer'
+require_relative 'tracer'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/que/tracer.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-# typed: true
-
-require 'datadog/tracing/contrib/analytics'
+require_relative '../analytics'
 
 module Datadog
   module Tracing
@@ -18,6 +16,8 @@ module Datadog
             }
 
             Tracing.trace(Ext::SPAN_JOB, **trace_options) do |request_span|
+              request_span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
+
               request_span.resource = job.class.name.to_s
 
               request_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
@@ -33,6 +33,8 @@ module Datadog
               request_span.set_tag(Ext::TAG_JOB_ARGS, job.que_attrs[:args]) if configuration[:tag_args]
               request_span.set_tag(Ext::TAG_JOB_DATA, job.que_attrs[:data]) if configuration[:tag_data]
 
+              request_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER)
+
               set_sample_rate(request_span)
               Contrib::Analytics.set_measured(request_span)
 

data/lib/datadog/tracing/contrib/racecar/configuration/settings.rb

@@ -1,7 +1,5 @@
-# typed: false
-
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/racecar/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/racecar/event.rb

@@ -1,10 +1,7 @@
-# typed: true
-
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/active_support/notifications/event'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/racecar/ext'
+require_relative '../../metadata/ext'
+require_relative '../active_support/notifications/event'
+require_relative '../analytics'
+require_relative 'ext'
 
 module Datadog
   module Tracing
@@ -38,6 +35,7 @@ module Datadog
               span.service = configuration[:service_name]
               span.resource = payload[:consumer_class]
 
+              span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_MESSAGING_SYSTEM)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
 
               # Tag as an external peer service

data/lib/datadog/tracing/contrib/racecar/events/batch.rb

@@ -1,7 +1,5 @@
-# typed: false
-
-require 'datadog/tracing/contrib/racecar/ext'
-require 'datadog/tracing/contrib/racecar/event'
+require_relative '../ext'
+require_relative '../event'
 
 module Datadog
   module Tracing
@@ -25,7 +23,10 @@ module Datadog
             end
 
             def span_options
-              super.merge(tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_BATCH })
+              super.merge(
+                tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_BATCH,
+                        Tracing::Metadata::Ext::TAG_KIND => Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER }
+              )
             end
           end
         end

data/lib/datadog/tracing/contrib/racecar/events/consume.rb

@@ -1,7 +1,5 @@
-# typed: false
-
-require 'datadog/tracing/contrib/racecar/ext'
-require 'datadog/tracing/contrib/racecar/event'
+require_relative '../ext'
+require_relative '../event'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/racecar/events/message.rb

@@ -1,7 +1,5 @@
-# typed: false
-
-require 'datadog/tracing/contrib/racecar/ext'
-require 'datadog/tracing/contrib/racecar/event'
+require_relative '../ext'
+require_relative '../event'
 
 module Datadog
   module Tracing
@@ -25,7 +23,10 @@ module Datadog
             end
 
             def span_options
-              super.merge(tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_MESSAGE })
+              super.merge(
+                tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_MESSAGE,
+                        Tracing::Metadata::Ext::TAG_KIND => Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER }
+              )
             end
           end
         end

data/lib/datadog/tracing/contrib/racecar/events.rb

@@ -1,8 +1,6 @@
-# typed: false
-
-require 'datadog/tracing/contrib/racecar/events/batch'
-require 'datadog/tracing/contrib/racecar/events/message'
-require 'datadog/tracing/contrib/racecar/events/consume'
+require_relative 'events/batch'
+require_relative 'events/message'
+require_relative 'events/consume'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/racecar/ext.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib
@@ -24,6 +22,7 @@ module Datadog
           TAG_OPERATION_CONSUME = 'consume'.freeze
           TAG_OPERATION_BATCH = 'batch'.freeze
           TAG_OPERATION_MESSAGE = 'message'.freeze
+          TAG_MESSAGING_SYSTEM = 'kafka'.freeze
         end
       end
     end

data/lib/datadog/tracing/contrib/racecar/integration.rb

@@ -1,8 +1,6 @@
-# typed: false
-
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/racecar/configuration/settings'
-require 'datadog/tracing/contrib/racecar/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/racecar/patcher.rb

@@ -1,9 +1,6 @@
-# typed: true
-
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/racecar/ext'
-require 'datadog/tracing/contrib/racecar/events'
-require 'datadog/tracing/contrib/racecar/integration'
+require_relative '../patcher'
+require_relative 'ext'
+require_relative 'events'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/rack/configuration/settings.rb

@@ -1,7 +1,5 @@
-# typed: false
-
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/rack/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/rack/ext.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib
@@ -11,10 +9,15 @@ module Datadog
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_RACK_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RACK_ANALYTICS_SAMPLE_RATE'.freeze
           RACK_ENV_REQUEST_SPAN = 'datadog.rack_request_span'.freeze
+          SPAN_HTTP_PROXY_REQUEST = 'http.proxy.request'.freeze
+          SPAN_HTTP_PROXY_QUEUE = 'http.proxy.queue'.freeze
           SPAN_HTTP_SERVER_QUEUE = 'http_server.queue'.freeze
           SPAN_REQUEST = 'rack.request'.freeze
           TAG_COMPONENT = 'rack'.freeze
+          TAG_COMPONENT_HTTP_PROXY = 'http_proxy'.freeze
           TAG_OPERATION_REQUEST = 'request'.freeze
+          TAG_OPERATION_HTTP_PROXY_REQUEST = 'request'.freeze
+          TAG_OPERATION_HTTP_PROXY_QUEUE = 'queue'.freeze
           TAG_OPERATION_HTTP_SERVER_QUEUE = 'queue'.freeze
           WEBSERVER_APP = 'webserver'.freeze
           DEFAULT_PEER_WEBSERVER_SERVICE_NAME = 'web-server'.freeze

data/lib/datadog/tracing/contrib/rack/header_collection.rb

@@ -0,0 +1,35 @@
+require_relative '../../../core/header_collection'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Rack
+        # Classes and utilities for handling headers in Rack.
+        module Header
+          # An implementation of a header collection that looks up headers from a Rack environment.
+          class RequestHeaderCollection < Datadog::Core::HeaderCollection
+            # Creates a header collection from a rack environment.
+            def initialize(env)
+              super()
+              @env = env
+            end
+
+            # Gets the value of the header with the given name.
+            def get(header_name)
+              @env[Header.to_rack_header(header_name)]
+            end
+
+            # Tests whether a header with the given name exists in the environment.
+            def key?(header_name)
+              @env.key?(Header.to_rack_header(header_name))
+            end
+          end
+
+          def self.to_rack_header(name)
+            "HTTP_#{name.to_s.upcase.gsub(/[-\s]/, '_')}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/contrib/rack/integration.rb

@@ -1,9 +1,7 @@
-# typed: false
-
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/rack/configuration/settings'
-require 'datadog/tracing/contrib/rack/patcher'
-require 'datadog/tracing/contrib/rails/utils'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
+require_relative '../rails/utils'
 
 module Datadog
   module Tracing