ddtrace 1.0.0 → 1.1.0

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

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

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

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

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

data/lib/datadog/tracing/contrib/semantic_logger/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
               }
 
               # # if the user already has conflicting log_tags

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

@@ -35,6 +35,7 @@ module Datadog
             option :service_name
             option :client_service_name
             option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :quantize, default: {}
           end
         end
       end

data/lib/datadog/tracing/contrib/sidekiq/server_tracer.rb

@@ -5,6 +5,7 @@ require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/contrib/analytics'
 require 'datadog/tracing/contrib/sidekiq/ext'
 require 'datadog/tracing/contrib/sidekiq/tracing'
+require 'datadog/tracing/contrib/utils/quantization/hash'
 
 module Datadog
   module Tracing
@@ -14,6 +15,8 @@ module Datadog
         class ServerTracer
           include Tracing
 
+          QUANTIZE_SHOW_ALL = { args: { show: :all } }.freeze
+
           def initialize(options = {})
             @sidekiq_service = options[:service_name] || configuration[:service_name]
             @error_handler = options[:error_handler] || configuration[:error_handler]
@@ -23,7 +26,9 @@ module Datadog
             resource = job_resource(job)
 
             service = worker_config(resource, :service_name) || @sidekiq_service
+            # DEV-2.0: Remove `tag_args`, as `quantize` can fulfill the same contract
             tag_args = worker_config(resource, :tag_args) || configuration[:tag_args]
+            quantize = worker_config(resource, :quantize) || configuration[:quantize]
 
             Datadog::Tracing.trace(
               Ext::SPAN_JOB,
@@ -50,7 +55,12 @@ module Datadog
               span.set_tag(Ext::TAG_JOB_QUEUE, job['queue'])
               span.set_tag(Ext::TAG_JOB_WRAPPER, job['class']) if job['wrapped']
               span.set_tag(Ext::TAG_JOB_DELAY, 1000.0 * (Time.now.utc.to_f - job['enqueued_at'].to_f))
-              span.set_tag(Ext::TAG_JOB_ARGS, job['args']) if tag_args && !job['args'].nil? && !job['args'].empty?
+
+              args = job['args']
+              if args && !args.empty?
+                quantize = tag_args ? QUANTIZE_SHOW_ALL : quantize
+                span.set_tag(Ext::TAG_JOB_ARGS, quantize_args(quantize, args))
+              end
 
               yield
             end
@@ -58,10 +68,19 @@ module Datadog
 
           private
 
+          def quantize_args(quantize, args)
+            quantize_options = quantize && quantize[:args]
+            quantize_options ||= {}
+
+            Contrib::Utils::Quantization::Hash.format(args, quantize_options)
+          end
+
           def configuration
             Datadog.configuration.tracing[:sidekiq]
           end
 
+          # DEV-2.0: Is this still being used? If not, we should remove it
+          # as this adds brittleness and complexity to this integration.
           def worker_config(resource, key)
             # Try to get the Ruby class from the resource name.
             worker_klass = begin

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

@@ -39,6 +39,17 @@ module Datadog
             end
           end
 
+          class << self
+            alias_method :unshift_middleare, :add_middleware
+          end
+
+          # Add Rack middleware at the top of the stack
+          def self.append_middleware(middleware, builder, *args, &block)
+            insert_middleware(builder, middleware, args, block) do |proc_, use|
+              use.append(proc_)
+            end
+          end
+
           # Add Rack middleware before another in the stack
           def self.add_middleware_before(before, middleware, builder, *args, &block)
             index = middlewares(builder).index(before)

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

@@ -4,7 +4,6 @@ require 'datadog/core/utils/only_once'
 require 'datadog/tracing/contrib/patcher'
 require 'datadog/tracing/contrib/rack/middlewares'
 require 'datadog/tracing/contrib/sinatra/framework'
-require 'datadog/tracing/contrib/sinatra/integration'
 
 module Datadog
   module Tracing

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

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

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

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

data/lib/datadog/tracing/event.rb

@@ -65,7 +65,8 @@ module Datadog
             block.call(*args)
           rescue StandardError => e
             Datadog.logger.debug do
-              "Error while handling '#{name}' event with '#{block}': #{e.message} at #{Array(e.backtrace).first}"
+              "Error while handling '#{name}' event with '#{block}': #{e.class.name} #{e.message} " \
+              "at #{Array(e.backtrace).first}"
             end
           end
         end

data/lib/datadog/tracing/sampling/priority_sampler.rb

@@ -1,7 +1,5 @@
 # typed: true
 
-require 'forwardable'
-
 require 'datadog/tracing/sampling/ext'
 require 'datadog/tracing/sampling/all_sampler'
 require 'datadog/tracing/sampling/rate_sampler'
@@ -13,8 +11,6 @@ module Datadog
       # {Datadog:::Tracing::Sampling::PrioritySampler}
       # @public_api
       class PrioritySampler
-        extend Forwardable
-
         # NOTE: We do not advise using a pre-sampler. It can save resources,
         # but pre-sampling at rates < 100% may result in partial traces, unless
         # the pre-sampler knows exactly how to drop a span without dropping its ancestors.
@@ -59,7 +55,10 @@ module Datadog
           trace.sampled?
         end
 
-        def_delegators :@priority_sampler, :update
+        # (see Datadog::Tracing::Sampling::RateByServiceSampler#update)
+        def update(rate_by_service)
+          @priority_sampler.update(rate_by_service)
+        end
 
         private
 

data/lib/datadog/tracing/sampling/rule.rb

@@ -1,7 +1,5 @@
 # typed: true
 
-require 'forwardable'
-
 require 'datadog/core'
 
 require 'datadog/tracing/sampling/matcher'
@@ -15,8 +13,6 @@ module Datadog
       # apply in case of a positive match.
       # @public_api
       class Rule
-        extend Forwardable
-
         attr_reader :matcher, :sampler
 
         # @param [Matcher] matcher A matcher to verify trace conformity against
@@ -34,11 +30,21 @@ module Datadog
         def match?(trace)
           @matcher.match?(trace)
         rescue => e
-          Datadog.logger.error("Matcher failed. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
+          Datadog.logger.error(
+            "Matcher failed. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+          )
           nil
         end
 
-        def_delegators :@sampler, :sample?, :sample_rate
+        # (see Datadog::Tracing::Sampling::Sampler#sample?)
+        def sample?(trace)
+          @sampler.sample?(trace)
+        end
+
+        # (see Datadog::Tracing::Sampling::Sampler#sample_rate)
+        def sample_rate(trace)
+          @sampler.sample_rate(trace)
+        end
       end
 
       # A {Datadog::Tracing::Sampling::Rule} that matches a trace based on

data/lib/datadog/tracing/sampling/rule_sampler.rb

@@ -1,7 +1,5 @@
 # typed: true
 
-require 'forwardable'
-
 require 'datadog/core'
 
 require 'datadog/tracing/sampling/ext'
@@ -18,8 +16,6 @@ module Datadog
       # sampling strategy is applied.
       # @public_api
       class RuleSampler
-        extend Forwardable
-
         attr_reader :rules, :rate_limiter, :default_sampler
 
         # @param rules [Array<Rule>] ordered list of rules to be applied to a trace
@@ -106,7 +102,9 @@ module Datadog
             set_limiter_metrics(trace, rate_limiter.effective_rate)
           end
         rescue StandardError => e
-          Datadog.logger.error("Rule sampling failed. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
+          Datadog.logger.error(
+            "Rule sampling failed. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+          )
           yield(trace)
         end
 

data/lib/datadog/tracing/span_operation.rb

@@ -1,6 +1,5 @@
 # typed: true
 
-require 'forwardable'
 require 'time'
 
 require 'datadog/core'
@@ -399,7 +398,7 @@ module Datadog
               rescue StandardError => e
                 Datadog.logger.debug do
                   "Custom on_error handler #{@handler} failed, using fallback behavior. \
-                  Error: #{e.message} Location: #{Array(e.backtrace).first}"
+                  Cause: #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}"
                 end
 
                 original.call(op, error) if original
@@ -412,7 +411,7 @@ module Datadog
               @handler.call(*args)
             rescue StandardError => e
               Datadog.logger.debug do
-                "Error in on_error handler '#{@default}': #{e.message} at #{Array(e.backtrace).first}"
+                "Error in on_error handler '#{@default}': #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
               end
             end
 

data/lib/datadog/tracing/trace_operation.rb

@@ -71,7 +71,6 @@ module Datadog
         metrics: nil
       )
         # Attributes
-        @events = events || Events.new
         @id = id || Core::Utils.next_id
         @max_length = max_length || DEFAULT_MAX_LENGTH
         @parent_span_id = parent_span_id

data/lib/ddtrace/transport/http/client.rb

@@ -29,7 +29,8 @@ module Datadog
           response
         rescue StandardError => e
           message =
-            "Internal error during HTTP transport request. Cause: #{e.message} Location: #{Array(e.backtrace).first}"
+            "Internal error during #{self.class.name} request. Cause: #{e.class.name} #{e.message} " \
+            "Location: #{Array(e.backtrace).first}"
 
           # Log error
           if stats.consecutive_errors > 0

data/lib/ddtrace/transport/http/response.rb

@@ -1,6 +1,5 @@
 # typed: false
 
-require 'forwardable'
 require 'ddtrace/transport/response'
 
 module Datadog
@@ -11,13 +10,44 @@ module Datadog
       # Used by endpoints to wrap responses from adapters with
       # fields or behavior that's specific to that endpoint.
       module Response
-        extend ::Forwardable
-
         def initialize(http_response)
           @http_response = http_response
         end
 
-        def_delegators :@http_response, *Datadog::Transport::Response.instance_methods
+        # (see Datadog::Transport::Response#payload)
+        def payload
+          @http_response.payload
+        end
+
+        # (see Datadog::Transport::Response#internal_error?)
+        def internal_error?
+          @http_response.internal_error?
+        end
+
+        # (see Datadog::Transport::Response#unsupported?)
+        def unsupported?
+          @http_response.unsupported?
+        end
+
+        # (see Datadog::Transport::Response#ok?)
+        def ok?
+          @http_response.ok?
+        end
+
+        # (see Datadog::Transport::Response#not_found?)
+        def not_found?
+          @http_response.not_found?
+        end
+
+        # (see Datadog::Transport::Response#client_error?)
+        def client_error?
+          @http_response.client_error?
+        end
+
+        # (see Datadog::Transport::Response#server_error?)
+        def server_error?
+          @http_response.server_error?
+        end
 
         def code
           @http_response.respond_to?(:code) ? @http_response.code : nil

data/lib/ddtrace/transport/io/client.rb

@@ -40,7 +40,9 @@ module Datadog
           # Return response
           response
         rescue StandardError => e
-          message = "Internal error during IO transport request. Cause: #{e.message} Location: #{Array(e.backtrace).first}"
+          message =
+            "Internal error during IO transport request. Cause: #{e.class.name} #{e.message} " \
+            "Location: #{Array(e.backtrace).first}"
 
           # Log error
           if stats.consecutive_errors > 0

data/lib/ddtrace/version.rb

@@ -3,7 +3,7 @@
 module DDTrace
   module VERSION
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
     PRE = nil
 

data/lib/ddtrace.rb

@@ -10,3 +10,4 @@ require 'datadog/appsec/autoload' # TODO: datadog/appsec?
 # Load other products (must follow tracing)
 require 'datadog/profiling'
 require 'datadog/ci'
+require 'datadog/kit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -30,28 +30,42 @@ dependencies:
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.10.15
+        version: 0.10.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.10.15
+        version: 0.10.16
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0.0.0.a
+        version: 1.3.0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0.0.0.a
+        version: 1.3.0.2.0
+- !ruby/object:Gem::Dependency
+  name: libddprof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0.1.0
 description: |
   ddtrace is Datadog’s tracing client for Ruby. It is used to trace requests
   as they flow across web servers, databases and microservices so that developers
@@ -62,6 +76,7 @@ executables:
 - ddtracerb
 extensions:
 - ext/ddtrace_profiling_native_extension/extconf.rb
+- ext/ddtrace_profiling_loader/extconf.rb
 extra_rdoc_files: []
 files:
 - ".editorconfig"
@@ -85,14 +100,21 @@ files:
 - docs/ProfilingDevelopment.md
 - docs/PublicApi.md
 - docs/UpgradeGuide.md
+- ext/ddtrace_profiling_loader/ddtrace_profiling_loader.c
+- ext/ddtrace_profiling_loader/extconf.rb
 - ext/ddtrace_profiling_native_extension/NativeExtensionDesign.md
 - ext/ddtrace_profiling_native_extension/clock_id.h
 - ext/ddtrace_profiling_native_extension/clock_id_from_pthread.c
 - ext/ddtrace_profiling_native_extension/clock_id_noop.c
+- ext/ddtrace_profiling_native_extension/collectors_stack.c
 - ext/ddtrace_profiling_native_extension/extconf.rb
+- ext/ddtrace_profiling_native_extension/libddprof_helpers.h
+- ext/ddtrace_profiling_native_extension/native_extension_helpers.rb
 - ext/ddtrace_profiling_native_extension/private_vm_api_access.c
 - ext/ddtrace_profiling_native_extension/private_vm_api_access.h
 - ext/ddtrace_profiling_native_extension/profiling.c
+- ext/ddtrace_profiling_native_extension/stack_recorder.c
+- ext/ddtrace_profiling_native_extension/stack_recorder.h
 - lib/datadog/appsec.rb
 - lib/datadog/appsec/assets.rb
 - lib/datadog/appsec/assets/blocked.html
@@ -113,21 +135,28 @@ files:
 - lib/datadog/appsec/contrib/rack/integration.rb
 - lib/datadog/appsec/contrib/rack/patcher.rb
 - lib/datadog/appsec/contrib/rack/reactive/request.rb
+- lib/datadog/appsec/contrib/rack/reactive/request_body.rb
 - lib/datadog/appsec/contrib/rack/reactive/response.rb
 - lib/datadog/appsec/contrib/rack/request.rb
+- lib/datadog/appsec/contrib/rack/request_body_middleware.rb
 - lib/datadog/appsec/contrib/rack/request_middleware.rb
 - lib/datadog/appsec/contrib/rack/response.rb
 - lib/datadog/appsec/contrib/rails/configuration/settings.rb
 - lib/datadog/appsec/contrib/rails/ext.rb
 - lib/datadog/appsec/contrib/rails/framework.rb
+- lib/datadog/appsec/contrib/rails/gateway/watcher.rb
 - lib/datadog/appsec/contrib/rails/integration.rb
 - lib/datadog/appsec/contrib/rails/patcher.rb
+- lib/datadog/appsec/contrib/rails/reactive/action.rb
+- lib/datadog/appsec/contrib/rails/request.rb
 - lib/datadog/appsec/contrib/rails/request_middleware.rb
 - lib/datadog/appsec/contrib/sinatra/configuration/settings.rb
 - lib/datadog/appsec/contrib/sinatra/ext.rb
 - lib/datadog/appsec/contrib/sinatra/framework.rb
+- lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb
 - lib/datadog/appsec/contrib/sinatra/integration.rb
 - lib/datadog/appsec/contrib/sinatra/patcher.rb
+- lib/datadog/appsec/contrib/sinatra/reactive/routed.rb
 - lib/datadog/appsec/contrib/sinatra/request_middleware.rb
 - lib/datadog/appsec/event.rb
 - lib/datadog/appsec/extensions.rb
@@ -193,6 +222,7 @@ files:
 - lib/datadog/core/extensions.rb
 - lib/datadog/core/git/ext.rb
 - lib/datadog/core/logger.rb
+- lib/datadog/core/logging/ext.rb
 - lib/datadog/core/metrics/client.rb
 - lib/datadog/core/metrics/ext.rb
 - lib/datadog/core/metrics/helpers.rb
@@ -225,6 +255,9 @@ files:
 - lib/datadog/core/workers/polling.rb
 - lib/datadog/core/workers/queue.rb
 - lib/datadog/core/workers/runtime_metrics.rb
+- lib/datadog/kit.rb
+- lib/datadog/kit/enable_core_dumps.rb
+- lib/datadog/kit/identity.rb
 - lib/datadog/opentracer.rb
 - lib/datadog/opentracer/binary_propagator.rb
 - lib/datadog/opentracer/carrier.rb
@@ -245,6 +278,7 @@ files:
 - lib/datadog/profiling/backtrace_location.rb
 - lib/datadog/profiling/buffer.rb
 - lib/datadog/profiling/collectors/code_provenance.rb
+- lib/datadog/profiling/collectors/old_stack.rb
 - lib/datadog/profiling/collectors/stack.rb
 - lib/datadog/profiling/encoding/profile.rb
 - lib/datadog/profiling/event.rb
@@ -253,6 +287,7 @@ files:
 - lib/datadog/profiling/ext.rb
 - lib/datadog/profiling/ext/forking.rb
 - lib/datadog/profiling/flush.rb
+- lib/datadog/profiling/load_native_extension.rb
 - lib/datadog/profiling/native_extension.rb
 - lib/datadog/profiling/pprof/builder.rb
 - lib/datadog/profiling/pprof/converter.rb
@@ -267,6 +302,8 @@ files:
 - lib/datadog/profiling/profiler.rb
 - lib/datadog/profiling/recorder.rb
 - lib/datadog/profiling/scheduler.rb
+- lib/datadog/profiling/stack_recorder.rb
+- lib/datadog/profiling/tag_builder.rb
 - lib/datadog/profiling/tasks/exec.rb
 - lib/datadog/profiling/tasks/help.rb
 - lib/datadog/profiling/tasks/setup.rb