ddtrace 0.51.1 → 0.52.0

data/lib/datadog/ci/contrib/rspec/patcher.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/patcher'
 require 'datadog/ci/contrib/rspec/example'
 

data/lib/datadog/ci/ext/app_types.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module CI
     module Ext

data/lib/datadog/ci/ext/environment.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require 'ddtrace/ext/git'
@@ -10,6 +11,8 @@ module Datadog
       # Defines constants for CI tags
       # rubocop:disable Metrics/ModuleLength:
       module Environment
+        include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
+
         TAG_JOB_NAME = 'ci.job.name'
         TAG_JOB_URL = 'ci.job.url'
         TAG_PIPELINE_ID = 'ci.pipeline.id'
@@ -199,7 +202,9 @@ module Datadog
         end
 
         def extract_github_actions(env)
-          branch, tag = branch_or_tag(env['GITHUB_HEAD_REF'] || env['GITHUB_REF'])
+          ref = env['GITHUB_HEAD_REF']
+          ref = env['GITHUB_REF'] if ref.nil? || ref.empty?
+          branch, tag = branch_or_tag(ref)
 
           {
             Datadog::Ext::Git::TAG_BRANCH => branch,
@@ -339,49 +344,49 @@ module Datadog
             committer_date: Time.at(fields[5].to_i).utc.to_datetime.iso8601
           }
         rescue => e
-          Datadog.logger.debug("Unable to read git commit users: #{e.message} at #{e.backtrace.first}")
+          Datadog.logger.debug("Unable to read git commit users: #{e.message} at #{Array(e.backtrace).first}")
           nil
         end
 
         def git_repository_url
           exec_git_command('git ls-remote --get-url')
         rescue => e
-          Datadog.logger.debug("Unable to read git repository url: #{e.message} at #{e.backtrace.first}")
+          Datadog.logger.debug("Unable to read git repository url: #{e.message} at #{Array(e.backtrace).first}")
           nil
         end
 
         def git_commit_message
           exec_git_command('git show -s --format=%s')
         rescue => e
-          Datadog.logger.debug("Unable to read git commit message: #{e.message} at #{e.backtrace.first}")
+          Datadog.logger.debug("Unable to read git commit message: #{e.message} at #{Array(e.backtrace).first}")
           nil
         end
 
         def git_branch
           exec_git_command('git rev-parse --abbrev-ref HEAD')
         rescue => e
-          Datadog.logger.debug("Unable to read git branch: #{e.message} at #{e.backtrace.first}")
+          Datadog.logger.debug("Unable to read git branch: #{e.message} at #{Array(e.backtrace).first}")
           nil
         end
 
         def git_commit_sha
           exec_git_command('git rev-parse HEAD')
         rescue => e
-          Datadog.logger.debug("Unable to read git commit SHA: #{e.message} at #{e.backtrace.first}")
+          Datadog.logger.debug("Unable to read git commit SHA: #{e.message} at #{Array(e.backtrace).first}")
           nil
         end
 
         def git_tag
           exec_git_command('git tag --points-at HEAD')
         rescue => e
-          Datadog.logger.debug("Unable to read git tag: #{e.message} at #{e.backtrace.first}")
+          Datadog.logger.debug("Unable to read git tag: #{e.message} at #{Array(e.backtrace).first}")
           nil
         end
 
         def git_base_directory
           exec_git_command('git rev-parse --show-toplevel')
         rescue => e
-          Datadog.logger.debug("Unable to read git base directory: #{e.message} at #{e.backtrace.first}")
+          Datadog.logger.debug("Unable to read git base directory: #{e.message} at #{Array(e.backtrace).first}")
           nil
         end
 

data/lib/datadog/ci/ext/settings.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module CI
     module Ext

data/lib/datadog/ci/ext/test.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module CI
     module Ext

data/lib/datadog/ci/extensions.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/configuration/settings'
 require 'ddtrace/configuration/components'
 

data/lib/datadog/ci/test.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require 'ddtrace/contrib/analytics'

data/lib/datadog/contrib.rb

@@ -0,0 +1,69 @@
+# typed: true
+require 'ddtrace/contrib/registry'
+
+module Datadog
+  module Contrib
+    # Registry is a global, declarative repository of all available integrations.
+    #
+    # Integrations should register themselves with the registry as early as
+    # possible as the initial tracer configuration can only activate integrations
+    # if they have already been registered.
+    #
+    # Despite that, integrations *can* be appended to the registry at any point
+    # of the program execution. Newly appended integrations can then be
+    # activated during tracer reconfiguration.
+    #
+    # The registry does not depend on runtime configuration and registered integrations
+    # must execute correctly after successive configuration changes.
+    # The registered integrations themselves can depend on the stateful configuration
+    # of the tracer.
+    #
+    # `Datadog.registry` is a helper accessor to this constant, but it's only available
+    # after the tracer has complete initialization. Use `Datadog::Contrib::REGISTRY` instead
+    # of `Datadog.registry` when you code might be called during tracer initialization.
+    REGISTRY = Registry.new
+  end
+end
+
+require 'ddtrace/contrib/action_cable/integration'
+require 'ddtrace/contrib/action_pack/integration'
+require 'ddtrace/contrib/action_view/integration'
+require 'ddtrace/contrib/active_model_serializers/integration'
+require 'ddtrace/contrib/active_record/integration'
+require 'ddtrace/contrib/active_support/integration'
+require 'ddtrace/contrib/aws/integration'
+require 'ddtrace/contrib/concurrent_ruby/integration'
+require 'ddtrace/contrib/dalli/integration'
+require 'ddtrace/contrib/delayed_job/integration'
+require 'ddtrace/contrib/elasticsearch/integration'
+require 'ddtrace/contrib/ethon/integration'
+require 'ddtrace/contrib/excon/integration'
+require 'ddtrace/contrib/faraday/integration'
+require 'ddtrace/contrib/grape/integration'
+require 'ddtrace/contrib/graphql/integration'
+require 'ddtrace/contrib/grpc/integration'
+require 'ddtrace/contrib/http/integration'
+require 'ddtrace/contrib/httpclient/integration'
+require 'ddtrace/contrib/httprb/integration'
+require 'ddtrace/contrib/integration'
+require 'ddtrace/contrib/kafka/integration'
+require 'ddtrace/contrib/lograge/integration'
+require 'ddtrace/contrib/mongodb/integration'
+require 'ddtrace/contrib/mysql2/integration'
+require 'ddtrace/contrib/presto/integration'
+require 'ddtrace/contrib/qless/integration'
+require 'ddtrace/contrib/que/integration'
+require 'ddtrace/contrib/racecar/integration'
+require 'ddtrace/contrib/rack/integration'
+require 'ddtrace/contrib/rails/integration'
+require 'ddtrace/contrib/rake/integration'
+require 'ddtrace/contrib/redis/integration'
+require 'ddtrace/contrib/resque/integration'
+require 'ddtrace/contrib/rest_client/integration'
+require 'ddtrace/contrib/semantic_logger/integration'
+require 'ddtrace/contrib/sequel/integration'
+require 'ddtrace/contrib/shoryuken/integration'
+require 'ddtrace/contrib/sidekiq/integration'
+require 'ddtrace/contrib/sinatra/integration'
+require 'ddtrace/contrib/sneakers/integration'
+require 'ddtrace/contrib/sucker_punch/integration'

data/lib/datadog/core/environment/cgroup.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'datadog/core/environment/ext'
 
 module Datadog
@@ -8,6 +9,8 @@ module Datadog
       # about the current Linux container identity.
       # @see https://man7.org/linux/man-pages/man7/cgroups.7.html
       module Cgroup
+        include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
+
         LINE_REGEX = /^(\d+):([^:]*):(.+)$/.freeze
 
         Descriptor = Struct.new(
@@ -31,7 +34,7 @@ module Datadog
                 end
               end
             rescue StandardError => e
-              Datadog.logger.error("Error while parsing cgroup. Cause: #{e.message} Location: #{e.backtrace.first}")
+              Datadog.logger.error("Error while parsing cgroup. Cause: #{e.message} Location: #{Array(e.backtrace).first}")
             end
           end
         end

data/lib/datadog/core/environment/class_count.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Core
     module Environment

data/lib/datadog/core/environment/container.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'datadog/core/environment/cgroup'
 
 module Datadog
@@ -5,13 +6,15 @@ module Datadog
     module Environment
       # For container environments
       module Container
+        include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
+
         UUID_PATTERN = '[0-9a-f]{8}[-_]?[0-9a-f]{4}[-_]?[0-9a-f]{4}[-_]?[0-9a-f]{4}[-_]?[0-9a-f]{12}'.freeze
         CONTAINER_PATTERN = '[0-9a-f]{64}'.freeze
 
         PLATFORM_REGEX = /(?<platform>.*?)(?:.slice)?$/.freeze
         POD_REGEX = /(?<pod>(pod)?#{UUID_PATTERN})(?:.slice)?$/.freeze
         CONTAINER_REGEX = /(?<container>#{UUID_PATTERN}|#{CONTAINER_PATTERN})(?:.scope)?$/.freeze
-        FARGATE_14_CONTAINER_REGEX = /(?<container>[0-9a-f]{32}-[0-9]{10})/.freeze
+        FARGATE_14_CONTAINER_REGEX = /(?<container>[0-9a-f]{32}-[0-9]{1,10})/.freeze
 
         Descriptor = Struct.new(
           :platform,
@@ -59,7 +62,7 @@ module Datadog
                                 || parts[-1][FARGATE_14_CONTAINER_REGEX, :container]
                 else
                   if (container_id = parts[-1][CONTAINER_REGEX, :container])
-                    task_uid = parts[-2][POD_REGEX, :pod]
+                    task_uid = parts[-2][POD_REGEX, :pod] || parts[1][POD_REGEX, :pod]
                   else
                     container_id = parts[-1][FARGATE_14_CONTAINER_REGEX, :container]
                   end
@@ -77,7 +80,7 @@ module Datadog
               end
             rescue StandardError => e
               Datadog.logger.error(
-                "Error while parsing container info. Cause: #{e.message} Location: #{e.backtrace.first}"
+                "Error while parsing container info. Cause: #{e.message} Location: #{Array(e.backtrace).first}"
               )
             end
           end

data/lib/datadog/core/environment/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/version'
 
 module Datadog

data/lib/datadog/core/environment/gc.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Core
     module Environment

data/lib/datadog/core/environment/identity.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'securerandom'
 require 'datadog/core/environment/ext'
 require 'ddtrace/utils/forking'

data/lib/datadog/core/environment/socket.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'socket'
 
 module Datadog

data/lib/datadog/core/environment/thread_count.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Core
     module Environment

data/lib/datadog/core/environment/variable_helpers.rb

@@ -1,9 +1,12 @@
+# typed: false
 module Datadog
   module Core
     # Namespace for handling application environment
     module Environment
       # Defines helper methods for environment
       module VariableHelpers
+        extend self
+
         def env_to_bool(var, default = nil)
           var = decode_array(var)
           var && ENV.key?(var) ? ENV[var].to_s.strip.downcase == 'true' : default

data/lib/ddtrace.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # During development, we load `ddtrace` by through `ddtrace.gemspec`,
 # which in turn eager loads 'ddtrace/version'.
 #
@@ -17,68 +18,35 @@ require 'ddtrace/metrics'
 require 'ddtrace/auto_instrument_base'
 require 'ddtrace/profiling'
 
+require 'datadog/contrib'
+require 'ddtrace/contrib/auto_instrument'
+require 'ddtrace/contrib/extensions'
+
+require 'ddtrace/opentelemetry/extensions'
+
 # \Datadog global namespace that includes all tracing functionality for Tracer and Span classes.
 module Datadog
   extend Configuration
   extend AutoInstrumentBase
 
-  # Load and extend Contrib by default
-  require 'ddtrace/contrib/extensions'
+  # Load built-in Datadog integrations
   extend Contrib::Extensions
+  # Load Contrib auto instrumentation
+  extend Contrib::AutoInstrument
+  # Load Contrib extension to global Datadog objects
+  Configuration::Settings.include Contrib::Extensions::Configuration::Settings
 
   # Load and extend OpenTelemetry compatibility by default
-  require 'ddtrace/opentelemetry/extensions'
   extend OpenTelemetry::Extensions
 
-  # Load and extend AutoInstrument
-  require 'ddtrace/contrib/auto_instrument'
-  extend Contrib::AutoInstrument
-
   # Add shutdown hook:
   # Ensures the tracer has an opportunity to flush traces
   # and cleanup before terminating the process.
-  at_exit { Datadog.shutdown! }
+  at_exit do
+    if Interrupt === $! # rubocop:disable Style/SpecialGlobalVars is process terminating due to a ctrl+c or similar?
+      Datadog.send(:handle_interrupt_shutdown!)
+    else
+      Datadog.shutdown!
+    end
+  end
 end
-
-require 'ddtrace/contrib/action_cable/integration'
-require 'ddtrace/contrib/action_pack/integration'
-require 'ddtrace/contrib/action_view/integration'
-require 'ddtrace/contrib/active_model_serializers/integration'
-require 'ddtrace/contrib/active_record/integration'
-require 'ddtrace/contrib/active_support/integration'
-require 'ddtrace/contrib/aws/integration'
-require 'ddtrace/contrib/concurrent_ruby/integration'
-require 'ddtrace/contrib/dalli/integration'
-require 'ddtrace/contrib/delayed_job/integration'
-require 'ddtrace/contrib/elasticsearch/integration'
-require 'ddtrace/contrib/ethon/integration'
-require 'ddtrace/contrib/excon/integration'
-require 'ddtrace/contrib/faraday/integration'
-require 'ddtrace/contrib/grape/integration'
-require 'ddtrace/contrib/graphql/integration'
-require 'ddtrace/contrib/grpc/integration'
-require 'ddtrace/contrib/http/integration'
-require 'ddtrace/contrib/httpclient/integration'
-require 'ddtrace/contrib/httprb/integration'
-require 'ddtrace/contrib/integration'
-require 'ddtrace/contrib/kafka/integration'
-require 'ddtrace/contrib/lograge/integration'
-require 'ddtrace/contrib/presto/integration'
-require 'ddtrace/contrib/que/integration'
-require 'ddtrace/contrib/mysql2/integration'
-require 'ddtrace/contrib/mongodb/integration'
-require 'ddtrace/contrib/qless/integration'
-require 'ddtrace/contrib/racecar/integration'
-require 'ddtrace/contrib/rack/integration'
-require 'ddtrace/contrib/rails/integration'
-require 'ddtrace/contrib/rake/integration'
-require 'ddtrace/contrib/redis/integration'
-require 'ddtrace/contrib/resque/integration'
-require 'ddtrace/contrib/rest_client/integration'
-require 'ddtrace/contrib/semantic_logger/integration'
-require 'ddtrace/contrib/sequel/integration'
-require 'ddtrace/contrib/shoryuken/integration'
-require 'ddtrace/contrib/sidekiq/integration'
-require 'ddtrace/contrib/sinatra/integration'
-require 'ddtrace/contrib/sneakers/integration'
-require 'ddtrace/contrib/sucker_punch/integration'

data/lib/ddtrace/analytics.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/analytics'
 
 module Datadog

data/lib/ddtrace/auto_instrument.rb

@@ -1,3 +1,4 @@
+# typed: strict
 require 'ddtrace'
 
 Datadog.add_auto_instrument

data/lib/ddtrace/auto_instrument_base.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   # base methods stubbed for adding auto instrument extensions
   module AutoInstrumentBase

data/lib/ddtrace/buffer.rb

@@ -1,5 +1,5 @@
+# typed: true
 require 'ddtrace/diagnostics/health'
-require 'datadog/core/environment/object_space'
 
 # Trace buffer that accumulates traces for a consumer.
 # Consumption can happen from a different thread.
@@ -213,6 +213,8 @@ module Datadog
 
   # Health metrics for trace buffers.
   module MeasuredBuffer
+    include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
+
     def initialize(*_)
       super
 
@@ -259,7 +261,7 @@ module Datadog
 
       @buffer_spans += trace.length
     rescue StandardError => e
-      Datadog.logger.debug("Failed to measure queue accept. Cause: #{e.message} Source: #{e.backtrace.first}")
+      Datadog.logger.debug("Failed to measure queue accept. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
     end
 
     def measure_drop(trace)
@@ -267,7 +269,7 @@ module Datadog
 
       @buffer_spans -= trace.length
     rescue StandardError => e
-      Datadog.logger.debug("Failed to measure queue drop. Cause: #{e.message} Source: #{e.backtrace.first}")
+      Datadog.logger.debug("Failed to measure queue drop. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
     end
 
     def measure_pop(traces)
@@ -290,7 +292,7 @@ module Datadog
       @buffer_dropped = 0
       @buffer_spans = 0
     rescue StandardError => e
-      Datadog.logger.debug("Failed to measure queue. Cause: #{e.message} Source: #{e.backtrace.first}")
+      Datadog.logger.debug("Failed to measure queue. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
     end
   end