ddtrace 1.9.0 → 1.10.1

data/lib/datadog/kit/identity.rb

@@ -1,6 +1,7 @@
-# typed: false
 # frozen_string_literal: true
 
+require_relative '../appsec/instrumentation/gateway/argument'
+
 module Datadog
   module Kit
     # Tracking identity via traces
@@ -56,6 +57,11 @@ module Datadog
         others.each do |k, v|
           trace.set_tag("usr.#{k}", v) unless v.nil?
         end
+
+        if Datadog.configuration.appsec.enabled
+          user = ::Datadog::AppSec::Instrumentation::Gateway::User.new(id)
+          ::Datadog::AppSec::Instrumentation.gateway.push('identity.set_user', user)
+        end
       end
       # rubocop:enable Metrics/PerceivedComplexity
       # rubocop:enable Metrics/CyclomaticComplexity

data/lib/datadog/kit.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 module Datadog
   # Datadog::Kit holds public-facing APIs for higher level user-facing
   # features, these features not belonging to a specific product. Contrary to

data/lib/datadog/opentelemetry/api/context.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: ignore
 
 require_relative 'trace/span'
 require_relative '../../tracing/trace_operation'

data/lib/datadog/opentelemetry/api/trace/span.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: ignore
 
 module Datadog
   module OpenTelemetry

data/lib/datadog/opentelemetry/sdk/configurator.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: ignore
 
 require_relative 'span_processor'
 require_relative 'id_generator'

data/lib/datadog/opentelemetry/sdk/id_generator.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: ignore
 
 module Datadog
   module OpenTelemetry

data/lib/datadog/opentelemetry/sdk/propagator.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: ignore
 
 module Datadog
   module OpenTelemetry

data/lib/datadog/opentelemetry/sdk/span_processor.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: ignore
 
 module Datadog
   module OpenTelemetry

data/lib/datadog/opentelemetry.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: ignore
 
 # Entrypoint file for OpenTelemetry integration.
 #

data/lib/datadog/opentracer/binary_propagator.rb

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

data/lib/datadog/opentracer/carrier.rb

@@ -1,5 +1,3 @@
-# typed: strict
-
 module Datadog
   module OpenTracer
     # @public_api

data/lib/datadog/opentracer/distributed_headers.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../tracing/distributed/datadog'
 require_relative '../tracing/utils'
 

data/lib/datadog/opentracer/global_tracer.rb

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

data/lib/datadog/opentracer/propagator.rb

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

data/lib/datadog/opentracer/rack_propagator.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../tracing/context'
 require_relative '../tracing/propagation/http'
 require_relative '../tracing/trace_operation'

data/lib/datadog/opentracer/scope.rb

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

data/lib/datadog/opentracer/scope_manager.rb

@@ -1,5 +1,3 @@
-# typed: strict
-
 module Datadog
   module OpenTracer
     # @public_api

data/lib/datadog/opentracer/span.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require 'time'
 
 require_relative '../tracing/metadata/ext'

data/lib/datadog/opentracer/span_context.rb

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

data/lib/datadog/opentracer/span_context_factory.rb

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

data/lib/datadog/opentracer/text_map_propagator.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../tracing/context'
 require_relative '../tracing/distributed/datadog'
 require_relative '../tracing/trace_operation'

data/lib/datadog/opentracer/thread_local_scope.rb

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

data/lib/datadog/opentracer/thread_local_scope_manager.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../core/utils/sequence'
 
 module Datadog

data/lib/datadog/opentracer/tracer.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require 'time'
 
 require_relative '../tracing/context'

data/lib/datadog/opentracer.rb

@@ -1,5 +1,3 @@
-# typed: strict
-
 require 'opentracing'
 require 'opentracing/carrier'
 require_relative 'tracing'

data/lib/datadog/profiling/backtrace_location.rb

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

data/lib/datadog/profiling/buffer.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../core/buffer/thread_safe'
 require_relative '../core/utils/object_set'
 require_relative '../core/utils/string_table'

data/lib/datadog/profiling/collectors/code_provenance.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# typed: false
-
 require 'set'
 require 'json'
 

data/lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb

@@ -1,10 +1,8 @@
-# typed: false
-
 module Datadog
   module Profiling
     module Collectors
-      # Used to trigger the periodic execution of Collectors::CpuAndWallTime, which implements all of the sampling logic
-      # itself; this class only implements the "doing it periodically" part.
+      # Used to trigger the periodic execution of Collectors::ThreadState, which implements all of the sampling logic
+      # itself; this class only implements the "when to do it" part.
       # Almost all of this class is implemented as native code.
       #
       # Methods prefixed with _native_ are implemented in `collectors_cpu_and_wall_time_worker.c`
@@ -20,10 +18,17 @@ module Datadog
           max_frames:,
           tracer:,
           gc_profiling_enabled:,
-          cpu_and_wall_time_collector: CpuAndWallTime.new(recorder: recorder, max_frames: max_frames, tracer: tracer),
+          allocation_counting_enabled:,
+          thread_context_collector: ThreadContext.new(recorder: recorder, max_frames: max_frames, tracer: tracer),
           idle_sampling_helper: IdleSamplingHelper.new
         )
-          self.class._native_initialize(self, cpu_and_wall_time_collector, gc_profiling_enabled, idle_sampling_helper)
+          self.class._native_initialize(
+            self,
+            thread_context_collector,
+            gc_profiling_enabled,
+            idle_sampling_helper,
+            allocation_counting_enabled
+          )
           @worker_thread = nil
           @failure_exception = nil
           @start_stop_mutex = Mutex.new
@@ -40,7 +45,7 @@ module Datadog
 
             @worker_thread = Thread.new do
               begin
-                Thread.current.name = self.class.name unless Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
+                Thread.current.name = self.class.name
 
                 self.class._native_sampling_loop(self)
 

data/lib/datadog/profiling/collectors/dynamic_sampling_rate.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 module Datadog
   module Profiling
     module Collectors

data/lib/datadog/profiling/collectors/idle_sampling_helper.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 module Datadog
   module Profiling
     module Collectors
@@ -31,7 +29,7 @@ module Datadog
 
             @worker_thread = Thread.new do
               begin
-                Thread.current.name = self.class.name unless Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
+                Thread.current.name = self.class.name
 
                 self.class._native_idle_sampling_loop(self)
 

data/lib/datadog/profiling/collectors/old_stack.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../core/utils/only_once'
 require_relative '../../core/utils/time'
 require_relative '../../core/worker'
@@ -75,9 +73,7 @@ module Datadog
           # Cache this buffer, since it's pretty expensive to keep accessing it
           @stack_sample_event_recorder = recorder[Events::StackSample]
           # See below for details on why this is needed
-          @needs_process_waiter_workaround =
-            Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3') &&
-            Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7')
+          @needs_process_waiter_workaround = Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7')
         end
 
         def start

data/lib/datadog/profiling/collectors/stack.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 module Datadog
   module Profiling
     module Collectors

data/lib/datadog/profiling/collectors/{cpu_and_wall_time.rb → thread_context.rb}

@@ -1,16 +1,19 @@
-# typed: false
+# frozen_string_literal: true
 
 module Datadog
   module Profiling
     module Collectors
-      # Used to periodically sample threads, recording elapsed CPU-time and Wall-time between samples.
-      # Triggering of this component (e.g. deciding when to take a sample) is implemented in
+      # Used to trigger sampling of threads, based on external "events", such as:
+      # * periodic timer for cpu-time and wall-time
+      # * VM garbage collection events
+      # * VM object allocation events
+      # Triggering of this component (e.g. watching for the above "events") is implemented by
       # Collectors::CpuAndWallTimeWorker.
       # The stack collection itself is handled using the Datadog::Profiling::Collectors::Stack.
       # Almost all of this class is implemented as native code.
       #
-      # Methods prefixed with _native_ are implemented in `collectors_cpu_and_wall_time.c`
-      class CpuAndWallTime
+      # Methods prefixed with _native_ are implemented in `collectors_thread_context.c`
+      class ThreadContext
         def initialize(recorder:, max_frames:, tracer:)
           tracer_context_key = safely_extract_context_key_from(tracer)
           self.class._native_initialize(self, recorder, max_frames, tracer_context_key)

data/lib/datadog/profiling/component.rb

@@ -0,0 +1,161 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Profiling
+    # Profiling component
+    module Component
+      def build_profiler(settings, agent_settings, tracer)
+        return unless settings.profiling.enabled
+
+        # Workaround for weird dependency direction: the Core::Configuration::Components class currently has a
+        # dependency on individual products, in this case the Profiler.
+        # (Note "currently": in the future we want to change this so core classes don't depend on specific products)
+        #
+        # If the current file included a `require 'datadog/profiler'` at its beginning, we would generate circular
+        # requires when used from profiling:
+        #
+        # datadog/profiling
+        #     └─requires─> datadog/core
+        #                      └─requires─> datadog/core/configuration/components
+        #                                       └─requires─> datadog/profiling       # Loop!
+        #
+        # ...thus in #1998 we removed such a require.
+        #
+        # On the other hand, if datadog/core is loaded by a different product and no general `require 'ddtrace'` is
+        # done, then profiling may not be loaded, and thus to avoid this issue we do a require here (which is a
+        # no-op if profiling is already loaded).
+        require_relative '../profiling'
+        return unless Profiling.supported?
+
+        unless defined?(Profiling::Tasks::Setup)
+          # In #1545 a user reported a NameError due to this constant being uninitialized
+          # I've documented my suspicion on why that happened in
+          # https://github.com/DataDog/dd-trace-rb/issues/1545#issuecomment-856049025
+          #
+          # > Thanks for the info! It seems to feed into my theory: there's two moments in the code where we check if
+          # > profiler is "supported": 1) when loading ddtrace (inside preload) and 2) when starting the profile
+          # > after Datadog.configure gets run.
+          # > The problem is that the code assumes that both checks 1) and 2) will always reach the same conclusion:
+          # > either profiler is supported, or profiler is not supported.
+          # > In the problematic case, it looks like in your case check 1 decides that profiler is not
+          # > supported => doesn't load it, and then check 2 decides that it is => assumes it is loaded and tries to
+          # > start it.
+          #
+          # I was never able to validate if this was the issue or why exactly .supported? would change its mind BUT
+          # just in case it happens again, I've left this check which avoids breaking the user's application AND
+          # would instead direct them to report it to us instead, so that we can investigate what's wrong.
+          #
+          # TODO: As of June 2021, most checks in .supported? are related to the google-protobuf gem; so it's
+          # very likely that it was the origin of the issue we saw. Thus, if, as planned we end up moving away from
+          # protobuf OR enough time has passed and no users saw the issue again, we can remove this check altogether.
+          Datadog.logger.error(
+            'Profiling was marked as supported and enabled, but setup task was not loaded properly. ' \
+            'Please report this at https://github.com/DataDog/dd-trace-rb/blob/master/CONTRIBUTING.md#found-a-bug'
+          )
+
+          return
+        end
+
+        # Load extensions needed to support some of the Profiling features
+        Profiling::Tasks::Setup.new.run
+
+        # NOTE: Please update the Initialization section of ProfilingDevelopment.md with any changes to this method
+
+        if settings.profiling.advanced.force_enable_new_profiler
+          print_new_profiler_warnings
+
+          recorder = Datadog::Profiling::StackRecorder.new(
+            cpu_time_enabled: RUBY_PLATFORM.include?('linux'), # Only supported on Linux currently
+            alloc_samples_enabled: false, # Always disabled for now -- work in progress
+          )
+          collector = Datadog::Profiling::Collectors::CpuAndWallTimeWorker.new(
+            recorder: recorder,
+            max_frames: settings.profiling.advanced.max_frames,
+            tracer: tracer,
+            gc_profiling_enabled: should_enable_gc_profiling?(settings),
+            allocation_counting_enabled: settings.profiling.advanced.allocation_counting_enabled,
+          )
+        else
+          trace_identifiers_helper = Profiling::TraceIdentifiers::Helper.new(
+            tracer: tracer,
+            endpoint_collection_enabled: settings.profiling.advanced.endpoint.collection.enabled
+          )
+
+          recorder = build_profiler_old_recorder(settings)
+          collector = build_profiler_oldstack_collector(settings, recorder, trace_identifiers_helper)
+        end
+
+        exporter = build_profiler_exporter(settings, recorder)
+        transport = build_profiler_transport(settings, agent_settings)
+        scheduler = Profiling::Scheduler.new(exporter: exporter, transport: transport)
+
+        Profiling::Profiler.new([collector], scheduler)
+      end
+
+      private
+
+      def build_profiler_old_recorder(settings)
+        Profiling::OldRecorder.new([Profiling::Events::StackSample], settings.profiling.advanced.max_events)
+      end
+
+      def build_profiler_exporter(settings, recorder)
+        code_provenance_collector =
+          (Profiling::Collectors::CodeProvenance.new if settings.profiling.advanced.code_provenance_enabled)
+
+        Profiling::Exporter.new(pprof_recorder: recorder, code_provenance_collector: code_provenance_collector)
+      end
+
+      def build_profiler_oldstack_collector(settings, old_recorder, trace_identifiers_helper)
+        Profiling::Collectors::OldStack.new(
+          old_recorder,
+          trace_identifiers_helper: trace_identifiers_helper,
+          max_frames: settings.profiling.advanced.max_frames
+        )
+      end
+
+      def build_profiler_transport(settings, agent_settings)
+        settings.profiling.exporter.transport ||
+          Profiling::HttpTransport.new(
+            agent_settings: agent_settings,
+            site: settings.site,
+            api_key: settings.api_key,
+            upload_timeout_seconds: settings.profiling.upload.timeout_seconds,
+          )
+      end
+
+      def should_enable_gc_profiling?(settings)
+        # See comments on the setting definition for more context on why it exists.
+        if settings.profiling.advanced.force_enable_gc_profiling
+          if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3')
+            Datadog.logger.debug(
+              'Profiling time/resources spent in Garbage Collection force enabled. Do not use Ractors in combination ' \
+              'with this option as profiles will be incomplete.'
+            )
+          end
+
+          true
+        else
+          false
+        end
+      end
+
+      def print_new_profiler_warnings
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6')
+          Datadog.logger.warn(
+            'New Ruby profiler has been force-enabled. This is a beta feature. Please report any issues ' \
+            'you run into to Datadog support or via <https://github.com/datadog/dd-trace-rb/issues/new>!'
+          )
+        else
+          # For more details on the issue, see the "BIG Issue" comment on `gvl_owner` function in
+          # `private_vm_api_access.c`.
+          Datadog.logger.warn(
+            'New Ruby profiler has been force-enabled on a legacy Ruby version (< 2.6). This is not recommended in ' \
+            'production environments, as due to limitations in Ruby APIs, we suspect it may lead to crashes in very ' \
+            'rare situations. Please report any issues you run into to Datadog support or ' \
+            'via <https://github.com/datadog/dd-trace-rb/issues/new>!'
+          )
+        end
+      end
+    end
+  end
+end

data/lib/datadog/profiling/encoding/profile.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require 'time'
 
 require_relative '../pprof/template'

data/lib/datadog/profiling/event.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Profiling
     # Describes a sample of some data obtained from the runtime.

data/lib/datadog/profiling/events/stack.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../event'
 
 module Datadog

data/lib/datadog/profiling/exporter.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative 'ext'
 require_relative 'tag_builder'
 

data/lib/datadog/profiling/ext/forking.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 module Datadog
   module Profiling
     module Ext

data/lib/datadog/profiling/ext.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Profiling
     module Ext

data/lib/datadog/profiling/flush.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 module Datadog
   module Profiling
     # Represents a collection of events of a specific type being flushed.

data/lib/datadog/profiling/http_transport.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 module Datadog
   module Profiling
     # Used to report profiling data to Datadog.

data/lib/datadog/profiling/load_native_extension.rb

@@ -1,5 +1,3 @@
-# typed: ignore
-
 # This file is used to load the profiling native extension. It works in two steps:
 #
 # 1. Load the ddtrace_profiling_loader extension. This extension will be used to load the actual extension, but in

data/lib/datadog/profiling/native_extension.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Profiling
     # This module contains classes and methods which are implemented using native code in the

data/lib/datadog/profiling/old_recorder.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative 'buffer'
 require_relative 'encoding/profile'
 

data/lib/datadog/profiling/pprof/builder.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# typed: true
-
 require_relative '../flush'
 require_relative 'message_set'
 require_relative 'string_table'

data/lib/datadog/profiling/pprof/converter.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/profiling/pprof/message_set.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../core/utils/object_set'
 
 module Datadog

data/lib/datadog/profiling/pprof/payload.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Profiling
     module Pprof

data/lib/datadog/profiling/pprof/pprof_pb.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: lib/datadog/profiling/pprof/pprof.proto
 

data/lib/datadog/profiling/pprof/stack_sample.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../ext'
 require_relative '../events/stack'
 require_relative 'builder'

data/lib/datadog/profiling/pprof/string_table.rb

@@ -1,5 +1,3 @@
-# typed: strict
-
 require_relative '../../core/utils/string_table'
 
 module Datadog

data/lib/datadog/profiling/pprof/template.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative 'payload'
 require_relative 'message_set'
 require_relative 'builder'

data/lib/datadog/profiling/preload.rb

@@ -1,5 +1,3 @@
-# typed: strict
-
 require_relative '../../ddtrace'
 
 Datadog::Profiling.start_if_enabled

data/lib/datadog/profiling/profiler.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Profiling
     # Profiling entry point, which coordinates collectors and a scheduler