ddtrace 1.0.0 → 1.1.0

data/lib/datadog/profiling/stack_recorder.rb

@@ -0,0 +1,33 @@
+# typed: false
+
+module Datadog
+  module Profiling
+    # Used to wrap a ddprof_ffi_Profile in a Ruby object and expose Ruby-level serialization APIs
+    # Methods prefixed with _native_ are implemented in `stack_recorder.c`
+    class StackRecorder
+      def serialize
+        status, result = self.class._native_serialize(self)
+
+        if status == :ok
+          start, finish, encoded_pprof = result
+
+          Datadog.logger.debug { "Encoded profile covering #{start.iso8601} to #{finish.iso8601}" }
+
+          [start, finish, encoded_pprof]
+        else
+          error_message = result
+
+          Datadog.logger.error("Failed to serialize profiling data: #{error_message}")
+
+          nil
+        end
+      end
+
+      # Used only for Ruby 2.2 and below which don't have the native `rb_time_timespec_new` API
+      # Called from native code
+      def self.ruby_time_from(timespec_seconds, timespec_nanoseconds)
+        Time.at(0).utc + timespec_seconds + (timespec_nanoseconds.to_r / 1_000_000_000)
+      end
+    end
+  end
+end

data/lib/datadog/profiling/tag_builder.rb

@@ -0,0 +1,48 @@
+# typed: true
+
+module Datadog
+  module Profiling
+    # Builds a hash of default plus user tags to be included in a profile
+    module TagBuilder
+      include Datadog::Profiling::Ext::Transport::HTTP # Tag name constants
+
+      def self.call(
+        settings:,
+        # Unified service tagging
+        env: settings.env,
+        service: settings.service,
+        version: settings.version,
+        # Other metadata
+        host: Core::Environment::Socket.hostname,
+        language: Core::Environment::Identity.lang,
+        pid: Process.pid.to_s,
+        profiler_version: Core::Environment::Identity.tracer_version,
+        runtime_engine: Core::Environment::Identity.lang_engine,
+        runtime_id: Core::Environment::Identity.id,
+        runtime_platform: Core::Environment::Identity.lang_platform,
+        runtime_version: Core::Environment::Identity.lang_version,
+        # User-provided tags
+        user_tags: settings.tags
+      )
+        tags = {
+          # When changing or adding these, make sure they are kept in sync with
+          # https://docs.google.com/spreadsheets/d/1LOGMf4c4Avbtn36uZ2SWvhIGKRPLM1BoWkUP4JYj7hA/ (Datadog internal link)
+          FORM_FIELD_TAG_HOST => host,
+          FORM_FIELD_TAG_LANGUAGE => language,
+          FORM_FIELD_TAG_PID => pid,
+          FORM_FIELD_TAG_PROFILER_VERSION => profiler_version,
+          FORM_FIELD_TAG_RUNTIME => language, # This is known to be repeated from language, above
+          FORM_FIELD_TAG_RUNTIME_ENGINE => runtime_engine,
+          FORM_FIELD_TAG_RUNTIME_ID => runtime_id,
+          FORM_FIELD_TAG_RUNTIME_PLATFORM => runtime_platform,
+          FORM_FIELD_TAG_RUNTIME_VERSION => runtime_version,
+        }
+        tags[FORM_FIELD_TAG_ENV] = env if env
+        tags[FORM_FIELD_TAG_SERVICE] = service if service
+        tags[FORM_FIELD_TAG_VERSION] = version if version
+
+        user_tags.merge(tags)
+      end
+    end
+  end
+end

data/lib/datadog/profiling/tasks/exec.rb

@@ -38,10 +38,10 @@ module Datadog
         def exec_with_error_handling(args)
           Kernel.exec(*args)
         rescue Errno::ENOENT => e
-          Kernel.warn "ddtracerb exec failed: #{e.message} (command was '#{args.join(' ')}')"
+          Kernel.warn "ddtracerb exec failed: #{e.class.name} #{e.message} (command was '#{args.join(' ')}')"
           Kernel.exit 127
         rescue Errno::EACCES, Errno::ENOEXEC => e
-          Kernel.warn "ddtracerb exec failed: #{e.message} (command was '#{args.join(' ')}')"
+          Kernel.warn "ddtracerb exec failed: #{e.class.name} #{e.message} (command was '#{args.join(' ')}')"
           Kernel.exit 126
         end
       end

data/lib/datadog/profiling/tasks/setup.rb

@@ -1,7 +1,6 @@
 # typed: false
 
 require 'datadog/core/utils/only_once'
-require 'datadog/profiling'
 require 'datadog/profiling/ext/forking'
 
 module Datadog
@@ -19,7 +18,8 @@ module Datadog
               setup_at_fork_hooks
             rescue StandardError, ScriptError => e
               Datadog.logger.warn do
-                "Profiler extensions unavailable. Cause: #{e.message} Location: #{Array(e.backtrace).first}"
+                "Profiler extensions unavailable. Cause: #{e.class.name} #{e.message} " \
+                "Location: #{Array(e.backtrace).first}"
               end
             end
           end
@@ -35,7 +35,8 @@ module Datadog
           end
         rescue StandardError, ScriptError => e
           Datadog.logger.warn do
-            "Profiler forking extensions unavailable. Cause: #{e.message} Location: #{Array(e.backtrace).first}"
+            "Profiler forking extensions unavailable. Cause: #{e.class.name} #{e.message} " \
+            "Location: #{Array(e.backtrace).first}"
           end
         end
 
@@ -65,7 +66,8 @@ module Datadog
                 Profiling.start_if_enabled
               rescue StandardError => e
                 Datadog.logger.warn do
-                  "Error during post-fork hooks. Cause: #{e.message} Location: #{Array(e.backtrace).first}"
+                  "Error during post-fork hooks. Cause: #{e.class.name} #{e.message} " \
+                  "Location: #{Array(e.backtrace).first}"
                 end
               end
             end

data/lib/datadog/profiling.rb

@@ -10,9 +10,6 @@ module Datadog
     GOOGLE_PROTOBUF_MINIMUM_VERSION = Gem::Version.new('3.0')
     private_constant :GOOGLE_PROTOBUF_MINIMUM_VERSION
 
-    SKIPPED_NATIVE_EXTENSION_ONLY_ONCE = Core::Utils::OnlyOnce.new
-    private_constant :SKIPPED_NATIVE_EXTENSION_ONLY_ONCE
-
     def self.supported?
       unsupported_reason.nil?
     end
@@ -21,7 +18,7 @@ module Datadog
       # NOTE: Only the first matching reason is returned, so try to keep a nice order on reasons -- e.g. tell users
       # first that they can't use this on JRuby before telling them that they are missing protobuf
 
-      ruby_engine_unsupported? ||
+      native_library_compilation_skipped? ||
         native_library_failed_to_load? ||
         protobuf_gem_unavailable? ||
         protobuf_version_unsupported? ||
@@ -44,8 +41,24 @@ module Datadog
       !!profiler
     end
 
-    private_class_method def self.ruby_engine_unsupported?
-      'JRuby is not supported' if RUBY_ENGINE == 'jruby'
+    private_class_method def self.native_library_compilation_skipped?
+      skipped_reason = try_reading_skipped_reason_file
+
+      "Your ddtrace installation is missing support for the Continuous Profiler because #{skipped_reason}" if skipped_reason
+    end
+
+    private_class_method def self.try_reading_skipped_reason_file(file_api = File)
+      # This file, if it exists, is recorded by extconf.rb during compilation of the native extension
+      skipped_reason_file = "#{__dir__}/../../ext/ddtrace_profiling_native_extension/skipped_reason.txt"
+
+      begin
+        return unless file_api.exist?(skipped_reason_file)
+
+        contents = file_api.read(skipped_reason_file).strip
+        contents unless contents.empty?
+      rescue StandardError
+        # Do nothing
+      end
     end
 
     private_class_method def self.protobuf_gem_unavailable?
@@ -93,12 +106,11 @@ module Datadog
         # In the future it'd be nice to shuffle the logger startup to happen first to avoid this special case.
         Kernel.warn(
           '[DDTRACE] Error while loading google-protobuf gem. ' \
-          "Cause: '#{e.message}' Location: '#{Array(e.backtrace).first}'. " \
+          "Cause: '#{e.class.name} #{e.message}' Location: '#{Array(e.backtrace).first}'. " \
           'This can happen when google-protobuf is missing its native components. ' \
           'To fix this, try removing and reinstalling the gem, forcing it to recompile the components: ' \
           '`gem uninstall google-protobuf -a; BUNDLE_FORCE_RUBY_PLATFORM=true bundle install`. ' \
-          'If the error persists, please contact support via <https://docs.datadoghq.com/help/> or ' \
-          'file a bug at <https://github.com/DataDog/dd-trace-rb/blob/master/CONTRIBUTING.md#found-a-bug>.'
+          'If the error persists, please contact Datadog support at <https://docs.datadoghq.com/help/>.'
         )
         @protobuf_loaded = false
       end
@@ -110,31 +122,18 @@ module Datadog
       unless success
         if exception
           'There was an error loading the profiling native extension due to ' \
-          "'#{exception.message}' at '#{exception.backtrace.first}'"
+          "'#{exception.class.name} #{exception.message}' at '#{exception.backtrace.first}'"
         else
           'The profiling native extension did not load correctly. ' \
-          'If the error persists, please contact support via <https://docs.datadoghq.com/help/> or ' \
-          'file a bug at <https://github.com/DataDog/dd-trace-rb/blob/master/CONTRIBUTING.md#found-a-bug>.'
+          'For help solving this issue, please contact Datadog support at <https://docs.datadoghq.com/help/>.' \
         end
       end
     end
 
     private_class_method def self.try_loading_native_library
-      if Core::Environment::VariableHelpers.env_to_bool('DD_PROFILING_NO_EXTENSION', false)
-        SKIPPED_NATIVE_EXTENSION_ONLY_ONCE.run do
-          Kernel.warn(
-            '[DDTRACE] Skipped loading of profiling native extension due to DD_PROFILING_NO_EXTENSION environment ' \
-            'variable being set. ' \
-            'This option is experimental and will lead to the profiler not working in future releases. ' \
-            'If you needed to use this, please tell us why on <https://github.com/DataDog/dd-trace-rb/issues/new>.'
-          )
-        end
-
-        return [true, nil]
-      end
-
       begin
-        require "ddtrace_profiling_native_extension.#{RUBY_VERSION}_#{RUBY_PLATFORM}"
+        require 'datadog/profiling/load_native_extension'
+
         success =
           defined?(Profiling::NativeExtension) && Profiling::NativeExtension.send(:native_working?)
         [success, nil]
@@ -148,7 +147,9 @@ module Datadog
 
       require 'datadog/profiling/ext/forking'
       require 'datadog/profiling/collectors/code_provenance'
+      require 'datadog/profiling/collectors/old_stack'
       require 'datadog/profiling/collectors/stack'
+      require 'datadog/profiling/stack_recorder'
       require 'datadog/profiling/exporter'
       require 'datadog/profiling/recorder'
       require 'datadog/profiling/scheduler'
@@ -159,10 +160,11 @@ module Datadog
       require 'datadog/profiling/native_extension'
       require 'datadog/profiling/trace_identifiers/helper'
       require 'datadog/profiling/pprof/pprof_pb'
+      require 'datadog/profiling/tag_builder'
 
       true
     end
 
-    load_profiling if supported?
+    load_profiling
   end
 end

data/lib/datadog/tracing/buffer.rb

@@ -58,7 +58,9 @@ module Datadog
 
         @buffer_spans += trace.length
       rescue StandardError => e
-        Datadog.logger.debug("Failed to measure queue accept. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
+        Datadog.logger.debug(
+          "Failed to measure queue accept. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+        )
       end
 
       def measure_drop(trace)
@@ -66,7 +68,9 @@ module Datadog
 
         @buffer_spans -= trace.length
       rescue StandardError => e
-        Datadog.logger.debug("Failed to measure queue drop. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
+        Datadog.logger.debug(
+          "Failed to measure queue drop. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+        )
       end
 
       def measure_pop(traces)
@@ -89,7 +93,9 @@ module Datadog
         @buffer_dropped = 0
         @buffer_spans = 0
       rescue StandardError => e
-        Datadog.logger.debug("Failed to measure queue. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
+        Datadog.logger.debug(
+          "Failed to measure queue. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+        )
       end
     end
 

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

@@ -4,7 +4,6 @@ require 'datadog/core'
 require 'datadog/tracing/contrib/patcher'
 require 'datadog/tracing/contrib/action_view/events'
 require 'datadog/tracing/contrib/action_view/ext'
-require 'datadog/tracing/contrib/action_view/integration'
 require 'datadog/tracing/contrib/action_view/instrumentation/partial_renderer'
 require 'datadog/tracing/contrib/action_view/instrumentation/template_renderer'
 require 'datadog/tracing/contrib/action_view/utils'

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

@@ -69,7 +69,7 @@ module Datadog
             rescue => e
               Datadog.logger.error(
                 "Failed to resolve ActiveRecord configuration key #{db_config.inspect}. " \
-                "Cause: #{e.message} Source: #{Array(e.backtrace).first}"
+                "Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
               )
 
               nil
@@ -88,7 +88,7 @@ module Datadog
             rescue => e
               Datadog.logger.error(
                 "Failed to resolve ActiveRecord configuration key #{matcher.inspect}. " \
-                "Cause: #{e.message} Source: #{Array(e.backtrace).first}"
+                "Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
               )
             end
 

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

@@ -77,7 +77,7 @@ module Datadog
               # in case.
               Datadog.logger.debug(
                 "connection_id #{connection_id} does not represent a valid object. " \
-                        "Cause: #{e.message} Source: #{Array(e.backtrace).first}"
+                        "Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
               )
             end
           else

data/lib/datadog/tracing/contrib/active_record/vendor/connection_specification.rb

@@ -216,7 +216,7 @@ module Datadog
                     # Bubbled up from the adapter require. Prefix the exception message
                     # with some guidance about how to address it and reraise.
                     else
-                      raise e.class, "Error loading the '#{spec[:adapter]}' Active Record adapter. Missing a gem it depends on? #{e.message}", e.backtrace
+                      raise e.class, "Error loading the '#{spec[:adapter]}' Active Record adapter. Missing a gem it depends on? #{e.class.name} #{e.message}", e.backtrace
                     end
                   end
 

data/lib/datadog/tracing/contrib/active_support/notifications/subscription.rb

@@ -116,7 +116,9 @@ module Datadog
               def run(span, name, id, payload)
                 run!(span, name, id, payload)
               rescue StandardError => e
-                Datadog.logger.debug("ActiveSupport::Notifications handler for '#{name}' failed: #{e.message}")
+                Datadog.logger.debug(
+                  "ActiveSupport::Notifications handler for '#{name}' failed: #{e.class.name} #{e.message}"
+                )
               end
 
               def run!(*args)
@@ -142,7 +144,7 @@ module Datadog
                     callback.call(event, key, *args)
                   rescue StandardError => e
                     Datadog.logger.debug(
-                      "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.message}"
+                      "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.class.name} #{e.message}"
                     )
                   end
                 end

data/lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb

@@ -8,7 +8,6 @@ module Datadog
       module ConcurrentRuby
         # wraps existing executor to carry over trace context
         class ContextCompositeExecutorService
-          extend Forwardable
           include Concurrent::ExecutorService
 
           attr_accessor :composited_executor
@@ -34,11 +33,19 @@ module Datadog
             end
           end
 
+          # Respect the {Concurrent::ExecutorService} interface
+          def can_overflow?
+            @composited_executor.can_overflow?
+          end
+
+          # Respect the {Concurrent::ExecutorService} interface
+          def serialized?
+            @composited_executor.serialized?
+          end
+
           def datadog_configuration
             Datadog.configuration.tracing[:concurrent_ruby]
           end
-
-          delegate [:can_overflow?, :serialized?] => :composited_executor
         end
       end
     end

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

@@ -2,7 +2,6 @@
 
 require 'datadog/tracing/contrib/dalli/ext'
 require 'datadog/tracing/contrib/dalli/instrumentation'
-require 'datadog/tracing/contrib/dalli/integration'
 require 'datadog/tracing/contrib/patcher'
 
 module Datadog

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

@@ -1,6 +1,5 @@
 # typed: false
 
-require 'datadog/tracing/contrib/delayed_job/integration'
 require 'datadog/tracing/contrib/patcher'
 
 module Datadog

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

@@ -18,12 +18,18 @@ module Datadog
           register_as :elasticsearch, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['elasticsearch-transport'] \
-              && Gem.loaded_specs['elasticsearch-transport'].version
+            # elastic-transport gem for version >= 8.0.0
+            # elasticsearch-transport gem for version < 8.0.0
+            Gem.loaded_specs['elastic-transport'] \
+              && Gem.loaded_specs['elastic-transport'].version || \
+              Gem.loaded_specs['elasticsearch-transport'] \
+                && Gem.loaded_specs['elasticsearch-transport'].version
           end
 
           def self.loaded?
-            !defined?(::Elasticsearch::Transport).nil?
+            # Elastic::Transport gem for version >= 8.0.0
+            # Elasticsearch::Transport gem for version < 8.0.0
+            !defined?(::Elastic::Transport).nil? || !defined?(::Elasticsearch::Transport).nil?
           end
 
           def self.compatible?

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

@@ -29,16 +29,40 @@ module Datadog
             patch_elasticsearch_transport_client
           end
 
+          SELF_DEPRECATION_ONLY_ONCE = Core::Utils::OnlyOnce.new
+
           # rubocop:disable Metrics/MethodLength
           # rubocop:disable Metrics/AbcSize
+          # rubocop:disable Metrics/CyclomaticComplexity
+          # rubocop:disable Metrics/PerceivedComplexity
           def patch_elasticsearch_transport_client
             # rubocop:disable Metrics/BlockLength
-            ::Elasticsearch::Transport::Client.class_eval do
+            transport_module::Client.class_eval do
               alias_method :perform_request_without_datadog, :perform_request
               remove_method :perform_request
 
               def perform_request(*args)
-                service = Datadog.configuration_for(self, :service_name) || datadog_configuration[:service_name]
+                # DEV-2.0: Remove this access, as `Client#self` in this context is not exposed to the user
+                # since `elasticsearch` v8.0.0. In contrast, `Client#transport` is always available across
+                # all `elasticsearch` gem versions and should be used instead.
+                service = Datadog.configuration_for(self, :service_name)
+
+                if service
+                  SELF_DEPRECATION_ONLY_ONCE.run do
+                    Datadog.logger.warn(
+                      'Providing configuration though the Elasticsearch client object is deprecated.' \
+                      'Configure the `client#transport` object instead: ' \
+                      'Datadog.configure_onto(client.transport, service_name: service_name, ...)'
+                    )
+                  end
+                end
+
+                # `Client#transport` is most convenient object both this integration and the library
+                # user have shared access to across all `elasticsearch` versions.
+                #
+                # `Client#self` in this context is an internal object that the library user
+                # does not have access to since `elasticsearch` v8.0.0.
+                service ||= Datadog.configuration_for(transport, :service_name) || datadog_configuration[:service_name]
 
                 method = args[0]
                 path = args[1]
@@ -108,6 +132,18 @@ module Datadog
           end
           # rubocop:enable Metrics/MethodLength
           # rubocop:enable Metrics/AbcSize
+          # rubocop:enable Metrics/CyclomaticComplexity
+          # rubocop:enable Metrics/PerceivedComplexity
+
+          # `Elasticsearch` namespace renamed to `Elastic` in version 8.0.0 of the transport gem:
+          # @see https://github.com/elastic/elastic-transport-ruby/commit/ef804cbbd284f2a82d825221f87124f8b5ff823c
+          def transport_module
+            if Integration.version >= Gem::Version.new('8.0.0')
+              ::Elastic::Transport
+            else
+              ::Elasticsearch::Transport
+            end
+          end
         end
       end
     end

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

@@ -1,6 +1,5 @@
 # typed: true
 
-require 'datadog/tracing/contrib/ethon/integration'
 require 'datadog/tracing/contrib/patcher'
 
 module Datadog

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

@@ -1,10 +1,8 @@
 # typed: false
 
-require 'forwardable'
 require 'set'
 
 require 'datadog/core/configuration/settings'
-require 'datadog/tracing/contrib'
 
 # Datadog
 module Datadog

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

@@ -2,7 +2,6 @@
 
 require 'datadog/tracing/contrib/faraday/connection'
 require 'datadog/tracing/contrib/faraday/ext'
-require 'datadog/tracing/contrib/faraday/integration'
 require 'datadog/tracing/contrib/faraday/rack_builder'
 require 'datadog/tracing/contrib/patcher'
 

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

@@ -3,7 +3,6 @@
 require 'datadog/tracing/contrib/grape/endpoint'
 require 'datadog/tracing/contrib/grape/ext'
 require 'datadog/tracing/contrib/grape/instrumentation'
-require 'datadog/tracing/contrib/grape/integration'
 require 'datadog/tracing/contrib/patcher'
 
 module Datadog

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

@@ -2,7 +2,6 @@
 
 require 'datadog/tracing'
 require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/graphql/integration'
 require 'datadog/tracing/contrib/patcher'
 
 module Datadog

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

@@ -1,7 +1,6 @@
 # typed: true
 
 require 'datadog/tracing/contrib/grpc/ext'
-require 'datadog/tracing/contrib/grpc/integration'
 require 'datadog/tracing/contrib/patcher'
 
 module Datadog

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

@@ -3,7 +3,6 @@
 require 'datadog/tracing/contrib/patcher'
 require 'datadog/tracing/contrib/kafka/ext'
 require 'datadog/tracing/contrib/kafka/events'
-require 'datadog/tracing/contrib/kafka/integration'
 
 module Datadog
   module Tracing

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

@@ -1,6 +1,7 @@
 # typed: true
 
 require 'datadog/tracing'
+require 'datadog/core/logging/ext'
 
 module Datadog
   module Tracing
@@ -33,7 +34,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/qless/patcher.rb

@@ -2,7 +2,6 @@
 
 require 'datadog/tracing'
 require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/qless/integration'
 
 module Datadog
   module Tracing

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

@@ -2,7 +2,6 @@
 
 # typed: false
 
-require 'datadog/tracing/contrib/que/integration'
 require 'datadog/tracing/contrib/que/tracer'
 
 module Datadog

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

@@ -3,7 +3,6 @@
 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/rails/log_injection.rb

@@ -22,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/rake/instrumentation.rb

@@ -61,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)
@@ -70,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)

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

@@ -4,7 +4,6 @@ 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