ddtrace 1.0.0.beta1 → 1.1.0

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

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing'
 require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/contrib/active_support/notifications/event'
@@ -30,7 +31,7 @@ module Datadog
             end
 
             def configuration
-              Datadog.configuration[:racecar]
+              Datadog.configuration.tracing[:racecar]
             end
 
             def process(span, event, _id, payload)

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/racecar/ext'
 require 'datadog/tracing/contrib/racecar/event'
 

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/racecar/ext'
 require 'datadog/tracing/contrib/racecar/event'
 

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/racecar/ext'
 require 'datadog/tracing/contrib/racecar/event'
 

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/racecar/events/batch'
 require 'datadog/tracing/contrib/racecar/events/message'
 require 'datadog/tracing/contrib/racecar/events/consume'

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

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/racecar/configuration/settings'
 require 'datadog/tracing/contrib/racecar/patcher'

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

@@ -1,8 +1,8 @@
 # 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'
 
 module Datadog
   module Tracing

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/rack/ext'
 

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

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/rack/configuration/settings'
 require 'datadog/tracing/contrib/rack/patcher'

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'date'
 
 require 'datadog/core/environment/variable_helpers'
@@ -211,7 +212,7 @@ module Datadog
           private
 
           def configuration
-            Datadog.configuration[:rack]
+            Datadog.configuration.tracing[:rack]
           end
 
           def parse_request_headers(env)

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

@@ -1,4 +1,5 @@
 # typed: false
+
 module Datadog
   module Tracing
     module Contrib
@@ -61,7 +62,7 @@ module Datadog
           end
 
           def get_option(option)
-            Datadog.configuration[:rack].get_option(option)
+            Datadog.configuration.tracing[:rack].get_option(option)
           end
         end
 
@@ -99,7 +100,7 @@ module Datadog
           end
 
           def get_option(option)
-            Datadog.configuration[:rack].get_option(option)
+            Datadog.configuration.tracing[:rack].get_option(option)
           end
         end
       end

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

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

data/lib/datadog/tracing/contrib/rails/auto_instrument_railtie.rb

@@ -1,10 +1,12 @@
 # typed: ignore
 
+require 'datadog/tracing/contrib/auto_instrument'
+
 # Railtie to include AutoInstrumentation in rails loading
 class DatadogAutoInstrumentRailtie < Rails::Railtie
   # we want to load before config initializers so that any user supplied config
   # in config/initializers/datadog.rb will take precedence
   initializer 'datadog.start_tracer', before: :load_config_initializers do
-    Datadog::Tracing::Contrib::AutoInstrument.patch_all
+    Datadog::Tracing::Contrib::AutoInstrument.patch_all!
   end
 end

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 
 module Datadog
@@ -32,7 +33,7 @@ module Datadog
               o.lazy
               o.on_set do |value|
                 # Update ActionPack analytics too
-                Datadog.configuration[:action_pack][:analytics_enabled] = value
+                Datadog.configuration.tracing[:action_pack][:analytics_enabled] = value
               end
             end
 
@@ -41,7 +42,7 @@ module Datadog
               o.lazy
               o.on_set do |value|
                 # Update ActionPack analytics too
-                Datadog.configuration[:action_pack][:analytics_sample_rate] = value
+                Datadog.configuration.tracing[:action_pack][:analytics_sample_rate] = value
               end
             end
 
@@ -49,7 +50,7 @@ module Datadog
             option :exception_controller do |o|
               o.on_set do |value|
                 # Update ActionPack exception controller too
-                Datadog.configuration[:action_pack][:exception_controller] = value
+                Datadog.configuration.tracing[:action_pack][:exception_controller] = value
               end
             end
 
@@ -59,7 +60,7 @@ module Datadog
               o.default 'views/'
               o.on_set do |value|
                 # Update ActionView template base path too
-                Datadog.configuration[:action_view][:template_base_path] = value
+                Datadog.configuration.tracing[:action_view][:template_base_path] = value
               end
             end
           end

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

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

data/lib/datadog/tracing/contrib/rails/framework.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing'
 require 'datadog/tracing/contrib/action_cable/integration'
 require 'datadog/tracing/contrib/action_mailer/integration'
@@ -38,31 +39,31 @@ module Datadog
               # By default, default service would be guessed from the script
               # being executed, but here we know better, get it from Rails config.
               # Don't set this if service has been explicitly provided by the user.
-              rails_service_name = Datadog.configuration[:rails][:service_name] \
+              rails_service_name = Datadog.configuration.tracing[:rails][:service_name] \
                                     || Datadog.configuration.service_without_fallback \
                                     || Utils.app_name
 
               datadog_config.service ||= rails_service_name
             end
 
-            Datadog.configure do |trace_config|
-              rails_config = trace_config[:rails]
-
-              activate_rack!(trace_config, rails_config)
-              activate_action_cable!(trace_config, rails_config)
-              activate_action_mailer!(trace_config, rails_config)
-              activate_active_support!(trace_config, rails_config)
-              activate_action_pack!(trace_config, rails_config)
-              activate_action_view!(trace_config, rails_config)
-              activate_active_job!(trace_config, rails_config)
-              activate_active_record!(trace_config, rails_config)
-              activate_lograge!(trace_config, rails_config)
-              activate_semantic_logger!(trace_config, rails_config)
+            Datadog.configure do |datadog_config|
+              rails_config = datadog_config.tracing[:rails]
+
+              activate_rack!(datadog_config, rails_config)
+              activate_action_cable!(datadog_config, rails_config)
+              activate_action_mailer!(datadog_config, rails_config)
+              activate_active_support!(datadog_config, rails_config)
+              activate_action_pack!(datadog_config, rails_config)
+              activate_action_view!(datadog_config, rails_config)
+              activate_active_job!(datadog_config, rails_config)
+              activate_active_record!(datadog_config, rails_config)
+              activate_lograge!(datadog_config, rails_config)
+              activate_semantic_logger!(datadog_config, rails_config)
             end
           end
 
-          def self.activate_rack!(trace_config, rails_config)
-            trace_config.tracing.instrument(
+          def self.activate_rack!(datadog_config, rails_config)
+            datadog_config.tracing.instrument(
               :rack,
               application: ::Rails.application,
               service_name: rails_config[:service_name],
@@ -71,75 +72,75 @@ module Datadog
             )
           end
 
-          def self.activate_active_support!(trace_config, rails_config)
+          def self.activate_active_support!(datadog_config, rails_config)
             return unless defined?(::ActiveSupport)
 
-            trace_config.tracing.instrument(:active_support)
+            datadog_config.tracing.instrument(:active_support)
           end
 
-          def self.activate_action_cable!(trace_config, rails_config)
+          def self.activate_action_cable!(datadog_config, rails_config)
             return unless defined?(::ActionCable)
 
-            trace_config.tracing.instrument(:action_cable)
+            datadog_config.tracing.instrument(:action_cable)
           end
 
-          def self.activate_action_mailer!(trace_config, rails_config)
+          def self.activate_action_mailer!(datadog_config, rails_config)
             return unless defined?(::ActionMailer)
 
-            trace_config.tracing.instrument(
+            datadog_config.tracing.instrument(
               :action_mailer,
               service_name: rails_config[:service_name]
             )
           end
 
-          def self.activate_action_pack!(trace_config, rails_config)
+          def self.activate_action_pack!(datadog_config, rails_config)
             return unless defined?(::ActionPack)
 
-            trace_config.tracing.instrument(
+            datadog_config.tracing.instrument(
               :action_pack,
               service_name: rails_config[:service_name]
             )
           end
 
-          def self.activate_action_view!(trace_config, rails_config)
+          def self.activate_action_view!(datadog_config, rails_config)
             return unless defined?(::ActionView)
 
-            trace_config.tracing.instrument(
+            datadog_config.tracing.instrument(
               :action_view,
               service_name: rails_config[:service_name]
             )
           end
 
-          def self.activate_active_job!(trace_config, rails_config)
+          def self.activate_active_job!(datadog_config, rails_config)
             return unless defined?(::ActiveJob)
 
-            trace_config.tracing.instrument(
+            datadog_config.tracing.instrument(
               :active_job,
               service_name: rails_config[:service_name]
             )
           end
 
-          def self.activate_active_record!(trace_config, rails_config)
+          def self.activate_active_record!(datadog_config, rails_config)
             return unless defined?(::ActiveRecord)
 
-            trace_config.tracing.instrument(:active_record)
+            datadog_config.tracing.instrument(:active_record)
           end
 
-          def self.activate_lograge!(trace_config, rails_config)
+          def self.activate_lograge!(datadog_config, rails_config)
             return unless defined?(::Lograge)
 
-            if trace_config.tracing.log_injection
-              trace_config.tracing.instrument(
+            if datadog_config.tracing.log_injection
+              datadog_config.tracing.instrument(
                 :lograge
               )
             end
           end
 
-          def self.activate_semantic_logger!(trace_config, rails_config)
+          def self.activate_semantic_logger!(datadog_config, rails_config)
             return unless defined?(::SemanticLogger)
 
-            if trace_config.tracing.log_injection
-              trace_config.tracing.instrument(
+            if datadog_config.tracing.log_injection
+              datadog_config.tracing.instrument(
                 :semantic_logger
               )
             end

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 
 require 'datadog/tracing/contrib/rails/ext'

data/lib/datadog/tracing/contrib/rails/log_injection.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing'
 
 module Datadog
@@ -21,24 +22,11 @@ module Datadog
             end
           rescue StandardError => e
             # TODO: can we use Datadog.logger at this point?
-            Datadog.logger.warn("Unable to add Datadog Trace context to ActiveSupport::TaggedLogging: #{e.message}")
+            Datadog.logger.warn(
+              "Unable to add Datadog Trace context to ActiveSupport::TaggedLogging: #{e.class.name} #{e.message}"
+            )
             false
           end
-
-          def datadog_trace_log_hash(correlation)
-            {
-              # Adds IDs as tags to log output
-              dd: {
-                # To preserve precision during JSON serialization, use strings for large numbers
-                trace_id: correlation.trace_id.to_s,
-                span_id: correlation.span_id.to_s,
-                env: correlation.env.to_s,
-                service: correlation.service.to_s,
-                version: correlation.version.to_s
-              },
-              ddsource: ['ruby']
-            }
-          end
         end
       end
     end

data/lib/datadog/tracing/contrib/rails/middlewares.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing'
 require 'datadog/tracing/contrib/action_pack/utils'
 

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

@@ -1,4 +1,5 @@
 # typed: ignore
+
 require 'datadog/core/utils/only_once'
 require 'datadog/tracing'
 require 'datadog/tracing/contrib/rack/middlewares'
@@ -41,7 +42,7 @@ module Datadog
               # Middleware must be added before the application is initialized.
               # Otherwise the middleware stack will be frozen.
               # Sometimes we don't want to activate middleware e.g. OpenTracing, etc.
-              add_middleware(app) if Datadog.configuration[:rails][:middleware]
+              add_middleware(app) if Datadog.configuration.tracing[:rails][:middleware]
               add_logger(app) if Datadog.configuration.tracing.log_injection
             end
           end
@@ -80,7 +81,9 @@ module Datadog
 
             # if lograge isn't set, check if tagged logged is enabled.
             # if so, add proc that injects trace identifiers for tagged logging.
-            if (logger = app.config.logger) \
+            logger = app.config.logger || ::Rails.logger
+
+            if logger \
                 && defined?(::ActiveSupport::TaggedLogging) \
                 && logger.is_a?(::ActiveSupport::TaggedLogging)
 
@@ -88,7 +91,9 @@ module Datadog
               should_warn = false
             end
 
-            Datadog.logger.warn("Unable to enable Datadog Trace context, Logger #{logger} is not supported") if should_warn
+            if should_warn
+              Datadog.logger.warn("Unable to enable Datadog Trace context, Logger #{logger.class} is not supported")
+            end
           end
 
           def patch_after_intialize

data/lib/datadog/tracing/contrib/rails/railtie.rb

@@ -1,4 +1,5 @@
 # typed: ignore
+
 require 'datadog/tracing/contrib/rails/framework'
 require 'datadog/tracing/contrib/rails/middlewares'
 require 'datadog/tracing/contrib/rack/middlewares'

data/lib/datadog/tracing/contrib/rails/utils.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/analytics'
 
 module Datadog

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/rake/ext'
 

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

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

data/lib/datadog/tracing/contrib/rake/instrumentation.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing'
 require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/contrib/analytics'
@@ -60,7 +61,7 @@ module Datadog
               span.set_tag(Ext::TAG_TASK_ARG_NAMES, arg_names)
               span.set_tag(Ext::TAG_INVOKE_ARGS, quantize_args(args)) unless args.nil?
             rescue StandardError => e
-              Datadog.logger.debug("Error while tracing Rake invoke: #{e.message}")
+              Datadog.logger.debug("Error while tracing Rake invoke: #{e.class.name} #{e.message}")
             end
 
             def annotate_execute!(span, args)
@@ -69,7 +70,7 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_EXECUTE)
               span.set_tag(Ext::TAG_EXECUTE_ARGS, quantize_args(args.to_hash)) unless args.nil?
             rescue StandardError => e
-              Datadog.logger.debug("Error while tracing Rake execute: #{e.message}")
+              Datadog.logger.debug("Error while tracing Rake execute: #{e.class.name} #{e.message}")
             end
 
             def quantize_args(args)
@@ -78,7 +79,8 @@ module Datadog
             end
 
             def enabled?
-              configuration[:enabled] == true
+              Datadog.configuration.tracing.enabled && \
+                configuration[:enabled] == true
             end
 
             def span_options
@@ -86,7 +88,7 @@ module Datadog
             end
 
             def configuration
-              Datadog.configuration[:rake]
+              Datadog.configuration.tracing[:rake]
             end
           end
         end

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/rake/configuration/settings'
 require 'datadog/tracing/contrib/rake/patcher'

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

@@ -1,9 +1,9 @@
 # typed: true
+
 require 'datadog/tracing'
 require 'datadog/tracing/contrib/patcher'
 require 'datadog/tracing/contrib/rake/ext'
 require 'datadog/tracing/contrib/rake/instrumentation'
-require 'datadog/tracing/contrib/rake/integration'
 
 module Datadog
   module Tracing
@@ -25,7 +25,7 @@ module Datadog
           end
 
           def get_option(option)
-            Datadog.configuration[:rake].get_option(option)
+            Datadog.configuration.tracing[:rake].get_option(option)
           end
         end
       end

data/lib/datadog/tracing/contrib/redis/configuration/resolver.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/contrib/redis/vendor/resolver'
 
 module Datadog

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/redis/ext'
 

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

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

data/lib/datadog/tracing/contrib/redis/instrumentation.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing'
 require 'datadog/tracing/contrib/patcher'
 require 'datadog/tracing/contrib/redis/configuration/resolver'
@@ -67,7 +68,7 @@ module Datadog
             end
 
             def datadog_configuration
-              Datadog.configuration[:redis, options]
+              Datadog.configuration.tracing[:redis, options]
             end
           end
         end

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/redis/configuration/settings'
 require 'datadog/tracing/contrib/redis/patcher'

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

@@ -1,8 +1,8 @@
 # typed: false
+
 require 'datadog/tracing/contrib/patcher'
 require 'datadog/tracing/contrib/redis/ext'
 require 'datadog/tracing/contrib/redis/configuration/resolver'
-require 'datadog/tracing/contrib/redis/integration'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/redis/quantize.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'set'
 
 module Datadog

data/lib/datadog/tracing/contrib/redis/tags.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing'
 require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/contrib/analytics'
@@ -31,7 +32,7 @@ module Datadog
             private
 
             def datadog_configuration
-              Datadog.configuration[:redis]
+              Datadog.configuration.tracing[:redis]
             end
 
             def analytics_enabled?

data/lib/datadog/tracing/contrib/redis/vendor/resolver.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'uri'
 
 # NOTE: This code is copied directly from Redis.

data/lib/datadog/tracing/contrib/registry.rb

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/span_operation'
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/resque/ext'

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

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/resque/configuration/settings'
 require 'datadog/tracing/contrib/resque/patcher'