RubyGems - ddtrace - Versions diffs - 1.0.0 → 1.9.0 - Mend

ddtrace 1.0.0 → 1.9.0

Files changed (646) hide show

data/lib/datadog/tracing/contrib/httpclient/patcher.rb CHANGED Viewed

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

data/lib/datadog/tracing/contrib/httprb/configuration/settings.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/httprb/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 module Datadog
   module Tracing
@@ -27,7 +27,17 @@ module Datadog
             end
             option :distributed_tracing, default: true
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+            option :service_name do |o|
+              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.lazy
+            end
+            option :error_status_codes do |o|
+              o.default { env_to_list(Ext::ENV_ERROR_STATUS_CODES, 400...600, comma_separated_only: false) }
+              o.lazy
+            end
             option :split_by_domain, default: false
           end
         end

data/lib/datadog/tracing/contrib/httprb/ext.rb CHANGED Viewed

@@ -8,8 +8,10 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_HTTPRB_ENABLED'.freeze
+          ENV_SERVICE_NAME = 'DD_TRACE_HTTPRB_SERVICE_NAME'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_HTTPRB_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_EHTTPRB_ANALYTICS_SAMPLE_RATE'.freeze
+          ENV_ERROR_STATUS_CODES = 'DD_TRACE_HTTPCLIENT_ERROR_STATUS_CODES'.freeze
           DEFAULT_PEER_SERVICE_NAME = 'httprb'.freeze
           SPAN_REQUEST = 'httprb.request'.freeze
           TAG_COMPONENT = 'httprb'.freeze

data/lib/datadog/tracing/contrib/httprb/instrumentation.rb CHANGED Viewed

@@ -1,10 +1,9 @@
 # typed: false
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/propagation/http'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/http_annotation_helper'
+require_relative '../../metadata/ext'
+require_relative '../../propagation/http'
+require_relative '../analytics'
+require_relative '../http_annotation_helper'
 module Datadog
   module Tracing
@@ -43,7 +42,7 @@ module Datadog
                 end
                 # Add additional response specific tags to the span.
-                annotate_span_with_response!(span, res)
+                annotate_span_with_response!(span, res, request_options)
                 res
               end
@@ -52,6 +51,8 @@ module Datadog
             private
             def annotate_span_with_request!(span, req, req_options)
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
@@ -80,13 +81,12 @@ module Datadog
               set_analytics_sample_rate(span, req_options)
             end
-            def annotate_span_with_response!(span, response)
+            def annotate_span_with_response!(span, response, request_options)
               return unless response && response.code
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.code)
-              case response.code.to_i
-              when 400...599
+              if request_options[:error_status_codes].include? response.code.to_i
                 # https://github.com/DataDog/dd-trace-rb/issues/1116
                 # parsing the response body message will alter downstream application behavior
                 span.set_error(["Error #{response.code}", 'Error'])

data/lib/datadog/tracing/contrib/httprb/integration.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 # typed: false
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/httprb/configuration/settings'
-require 'datadog/tracing/contrib/configuration/resolvers/pattern_resolver'
-require 'datadog/tracing/contrib/httprb/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative '../configuration/resolvers/pattern_resolver'
+require_relative 'patcher'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/httprb/patcher.rb CHANGED Viewed

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

data/lib/datadog/tracing/contrib/integration.rb CHANGED Viewed

@@ -1,8 +1,8 @@
 # typed: true
-require 'datadog/tracing/contrib/configurable'
-require 'datadog/tracing/contrib/patchable'
-require 'datadog/tracing/contrib/registerable'
+require_relative 'configurable'
+require_relative 'patchable'
+require_relative 'registerable'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/kafka/configuration/settings.rb CHANGED Viewed

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

data/lib/datadog/tracing/contrib/kafka/consumer_event.rb CHANGED Viewed

@@ -10,6 +10,7 @@ module Datadog
             super
             span.set_tag(Ext::TAG_GROUP, payload[:group_id])
+            span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER)
           end
         end
       end

data/lib/datadog/tracing/contrib/kafka/event.rb CHANGED Viewed

@@ -1,8 +1,8 @@
 # typed: false
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/active_support/notifications/event'
-require 'datadog/tracing/contrib/kafka/ext'
+require_relative '../analytics'
+require_relative '../active_support/notifications/event'
+require_relative 'ext'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/kafka/events/connection/request.rb CHANGED Viewed

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

data/lib/datadog/tracing/contrib/kafka/events/consumer/process_batch.rb CHANGED Viewed

@@ -1,8 +1,8 @@
 # typed: true
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
-require 'datadog/tracing/contrib/kafka/consumer_event'
+require_relative '../../ext'
+require_relative '../../event'
+require_relative '../../consumer_event'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/kafka/events/consumer/process_message.rb CHANGED Viewed

@@ -1,8 +1,8 @@
 # typed: true
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
-require 'datadog/tracing/contrib/kafka/consumer_event'
+require_relative '../../ext'
+require_relative '../../event'
+require_relative '../../consumer_event'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/kafka/events/consumer_group/heartbeat.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 # typed: true
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
-require 'datadog/tracing/contrib/kafka/consumer_event'
-require 'datadog/tracing/contrib/kafka/consumer_group_event'
+require_relative '../../ext'
+require_relative '../../event'
+require_relative '../../consumer_event'
+require_relative '../../consumer_group_event'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/kafka/events/consumer_group/join_group.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 # typed: true
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
-require 'datadog/tracing/contrib/kafka/consumer_event'
-require 'datadog/tracing/contrib/kafka/consumer_group_event'
+require_relative '../../ext'
+require_relative '../../event'
+require_relative '../../consumer_event'
+require_relative '../../consumer_group_event'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/kafka/events/consumer_group/leave_group.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 # typed: true
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
-require 'datadog/tracing/contrib/kafka/consumer_event'
-require 'datadog/tracing/contrib/kafka/consumer_group_event'
+require_relative '../../ext'
+require_relative '../../event'
+require_relative '../../consumer_event'
+require_relative '../../consumer_group_event'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/kafka/events/consumer_group/sync_group.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 # typed: true
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
-require 'datadog/tracing/contrib/kafka/consumer_event'
-require 'datadog/tracing/contrib/kafka/consumer_group_event'
+require_relative '../../ext'
+require_relative '../../event'
+require_relative '../../consumer_event'
+require_relative '../../consumer_group_event'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/kafka/events/produce_operation/send_messages.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 # typed: true
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
+require_relative '../../ext'
+require_relative '../../event'
 module Datadog
   module Tracing
@@ -20,6 +20,7 @@ module Datadog
                 span.set_tag(Ext::TAG_MESSAGE_COUNT, payload[:message_count]) if payload.key?(:message_count)
                 span.set_tag(Ext::TAG_SENT_MESSAGE_COUNT, payload[:sent_message_count]) if payload.key?(:sent_message_count)
+                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_PRODUCER)
               end
               module_function

data/lib/datadog/tracing/contrib/kafka/events/producer/deliver_messages.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 # typed: true
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
+require_relative '../../ext'
+require_relative '../../event'
 module Datadog
   module Tracing
@@ -23,6 +23,7 @@ module Datadog
                 if payload.key?(:delivered_message_count)
                   span.set_tag(Ext::TAG_DELIVERED_MESSAGE_COUNT, payload[:delivered_message_count])
                 end
+                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_PRODUCER)
               end
               module_function

data/lib/datadog/tracing/contrib/kafka/events.rb CHANGED Viewed

@@ -1,14 +1,14 @@
 # typed: false
-require 'datadog/tracing/contrib/kafka/events/connection/request'
-require 'datadog/tracing/contrib/kafka/events/consumer/process_batch'
-require 'datadog/tracing/contrib/kafka/events/consumer/process_message'
-require 'datadog/tracing/contrib/kafka/events/consumer_group/heartbeat'
-require 'datadog/tracing/contrib/kafka/events/consumer_group/join_group'
-require 'datadog/tracing/contrib/kafka/events/consumer_group/leave_group'
-require 'datadog/tracing/contrib/kafka/events/consumer_group/sync_group'
-require 'datadog/tracing/contrib/kafka/events/produce_operation/send_messages'
-require 'datadog/tracing/contrib/kafka/events/producer/deliver_messages'
+require_relative 'events/connection/request'
+require_relative 'events/consumer/process_batch'
+require_relative 'events/consumer/process_message'
+require_relative 'events/consumer_group/heartbeat'
+require_relative 'events/consumer_group/join_group'
+require_relative 'events/consumer_group/leave_group'
+require_relative 'events/consumer_group/sync_group'
+require_relative 'events/produce_operation/send_messages'
+require_relative 'events/producer/deliver_messages'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/kafka/integration.rb CHANGED Viewed

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

data/lib/datadog/tracing/contrib/kafka/patcher.rb CHANGED Viewed

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

data/lib/datadog/tracing/contrib/lograge/configuration/settings.rb CHANGED Viewed

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

data/lib/datadog/tracing/contrib/lograge/instrumentation.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 # typed: true
-require 'datadog/tracing'
+require_relative '../../../core/logging/ext'
 module Datadog
   module Tracing
@@ -33,7 +33,7 @@ module Datadog
                   service: correlation.service.to_s,
                   version: correlation.version.to_s
                 },
-                ddsource: ['ruby']
+                ddsource: Core::Logging::Ext::DD_SOURCE
               }
               datadog_trace_log_hash.merge(original_custom_options)

data/lib/datadog/tracing/contrib/lograge/integration.rb CHANGED Viewed

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

data/lib/datadog/tracing/contrib/lograge/patcher.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 # typed: true
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/lograge/instrumentation'
+require_relative '../patcher'
+require_relative 'instrumentation'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/mongodb/configuration/settings.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/mongodb/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 module Datadog
   module Tracing
@@ -29,7 +29,11 @@ module Datadog
             end
             option :quantize, default: DEFAULT_QUANTIZE
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+            option :service_name do |o|
+              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.lazy
+            end
           end
         end
       end

data/lib/datadog/tracing/contrib/mongodb/ext.rb CHANGED Viewed

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_MONGO_ENABLED'.freeze
+          ENV_SERVICE_NAME = 'DD_TRACE_MONGO_SERVICE_NAME'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_MONGO_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_MONGO_ANALYTICS_SAMPLE_RATE'.freeze
           DEFAULT_PEER_SERVICE_NAME = 'mongodb'.freeze
@@ -20,6 +21,13 @@ module Datadog
           TAG_ROWS = 'mongodb.rows'.freeze
           TAG_COMPONENT = 'mongodb'.freeze
           TAG_OPERATION_COMMAND = 'command'.freeze
+          TAG_SYSTEM = 'mongodb'.freeze
+          # Temporary namespace to accommodate unified tags which has naming collision, before
+          # making breaking changes
+          module DB
+            TAG_COLLECTION = 'db.mongodb.collection'.freeze
+          end
         end
       end
     end

data/lib/datadog/tracing/contrib/mongodb/instrumentation.rb CHANGED Viewed

@@ -1,8 +1,8 @@
 # typed: false
-require 'datadog/tracing/contrib/mongodb/ext'
-require 'datadog/tracing/contrib/mongodb/parsers'
-require 'datadog/tracing/contrib/mongodb/subscribers'
+require_relative 'ext'
+require_relative 'parsers'
+require_relative 'subscribers'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/mongodb/integration.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 # typed: false
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/configuration/resolvers/pattern_resolver'
-require 'datadog/tracing/contrib/mongodb/configuration/settings'
-require 'datadog/tracing/contrib/mongodb/patcher'
+require_relative '../integration'
+require_relative '../configuration/resolvers/pattern_resolver'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/mongodb/parsers.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-require 'datadog/tracing/contrib/utils/quantization/hash'
+require_relative '../utils/quantization/hash'
 # typed: true

data/lib/datadog/tracing/contrib/mongodb/patcher.rb CHANGED Viewed

@@ -1,8 +1,8 @@
 # typed: false
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/mongodb/ext'
-require 'datadog/tracing/contrib/mongodb/instrumentation'
+require_relative '../patcher'
+require_relative 'ext'
+require_relative 'instrumentation'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/mongodb/subscribers.rb CHANGED Viewed

@@ -1,9 +1,10 @@
 # typed: true
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/mongodb/ext'
-require 'datadog/tracing/contrib/mongodb/parsers'
-require 'datadog/tracing/metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative '../ext'
+require_relative 'parsers'
+require_relative '../../metadata/ext'
 module Datadog
   module Tracing
@@ -30,6 +31,10 @@ module Datadog
             query = MongoDB.query_builder(event.command_name, event.database_name, event.command)
             serialized_query = query.to_s
+            span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
+            span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
             span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
             span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_COMMAND)
@@ -44,6 +49,7 @@ module Datadog
             # since it has been quantized and reduced
             span.set_tag(Ext::TAG_DB, query['database'])
             span.set_tag(Ext::TAG_COLLECTION, query['collection'])
+            span.set_tag(Ext::DB::TAG_COLLECTION, query['collection'])
             span.set_tag(Ext::TAG_OPERATION, query['operation'])
             span.set_tag(Ext::TAG_QUERY, serialized_query)
             span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, event.address.host)

data/lib/datadog/tracing/contrib/mysql2/configuration/settings.rb CHANGED Viewed

@@ -1,7 +1,9 @@
 # typed: false
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/mysql2/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
+require_relative '../../propagation/sql_comment'
 module Datadog
   module Tracing
@@ -26,7 +28,20 @@ module Datadog
               o.lazy
             end
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+            option :service_name do |o|
+              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.lazy
+            end
+            option :comment_propagation do |o|
+              o.default do
+                ENV.fetch(
+                  Contrib::Propagation::SqlComment::Ext::ENV_DBM_PROPAGATION_MODE,
+                  Contrib::Propagation::SqlComment::Ext::DISABLED
+                )
+              end
+              o.lazy
+            end
           end
         end
       end

data/lib/datadog/tracing/contrib/mysql2/ext.rb CHANGED Viewed

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_MYSQL2_ENABLED'.freeze
+          ENV_SERVICE_NAME = 'DD_TRACE_MYSQL2_SERVICE_NAME'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_MYSQL2_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_MYSQL2_ANALYTICS_SAMPLE_RATE'.freeze
           DEFAULT_PEER_SERVICE_NAME = 'mysql2'.freeze
@@ -15,6 +16,7 @@ module Datadog
           TAG_DB_NAME = 'mysql2.db.name'.freeze
           TAG_COMPONENT = 'mysql2'.freeze
           TAG_OPERATION_QUERY = 'query'.freeze
+          TAG_SYSTEM = 'mysql'.freeze
         end
       end
     end