ddtrace 1.0.0.beta1 → 1.1.0

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

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/core/configuration/agent_settings_resolver'
 require 'ddtrace/transport/http/adapters/registry'
 require 'ddtrace/transport/http/api/map'

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

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'ddtrace/transport/http/statistics'
 require 'ddtrace/transport/http/env'
 
@@ -28,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/env.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Transport
     module HTTP

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

@@ -1,5 +1,5 @@
 # typed: false
-require 'forwardable'
+
 require 'ddtrace/transport/response'
 
 module Datadog
@@ -10,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/http/statistics.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'ddtrace/transport/statistics'
 
 module Datadog

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'json'
 
 require 'ddtrace/transport/traces'

data/lib/ddtrace/transport/http.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'uri'
 
 require 'datadog/core/environment/container'
@@ -17,6 +18,16 @@ module Datadog
     module HTTP
       include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
 
+      # NOTE: Due to... legacy reasons... This class likes having a default `AgentSettings` instance to fall back to.
+      # Because we generate this instance with an empty instance of `Settings`, the resulting `AgentSettings` below
+      # represents only settings specified via environment variables + the usual defaults.
+      #
+      # DO NOT USE THIS IN NEW CODE, as it ignores any settings specified by users via `Datadog.configure`.
+      DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS = Datadog::Core::Configuration::AgentSettingsResolver.call(
+        Datadog::Core::Configuration::Settings.new,
+        logger: nil,
+      )
+
       module_function
 
       # Builds a new Transport::HTTP::Client
@@ -27,7 +38,7 @@ module Datadog
       # Builds a new Transport::HTTP::Client with default settings
       # Pass a block to override any settings.
       def default(
-        agent_settings: Datadog::Core::Configuration::AgentSettingsResolver::ENVIRONMENT_AGENT_SETTINGS,
+        agent_settings: DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS,
         **options
       )
         new do |transport|
@@ -77,7 +88,7 @@ module Datadog
           'be removed on a future ddtrace release.'
         )
 
-        Datadog::Core::Configuration::AgentSettingsResolver::ENVIRONMENT_AGENT_SETTINGS.hostname
+        DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS.hostname
       end
 
       def default_port(logger: Datadog.logger)
@@ -86,7 +97,7 @@ module Datadog
           'be removed on a future ddtrace release.'
         )
 
-        Datadog::Core::Configuration::AgentSettingsResolver::ENVIRONMENT_AGENT_SETTINGS.port
+        DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS.port
       end
 
       def default_url(logger: Datadog.logger)

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

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'ddtrace/transport/statistics'
 require 'ddtrace/transport/io/response'
 
@@ -39,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/transport/io/response.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'ddtrace/transport/response'
 
 module Datadog

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'ddtrace/transport/traces'
 
 require 'ddtrace/transport/io/response'

data/lib/ddtrace/transport/io.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/core/encoding'
 require 'ddtrace/transport/io/client'
 require 'ddtrace/transport/io/traces'

data/lib/ddtrace/transport/parcel.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Transport
     # Data transfer object for generic data

data/lib/ddtrace/transport/request.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Transport
     # Defines request for transport operations

data/lib/ddtrace/transport/response.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 module Datadog
   module Transport
     # Defines abstract response for transport operations

data/lib/ddtrace/transport/serializable_trace.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 require 'json'
 require 'msgpack'
 

data/lib/ddtrace/transport/statistics.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/core/metrics/metric'
 require 'datadog/core/diagnostics/health'
 

data/lib/ddtrace/transport/trace_formatter.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 require 'datadog/core/environment/identity'
 require 'datadog/core/environment/socket'
 require 'datadog/core/runtime/ext'
@@ -30,6 +32,11 @@ module Datadog
         # trace metadata, we must put our trace
         # metadata on the root span. This "root span"
         # is needed by the agent/API to ingest the trace.
+
+        # Apply generic trace tags. Any more specific value will be overridden
+        # by the subsequent calls below.
+        set_trace_tags!
+
         set_resource!
 
         tag_agent_sample_rate!
@@ -52,11 +59,21 @@ module Datadog
         # If the trace resource is undefined, or the root span wasn't
         # specified, don't set this. We don't want to overwrite the
         # resource of a span that is in the middle of the trace.
-        return if trace.resource.nil? || !@found_root_span
+        return if trace.resource.nil? || partial?
 
         root_span.resource = trace.resource
       end
 
+      def set_trace_tags!
+        # If the root span wasn't specified, don't set this. We don't want to
+        # misset or overwrite the tags of a span that is in the middle of the
+        # trace.
+        return if partial?
+
+        root_span.set_tags(trace.send(:meta))
+        root_span.set_tags(trace.send(:metrics))
+      end
+
       def tag_agent_sample_rate!
         return unless trace.agent_sample_rate
 
@@ -149,6 +166,10 @@ module Datadog
 
       private
 
+      def partial?
+        !@found_root_span
+      end
+
       def find_root_span(trace)
         # TODO: Should we memoize this?
         #       Would be safe, but `spans` is mutable, so if
@@ -157,6 +178,8 @@ module Datadog
         root_span_id = trace.send(:root_span_id)
         root_span = trace.spans.find { |s| s.id == root_span_id } if root_span_id
         @found_root_span = !root_span.nil?
+
+        # when root span is not found, fall back to last span (partial flush)
         root_span || trace.spans.last
       end
     end

data/lib/ddtrace/transport/traces.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/core/chunker'
 require 'ddtrace/transport/parcel'
 require 'ddtrace/transport/request'

data/lib/ddtrace/version.rb

@@ -1,25 +1,27 @@
 # typed: true
+
 module DDTrace
   module VERSION
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
-    PRE = 'beta1'.freeze
+    PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
 
     MINIMUM_RUBY_VERSION = '2.1.0'.freeze
 
-    # Ruby 3.2 is not supported: Ruby 3.x support as implemented using *args
-    # needs ruby2_keywords to continue working, yet the scheduled removal of
-    # ruby2_keywords when Ruby 2.6 is EOL'd (i.e on Ruby 3.2 release) would
-    # leave the code with no option, other than to move to *args, **kwargs.
+    # A maximum version was initially added in https://github.com/DataDog/dd-trace-rb/pull/1495 because we expected
+    # the `ruby2_keywords` method to be removed (see the PR for the discussion).
+    # That is because Ruby 3.x support as implemented using `*args` needs `ruby2_keywords` to continue working,
+    # but if `ruby2_keywords` gets removed we would need to change the code to use `*args, **kwargs`.
     #
-    # See https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
+    # Now Ruby 3.2.0-preview1 is out and `ruby2_keywords` are still there, and there's even a recent change for it
+    # in https://github.com/ruby/ruby/pull/5684 that is documented as "ruby2_keywords needed in 3.2+".
     #
-    # This constraint can only be removed when the dependency on ruby2_keywords is
-    # dropped. An allowance is nonetheless made to test prerelease versions.
-    # The version constraint may be bumped if the removal is postponed.
-    MAXIMUM_RUBY_VERSION = '3.2'.freeze
+    # So for now let's bump the maximum version to < 3.3 to allow the Ruby 3.2 series to be supported and we can keep
+    # an eye on the Ruby 3.2 test releases to see if anything changes. (Otherwise, once Ruby 3.2.0 stable is out, we
+    # should probably bump this to 3.4, and so on...)
+    MAXIMUM_RUBY_VERSION = '3.3'.freeze
   end
 end

data/lib/ddtrace.rb

@@ -1,31 +1,13 @@
+# typed: strict
+
 # Load tracing
 require 'datadog/tracing'
-
-# Load tracing extensions
 require 'datadog/tracing/contrib'
-require 'datadog/tracing/contrib/auto_instrument'
-require 'datadog/tracing/contrib/extensions'
-require 'datadog/opentelemetry/extensions'
-require 'ddtrace/auto_instrument_base'
 
 # Load appsec
 require 'datadog/appsec/autoload' # TODO: datadog/appsec?
 
-# Global namespace that includes all Datadog functionality.
-# @public_api
-module Datadog
-  extend AutoInstrumentBase
-
-  # Load built-in Datadog integrations
-  Tracing::Contrib::Extensions.extend!
-
-  # Load Contrib auto instrumentation
-  extend Tracing::Contrib::AutoInstrument
-
-  # Load and extend OpenTelemetry compatibility by default
-  extend OpenTelemetry::Extensions
-end
-
 # 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.beta1
+  version: 1.1.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-16 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.14
+        version: 0.10.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.10.14
+        version: 0.10.16
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.14.2.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.0.14.2.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,25 +135,33 @@ 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
 - lib/datadog/appsec/instrumentation/gateway.rb
+- lib/datadog/appsec/processor.rb
 - lib/datadog/appsec/rate_limiter.rb
 - lib/datadog/appsec/reactive/address_hash.rb
 - lib/datadog/appsec/reactive/engine.rb
@@ -192,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
@@ -206,6 +237,7 @@ files:
 - lib/datadog/core/utils/forking.rb
 - lib/datadog/core/utils/object_set.rb
 - lib/datadog/core/utils/only_once.rb
+- lib/datadog/core/utils/safe_dup.rb
 - lib/datadog/core/utils/sequence.rb
 - lib/datadog/core/utils/string_table.rb
 - lib/datadog/core/utils/time.rb
@@ -223,8 +255,9 @@ files:
 - lib/datadog/core/workers/polling.rb
 - lib/datadog/core/workers/queue.rb
 - lib/datadog/core/workers/runtime_metrics.rb
-- lib/datadog/opentelemetry/extensions.rb
-- lib/datadog/opentelemetry/span.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
@@ -630,6 +667,7 @@ files:
 - lib/datadog/tracing/flush.rb
 - lib/datadog/tracing/metadata.rb
 - lib/datadog/tracing/metadata/analytics.rb
+- lib/datadog/tracing/metadata/errors.rb
 - lib/datadog/tracing/metadata/ext.rb
 - lib/datadog/tracing/metadata/tagging.rb
 - lib/datadog/tracing/pipeline.rb
@@ -709,7 +747,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/datadog/opentelemetry/extensions.rb

@@ -1,14 +0,0 @@
-# typed: true
-require 'datadog/tracing/span_operation'
-require 'datadog/opentelemetry/span'
-
-module Datadog
-  module OpenTelemetry
-    # Defines extensions to ddtrace for OpenTelemetry support
-    module Extensions
-      def self.extended(base)
-        Datadog::Tracing::SpanOperation.prepend(OpenTelemetry::Span)
-      end
-    end
-  end
-end

data/lib/datadog/opentelemetry/span.rb

@@ -1,34 +0,0 @@
-# typed: false
-require 'datadog/core/environment/ext'
-
-module Datadog
-  module OpenTelemetry
-    # Extensions for Datadog::Span
-    module Span
-      TAG_SERVICE_NAME = 'service.name'.freeze
-      TAG_SERVICE_VERSION = 'service.version'.freeze
-
-      def set_tag(key, value)
-        # Configure sampling priority if they give us a forced tracing tag
-        # DEV: Do not set if the value they give us is explicitly "false"
-        case key
-        when TAG_SERVICE_NAME
-          if defined?(super)
-            # Set original tag and Datadog version tag
-            self.service = value
-            super
-          end
-        when TAG_SERVICE_VERSION
-          if defined?(super)
-            # Set original tag and Datadog version tag
-            super
-            super(Datadog::Core::Environment::Ext::TAG_VERSION, value)
-          end
-        else
-          # Otherwise, set the tag normally.
-          super if defined?(super)
-        end
-      end
-    end
-  end
-end