ddtrace 0.51.1 → 0.54.1

data/lib/ddtrace/contrib/sinatra/tracer_middleware.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/sinatra/ext'
 require 'ddtrace/contrib/sinatra/env'
@@ -28,7 +29,9 @@ module Datadog
             Ext::SPAN_REQUEST,
             service: configuration[:service_name],
             span_type: Datadog::Ext::HTTP::TYPE_INBOUND,
-            resource: env['REQUEST_METHOD']
+            # this is kept nil until we set a correct one (either in the route or with a fallback in the ensure below)
+            # the nil signals that there's no good one yet and is also seen by profiler, when sampling the resource
+            resource: nil,
           ) do |span|
             begin
               Sinatra::Env.set_datadog_span(env, @app_instance, span)
@@ -46,6 +49,10 @@ module Datadog
 
               span.set_tag(Ext::TAG_APP_NAME, @app_instance.settings.name)
 
+              # If this app handled the request, then Contrib::Sinatra::Tracer OR Contrib::Sinatra::Base set the
+              # resource; if no resource was set, let's use a fallback
+              span.resource = env['REQUEST_METHOD'] if span.resource.nil?
+
               # TODO: This backfills the non-matching Sinatra app with a "#{method} #{path}"
               # TODO: resource name. This shouldn't be the case, as that app has never handled
               # TODO: the response with that resource.

data/lib/ddtrace/contrib/sneakers/configuration/settings.rb

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

data/lib/ddtrace/contrib/sneakers/ext.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 module Datadog

data/lib/ddtrace/contrib/sneakers/integration.rb

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

data/lib/ddtrace/contrib/sneakers/patcher.rb

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

data/lib/ddtrace/contrib/sneakers/tracer.rb

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

data/lib/ddtrace/contrib/status_code_matcher.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'set'
 require 'ddtrace/ext/http'
 

data/lib/ddtrace/contrib/sucker_punch/configuration/settings.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/configuration/settings'
 require 'ddtrace/contrib/sucker_punch/ext'
 

data/lib/ddtrace/contrib/sucker_punch/exception_handler.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'sucker_punch'
 
 module Datadog

data/lib/ddtrace/contrib/sucker_punch/ext.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Contrib
     module SuckerPunch

data/lib/ddtrace/contrib/sucker_punch/instrumentation.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'sucker_punch'
 require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/sucker_punch/ext'

data/lib/ddtrace/contrib/sucker_punch/integration.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/sucker_punch/configuration/settings'
 require 'ddtrace/contrib/sucker_punch/patcher'

data/lib/ddtrace/contrib/sucker_punch/patcher.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/ext/app_types'
 require 'ddtrace/contrib/sucker_punch/ext'
@@ -7,6 +8,7 @@ module Datadog
     module SuckerPunch
       # Patcher enables patching of 'sucker_punch' 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/ddtrace/correlation.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/ext/correlation'
 require 'datadog/core/environment/variable_helpers'
 

data/lib/ddtrace/diagnostics/environment_logger.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'date'
 require 'json'
 require 'rbconfig'
@@ -22,7 +23,7 @@ module Datadog
           log_environment!(data.to_json)
           log_error!('Agent Error'.freeze, data[:agent_error]) if data[:agent_error]
         rescue => e
-          Datadog.logger.warn("Failed to collect environment information: #{e} location: #{e.backtrace.first}")
+          Datadog.logger.warn("Failed to collect environment information: #{e} Location: #{Array(e.backtrace).first}")
         end
 
         private

data/lib/ddtrace/diagnostics/health.rb

@@ -1,3 +1,4 @@
+# typed: strict
 require 'ddtrace/ext/diagnostics'
 require 'ddtrace/metrics'
 

data/lib/ddtrace/distributed_tracing/headers/b3.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/distributed'
 require 'ddtrace/distributed_tracing/headers/headers'
 require 'ddtrace/distributed_tracing/headers/helpers'

data/lib/ddtrace/distributed_tracing/headers/b3_single.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/distributed'
 require 'ddtrace/distributed_tracing/headers/headers'
 require 'ddtrace/distributed_tracing/headers/helpers'

data/lib/ddtrace/distributed_tracing/headers/datadog.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/distributed'
 require 'ddtrace/distributed_tracing/headers/headers'
 

data/lib/ddtrace/distributed_tracing/headers/headers.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/configuration'
 require 'ddtrace/span'
 require 'ddtrace/ext/distributed'

data/lib/ddtrace/distributed_tracing/headers/helpers.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/configuration'
 require 'ddtrace/span'
 require 'ddtrace/ext/priority'

data/lib/ddtrace/encoding.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'json'
 require 'msgpack'
 
@@ -6,6 +7,8 @@ module Datadog
   module Encoding
     # Encoder interface that provides the logic to encode traces and service
     module Encoder
+      include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
+
       def content_type
         raise NotImplementedError
       end

data/lib/ddtrace/error.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 # Datadog global namespace

data/lib/ddtrace/event.rb

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

data/lib/ddtrace/ext/analytics.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Ext
     # Defines constants for trace analytics

data/lib/ddtrace/ext/app_types.rb

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

data/lib/ddtrace/ext/correlation.rb

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

data/lib/ddtrace/ext/diagnostics.rb

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

data/lib/ddtrace/ext/distributed.rb

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

data/lib/ddtrace/ext/environment.rb

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

data/lib/ddtrace/ext/errors.rb

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

data/lib/ddtrace/ext/forced_tracing.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/manual_tracing'
 require 'ddtrace/tracer'
 

data/lib/ddtrace/ext/git.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Ext
     # Defines constants for Git tags
@@ -14,6 +15,18 @@ module Datadog
       TAG_COMMIT_COMMITTER_NAME = 'git.commit.committer.name'.freeze
       TAG_COMMIT_MESSAGE = 'git.commit.message'.freeze
       TAG_COMMIT_SHA = 'git.commit.sha'.freeze
+
+      ENV_REPOSITORY_URL = 'DD_GIT_REPOSITORY_URL'.freeze
+      ENV_COMMIT_SHA = 'DD_GIT_COMMIT_SHA'.freeze
+      ENV_BRANCH = 'DD_GIT_BRANCH'.freeze
+      ENV_TAG = 'DD_GIT_TAG'.freeze
+      ENV_COMMIT_MESSAGE = 'DD_GIT_COMMIT_MESSAGE'.freeze
+      ENV_COMMIT_AUTHOR_NAME = 'DD_GIT_COMMIT_AUTHOR_NAME'.freeze
+      ENV_COMMIT_AUTHOR_EMAIL = 'DD_GIT_COMMIT_AUTHOR_EMAIL'.freeze
+      ENV_COMMIT_AUTHOR_DATE = 'DD_GIT_COMMIT_AUTHOR_DATE'.freeze
+      ENV_COMMIT_COMMITTER_NAME = 'DD_GIT_COMMIT_COMMITTER_NAME'.freeze
+      ENV_COMMIT_COMMITTER_EMAIL = 'DD_GIT_COMMIT_COMMITTER_EMAIL'.freeze
+      ENV_COMMIT_COMMITTER_DATE = 'DD_GIT_COMMIT_COMMITTER_DATE'.freeze
     end
   end
 end

data/lib/ddtrace/ext/http.rb

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

data/lib/ddtrace/ext/integration.rb

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

data/lib/ddtrace/ext/manual_tracing.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Ext
     # Defines constants for manual tracing

data/lib/ddtrace/ext/metrics.rb

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

data/lib/ddtrace/ext/net.rb

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

data/lib/ddtrace/ext/priority.rb

@@ -1,15 +1,18 @@
+# typed: strict
 module Datadog
   module Ext
     # Priority is a hint given to the backend so that it knows which traces to reject or kept.
     # In a distributed context, it should be set before any context propagation (fork, RPC calls) to be effective.
     module Priority
-      # Use this to explicitely inform the backend that a trace should be rejected and not stored.
+      # Use this to explicitly inform the backend that a trace MUST be rejected and not stored.
+      # This includes rules and rate limits configured by the user through the {RuleSampler}.
       USER_REJECT = -1
-      # Used by the builtin sampler to inform the backend that a trace should be rejected and not stored.
+      # Used by the {PrioritySampler} to inform the backend that a trace should be rejected and not stored.
       AUTO_REJECT = 0
-      # Used by the builtin sampler to inform the backend that a trace should be kept and stored.
+      # Used by the {PrioritySampler} to inform the backend that a trace should be kept and stored.
       AUTO_KEEP = 1
-      # Use this to explicitely inform the backend that a trace should be kept and stored.
+      # Use this to explicitly inform the backend that a trace MUST be kept and stored.
+      # This includes rules and rate limits configured by the user through the {RuleSampler}.
       USER_KEEP = 2
     end
   end

data/lib/ddtrace/ext/profiling.rb

@@ -1,14 +1,18 @@
+# typed: true
 module Datadog
   module Ext
     module Profiling
       ENV_ENABLED = 'DD_PROFILING_ENABLED'.freeze
       ENV_UPLOAD_TIMEOUT = 'DD_PROFILING_UPLOAD_TIMEOUT'.freeze
       ENV_MAX_FRAMES = 'DD_PROFILING_MAX_FRAMES'.freeze
+      ENV_AGENTLESS = 'DD_PROFILING_AGENTLESS'.freeze
+      ENV_ENDPOINT_COLLECTION_ENABLED = 'DD_PROFILING_ENDPOINT_COLLECTION_ENABLED'.freeze
 
       module Pprof
+        LABEL_KEY_LOCAL_ROOT_SPAN_ID = 'local root span id'.freeze
         LABEL_KEY_SPAN_ID = 'span id'.freeze
         LABEL_KEY_THREAD_ID = 'thread id'.freeze
-        LABEL_KEY_TRACE_ID = 'trace id'.freeze
+        LABEL_KEY_TRACE_ENDPOINT = 'trace endpoint'.freeze
         SAMPLE_VALUE_NO_VALUE = 0
         VALUE_TYPE_CPU = 'cpu-time'.freeze
         VALUE_TYPE_WALL = 'wall-time'.freeze

data/lib/ddtrace/ext/runtime.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/version'
 
 module Datadog
@@ -5,6 +6,7 @@ module Datadog
     module Runtime
       TAG_ID = 'runtime-id'.freeze
       TAG_LANG = 'language'.freeze
+      TAG_PID = 'system.pid'.freeze
 
       # Metrics
       module Metrics
@@ -13,6 +15,8 @@ module Datadog
         METRIC_CLASS_COUNT = 'runtime.ruby.class_count'.freeze
         METRIC_GC_PREFIX = 'runtime.ruby.gc'.freeze
         METRIC_THREAD_COUNT = 'runtime.ruby.thread_count'.freeze
+        METRIC_GLOBAL_CONSTANT_STATE = 'runtime.ruby.global_constant_state'.freeze
+        METRIC_GLOBAL_METHOD_STATE = 'runtime.ruby.global_method_state'.freeze
 
         TAG_SERVICE = 'service'.freeze
       end

data/lib/ddtrace/ext/sampling.rb

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

data/lib/ddtrace/ext/sql.rb

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

data/lib/ddtrace/ext/test.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Ext
     # Defines constants for test behavior

data/lib/ddtrace/ext/transport.rb

@@ -1,7 +1,9 @@
+# typed: true
 module Datadog
   module Ext
     module Transport
       module HTTP
+        ADAPTER = :net_http # DEV: Rename to simply `:http`, as Net::HTTP is an implementation detail.
         DEFAULT_HOST = '127.0.0.1'.freeze
         DEFAULT_PORT = 8126
         DEFAULT_TIMEOUT_SECONDS = 1
@@ -15,6 +17,16 @@ module Datadog
         HEADER_META_LANG_INTERPRETER = 'Datadog-Meta-Lang-Interpreter'.freeze
         HEADER_META_TRACER_VERSION = 'Datadog-Meta-Tracer-Version'.freeze
       end
+
+      module Test
+        ADAPTER = :test
+      end
+
+      module UnixSocket
+        ADAPTER = :unix
+        DEFAULT_PATH = '/var/run/datadog/apm.socket'.freeze
+        DEFAULT_TIMEOUT_SECONDS = 1
+      end
     end
   end
 end

data/lib/ddtrace/forced_tracing.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/ext/manual_tracing'
 require 'ddtrace/ext/priority'
 

data/lib/ddtrace/logger.rb

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

data/lib/ddtrace/metrics.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/ext/metrics'
 
 require 'set'
@@ -30,7 +31,7 @@ module Datadog
       !version.nil? && version >= Gem::Version.new('3.3.0') &&
         # dogstatsd-ruby >= 5.0 & < 5.2.0 has known issues with process forks
         # and do not support the single thread mode we use to avoid this problem.
-        !(version >= Gem::Version.new('5.0') && version < Gem::Version.new('5.2'))
+        !(version >= Gem::Version.new('5.0') && version < Gem::Version.new('5.3'))
     end
 
     def enabled?
@@ -88,7 +89,7 @@ module Datadog
 
       statsd.count(stat, value, metric_options(options))
     rescue StandardError => e
-      Datadog.logger.error("Failed to send count stat. Cause: #{e.message} Source: #{e.backtrace.first}")
+      Datadog.logger.error("Failed to send count stat. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
     end
 
     def distribution(stat, value = nil, options = nil, &block)
@@ -99,7 +100,7 @@ module Datadog
 
       statsd.distribution(stat, value, metric_options(options))
     rescue StandardError => e
-      Datadog.logger.error("Failed to send distribution stat. Cause: #{e.message} Source: #{e.backtrace.first}")
+      Datadog.logger.error("Failed to send distribution stat. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
     end
 
     def increment(stat, options = nil)
@@ -109,7 +110,7 @@ module Datadog
 
       statsd.increment(stat, metric_options(options))
     rescue StandardError => e
-      Datadog.logger.error("Failed to send increment stat. Cause: #{e.message} Source: #{e.backtrace.first}")
+      Datadog.logger.error("Failed to send increment stat. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
     end
 
     def gauge(stat, value = nil, options = nil, &block)
@@ -120,7 +121,7 @@ module Datadog
 
       statsd.gauge(stat, value, metric_options(options))
     rescue StandardError => e
-      Datadog.logger.error("Failed to send gauge stat. Cause: #{e.message} Source: #{e.backtrace.first}")
+      Datadog.logger.error("Failed to send gauge stat. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
     end
 
     def time(stat, options = nil)
@@ -136,7 +137,7 @@ module Datadog
           distribution(stat, ((finished - start) * 1000), options)
         end
       rescue StandardError => e
-        Datadog.logger.error("Failed to send time stat. Cause: #{e.message} Source: #{e.backtrace.first}")
+        Datadog.logger.error("Failed to send time stat. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
       end
     end
 
@@ -273,7 +274,7 @@ module Datadog
       IGNORED_STATSD_ONLY_ONCE.run do
         Datadog.logger.warn(
           'Ignoring user-supplied statsd instance as currently-installed version of dogstastd-ruby is incompatible. ' \
-          "To fix this, ensure that you have `gem 'dogstatsd-ruby', '~> 5.2'` on your Gemfile or gems.rb file."
+          "To fix this, ensure that you have `gem 'dogstatsd-ruby', '~> 5.3'` on your Gemfile or gems.rb file."
         )
       end
     end

data/lib/ddtrace/opentelemetry/extensions.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/span'
 require 'ddtrace/opentelemetry/span'
 

data/lib/ddtrace/opentelemetry/span.rb

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

data/lib/ddtrace/opentracer/binary_propagator.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module OpenTracer
     # OpenTracing propagator for Datadog::OpenTracer::Tracer

data/lib/ddtrace/opentracer/carrier.rb

@@ -1,3 +1,4 @@
+# typed: strict
 module Datadog
   module OpenTracer
     class Carrier < ::OpenTracing::Carrier

data/lib/ddtrace/opentracer/distributed_headers.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/span'
 require 'ddtrace/ext/distributed'
 

data/lib/ddtrace/opentracer/global_tracer.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module OpenTracer
     # Patch for OpenTracing module

data/lib/ddtrace/opentracer/propagator.rb

@@ -1,3 +1,4 @@
+# typed: false
 module Datadog
   module OpenTracer
     # OpenTracing propagator for Datadog::OpenTracer::Tracer

data/lib/ddtrace/opentracer/rack_propagator.rb

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

data/lib/ddtrace/opentracer/scope.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module OpenTracer
     # OpenTracing adapter for scope

data/lib/ddtrace/opentracer/scope_manager.rb

@@ -1,3 +1,4 @@
+# typed: strict
 module Datadog
   module OpenTracer
     class ScopeManager < ::OpenTracing::ScopeManager

data/lib/ddtrace/opentracer/span.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module OpenTracer
     # OpenTracing adapter for Datadog::Span

data/lib/ddtrace/opentracer/span_context.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module OpenTracer
     # OpenTracing adapter for SpanContext

data/lib/ddtrace/opentracer/span_context_factory.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module OpenTracer
     # Creates new Datadog::OpenTracer::SpanContext

data/lib/ddtrace/opentracer/text_map_propagator.rb

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

data/lib/ddtrace/opentracer/thread_local_scope.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module OpenTracer
     # OpenTracing adapter for thread local scopes

data/lib/ddtrace/opentracer/thread_local_scope_manager.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module OpenTracer
     # OpenTracing adapter for thread local scope management

data/lib/ddtrace/opentracer/tracer.rb

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

data/lib/ddtrace/opentracer.rb

@@ -1,3 +1,4 @@
+# typed: strict
 require 'opentracing'
 require 'opentracing/carrier'
 require 'ddtrace'

data/lib/ddtrace/patcher.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/utils/only_once'
 
 module Datadog

data/lib/ddtrace/pin.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/patcher'
 require 'ddtrace/utils/only_once'
 

data/lib/ddtrace/pipeline/span_filter.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Pipeline
     # SpanFilter implements a processor that filters entire span subtrees

data/lib/ddtrace/pipeline/span_processor.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Pipeline
     # SpanProcessor

data/lib/ddtrace/pipeline.rb

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

data/lib/ddtrace/profiling/backtrace_location.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Profiling
     # Entity class used to represent an entry in a stack trace.