ddtrace 1.12.1 → 1.14.0

data/lib/datadog/tracing/trace_operation.rb

@@ -40,7 +40,9 @@ module Datadog
         :active_span,
         :id,
         :max_length,
-        :parent_span_id
+        :parent_span_id,
+        :trace_state,
+        :trace_state_unknown_fields
 
       attr_writer \
         :name,
@@ -64,8 +66,11 @@ module Datadog
         sampled: nil,
         sampling_priority: nil,
         service: nil,
+        profiling_enabled: nil,
         tags: nil,
-        metrics: nil
+        metrics: nil,
+        trace_state: nil,
+        trace_state_unknown_fields: nil
       )
         # Attributes
         @id = id || Tracing::Utils::TraceId.next_id
@@ -84,6 +89,9 @@ module Datadog
         @sample_rate = sample_rate
         @sampling_priority = sampling_priority
         @service = service
+        @profiling_enabled = profiling_enabled
+        @trace_state = trace_state
+        @trace_state_unknown_fields = trace_state_unknown_fields
 
         # Generic tags
         set_tags(tags) if tags
@@ -288,6 +296,8 @@ module Datadog
           trace_runtime_id: Core::Environment::Identity.id,
           trace_sampling_priority: @sampling_priority,
           trace_service: service,
+          trace_state: @trace_state,
+          trace_state_unknown_fields: @trace_state_unknown_fields,
         ).freeze
       end
 
@@ -310,6 +320,8 @@ module Datadog
           sampled: @sampled,
           sampling_priority: @sampling_priority,
           service: (service && service.dup),
+          trace_state: (@trace_state && @trace_state.dup),
+          trace_state_unknown_fields: (@trace_state_unknown_fields && @trace_state_unknown_fields.dup),
           tags: meta.dup,
           metrics: metrics.dup
         )
@@ -450,7 +462,8 @@ module Datadog
           service: service,
           tags: meta,
           metrics: metrics,
-          root_span_id: !partial ? root_span && root_span.id : nil
+          root_span_id: !partial ? root_span && root_span.id : nil,
+          profiling_enabled: @profiling_enabled,
         )
       end
 

data/lib/datadog/tracing/trace_segment.rb

@@ -31,7 +31,8 @@ module Datadog
         :sample_rate,
         :sampling_decision_maker,
         :sampling_priority,
-        :service
+        :service,
+        :profiling_enabled
 
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
@@ -54,7 +55,8 @@ module Datadog
         sampling_priority: nil,
         service: nil,
         tags: nil,
-        metrics: nil
+        metrics: nil,
+        profiling_enabled: nil
       )
         @id = id
         @root_span_id = root_span_id
@@ -80,6 +82,7 @@ module Datadog
         @sampling_decision_maker = sampling_decision_maker_tag
         @sampling_priority = sampling_priority || sampling_priority_tag
         @service = Core::Utils::SafeDup.frozen_or_dup(service || service_tag)
+        @profiling_enabled = profiling_enabled
       end
       # rubocop:enable Metrics/PerceivedComplexity
       # rubocop:enable Metrics/CyclomaticComplexity

data/lib/datadog/tracing/tracer.rb

@@ -320,16 +320,20 @@ module Datadog
         if digest
           TraceOperation.new(
             hostname: hostname,
+            profiling_enabled: profiling_enabled,
             id: digest.trace_id,
             origin: digest.trace_origin,
             parent_span_id: digest.span_id,
             sampling_priority: digest.trace_sampling_priority,
             # Distributed tags are just regular trace tags with special meaning to Datadog
             tags: digest.trace_distributed_tags,
+            trace_state: digest.trace_state,
+            trace_state_unknown_fields: digest.trace_state_unknown_fields,
           )
         else
           TraceOperation.new(
-            hostname: hostname
+            hostname: hostname,
+            profiling_enabled: profiling_enabled,
           )
         end
       end
@@ -525,6 +529,11 @@ module Datadog
           span
         end
       end
+
+      def profiling_enabled
+        @profiling_enabled ||=
+          !!(defined?(Datadog::Profiling) && Datadog::Profiling.respond_to?(:enabled?) && Datadog::Profiling.enabled?)
+      end
     end
   end
 end

data/lib/datadog/tracing/workers/trace_writer.rb

@@ -57,7 +57,7 @@ module Datadog
           end
         end
 
-        # TODO: Register `Datadog::Core::Diagnostics::EnvironmentLogger.log!`
+        # TODO: Register `Datadog::Tracing::Diagnostics::EnvironmentLogger.collect_and_log!`
         # TODO: as a flush_completed subscriber when the `TraceWriter`
         # TODO: instantiation code is implemented.
         def flush_completed

data/lib/ddtrace/transport/ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Transport
     # @public_api
@@ -5,22 +7,26 @@ module Datadog
       # @public_api
       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_HOST = '127.0.0.1'
         DEFAULT_PORT = 8126
 
-        HEADER_CONTAINER_ID = 'Datadog-Container-ID'.freeze
-        HEADER_DD_API_KEY = 'DD-API-KEY'.freeze
+        HEADER_CONTAINER_ID = 'Datadog-Container-ID'
+        HEADER_DD_API_KEY = 'DD-API-KEY'
         # Tells agent that `_dd.top_level` metrics have been set by the tracer.
         # The agent will not calculate top-level spans but instead trust the tracer tagging.
         #
         # This prevents partially flushed traces being mistakenly marked as top-level.
         #
         # Setting this header to any non-empty value enables this feature.
-        HEADER_CLIENT_COMPUTED_TOP_LEVEL = 'Datadog-Client-Computed-Top-Level'.freeze
-        HEADER_META_LANG = 'Datadog-Meta-Lang'.freeze
-        HEADER_META_LANG_VERSION = 'Datadog-Meta-Lang-Version'.freeze
-        HEADER_META_LANG_INTERPRETER = 'Datadog-Meta-Lang-Interpreter'.freeze
-        HEADER_META_TRACER_VERSION = 'Datadog-Meta-Tracer-Version'.freeze
+        HEADER_CLIENT_COMPUTED_TOP_LEVEL = 'Datadog-Client-Computed-Top-Level'
+        HEADER_META_LANG = 'Datadog-Meta-Lang'
+        HEADER_META_LANG_VERSION = 'Datadog-Meta-Lang-Version'
+        HEADER_META_LANG_INTERPRETER = 'Datadog-Meta-Lang-Interpreter'
+        HEADER_META_TRACER_VERSION = 'Datadog-Meta-Tracer-Version'
+
+        # Header that prevents the Net::HTTP integration from tracing internal trace requests.
+        # Set it to any value to skip tracing.
+        HEADER_DD_INTERNAL_UNTRACED_REQUEST = 'DD-Internal-Untraced-Request'
       end
 
       # @public_api
@@ -31,7 +37,7 @@ module Datadog
       # @public_api
       module UnixSocket
         ADAPTER = :unix
-        DEFAULT_PATH = '/var/run/datadog/apm.socket'.freeze
+        DEFAULT_PATH = '/var/run/datadog/apm.socket'
         DEFAULT_TIMEOUT_SECONDS = 1
       end
     end

data/lib/ddtrace/transport/trace_formatter.rb

@@ -51,6 +51,7 @@ module Datadog
         tag_sampling_decision_maker!
         tag_high_order_trace_id!
         tag_sampling_priority!
+        tag_profiling_enabled!
 
         trace
       end
@@ -175,6 +176,14 @@ module Datadog
         root_span.set_tag(Tracing::Metadata::Ext::Distributed::TAG_TID, high_order_tid)
       end
 
+      def tag_profiling_enabled!
+        return if trace.profiling_enabled.nil?
+
+        root_span.set_tag(
+          Tracing::Metadata::Ext::TAG_PROFILING_ENABLED, trace.profiling_enabled ? 1 : 0
+        )
+      end
+
       private
 
       def partial?

data/lib/ddtrace/version.rb

@@ -3,8 +3,8 @@
 module DDTrace
   module VERSION
     MAJOR = 1
-    MINOR = 12
-    PATCH = 1
+    MINOR = 14
+    PATCH = 0
     PRE = nil
     BUILD = nil
     # PRE and BUILD above are modified for dev gems during gem build GHA workflow
@@ -13,17 +13,14 @@ module DDTrace
 
     MINIMUM_RUBY_VERSION = '2.1.0'
 
-    # 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`.
+    # Restrict the installation of this gem with untested future versions of Ruby.
     #
-    # 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 prevents crashes in the native extension code and sends a clear signal to the
+    # user that this version of the gem is untested for the host Ruby version.
     #
-    # 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'
+    # To allow testing with the next unreleased version of Ruby, the version check is performed
+    # as `< #{MAXIMUM_RUBY_VERSION}`, meaning prereleases of MAXIMUM_RUBY_VERSION are allowed
+    # but not stable MAXIMUM_RUBY_VERSION releases.
+    MAXIMUM_RUBY_VERSION = '3.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.14.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.1.0
+        version: 3.0.0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.1.0
+        version: 3.0.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
@@ -131,6 +131,14 @@ files:
 - lib/datadog/appsec/configuration.rb
 - lib/datadog/appsec/configuration/settings.rb
 - lib/datadog/appsec/contrib/auto_instrument.rb
+- lib/datadog/appsec/contrib/devise/event.rb
+- lib/datadog/appsec/contrib/devise/ext.rb
+- lib/datadog/appsec/contrib/devise/integration.rb
+- lib/datadog/appsec/contrib/devise/patcher.rb
+- lib/datadog/appsec/contrib/devise/patcher/authenticatable_patch.rb
+- lib/datadog/appsec/contrib/devise/patcher/registration_controller_patch.rb
+- lib/datadog/appsec/contrib/devise/resource.rb
+- lib/datadog/appsec/contrib/devise/tracking.rb
 - lib/datadog/appsec/contrib/integration.rb
 - lib/datadog/appsec/contrib/patcher.rb
 - lib/datadog/appsec/contrib/rack/ext.rb
@@ -195,6 +203,11 @@ files:
 - lib/datadog/ci/contrib/cucumber/instrumentation.rb
 - lib/datadog/ci/contrib/cucumber/integration.rb
 - lib/datadog/ci/contrib/cucumber/patcher.rb
+- lib/datadog/ci/contrib/minitest/configuration/settings.rb
+- lib/datadog/ci/contrib/minitest/ext.rb
+- lib/datadog/ci/contrib/minitest/integration.rb
+- lib/datadog/ci/contrib/minitest/patcher.rb
+- lib/datadog/ci/contrib/minitest/test_helper.rb
 - lib/datadog/ci/contrib/rspec/configuration/settings.rb
 - lib/datadog/ci/contrib/rspec/example.rb
 - lib/datadog/ci/contrib/rspec/ext.rb
@@ -208,6 +221,7 @@ files:
 - lib/datadog/ci/flush.rb
 - lib/datadog/ci/test.rb
 - lib/datadog/core.rb
+- lib/datadog/core/backport.rb
 - lib/datadog/core/buffer/cruby.rb
 - lib/datadog/core/buffer/random.rb
 - lib/datadog/core/buffer/thread_safe.rb
@@ -230,6 +244,7 @@ files:
 - lib/datadog/core/environment/cgroup.rb
 - lib/datadog/core/environment/class_count.rb
 - lib/datadog/core/environment/container.rb
+- lib/datadog/core/environment/execution.rb
 - lib/datadog/core/environment/ext.rb
 - lib/datadog/core/environment/gc.rb
 - lib/datadog/core/environment/identity.rb
@@ -238,6 +253,7 @@ files:
 - lib/datadog/core/environment/thread_count.rb
 - lib/datadog/core/environment/variable_helpers.rb
 - lib/datadog/core/environment/vm_cache.rb
+- lib/datadog/core/environment/yjit.rb
 - lib/datadog/core/error.rb
 - lib/datadog/core/extensions.rb
 - lib/datadog/core/git/ext.rb
@@ -286,6 +302,8 @@ files:
 - lib/datadog/core/telemetry/v1/integration.rb
 - lib/datadog/core/telemetry/v1/product.rb
 - lib/datadog/core/telemetry/v1/telemetry_request.rb
+- lib/datadog/core/telemetry/v2/app_client_configuration_change.rb
+- lib/datadog/core/telemetry/v2/request.rb
 - lib/datadog/core/transport/config.rb
 - lib/datadog/core/transport/http.rb
 - lib/datadog/core/transport/http/api.rb
@@ -298,6 +316,7 @@ files:
 - lib/datadog/core/transport/negotiation.rb
 - lib/datadog/core/utils.rb
 - lib/datadog/core/utils/compression.rb
+- lib/datadog/core/utils/duration.rb
 - lib/datadog/core/utils/forking.rb
 - lib/datadog/core/utils/hash.rb
 - lib/datadog/core/utils/network.rb
@@ -360,6 +379,7 @@ files:
 - lib/datadog/profiling/collectors/stack.rb
 - lib/datadog/profiling/collectors/thread_context.rb
 - lib/datadog/profiling/component.rb
+- lib/datadog/profiling/diagnostics/environment_logger.rb
 - lib/datadog/profiling/encoding/profile.rb
 - lib/datadog/profiling/event.rb
 - lib/datadog/profiling/events/stack.rb
@@ -395,7 +415,10 @@ files:
 - lib/datadog/tracing/buffer.rb
 - lib/datadog/tracing/client_ip.rb
 - lib/datadog/tracing/component.rb
+- lib/datadog/tracing/configuration/dynamic.rb
+- lib/datadog/tracing/configuration/dynamic/option.rb
 - lib/datadog/tracing/configuration/ext.rb
+- lib/datadog/tracing/configuration/http.rb
 - lib/datadog/tracing/configuration/settings.rb
 - lib/datadog/tracing/context.rb
 - lib/datadog/tracing/context_provider.rb
@@ -561,6 +584,7 @@ files:
 - lib/datadog/tracing/contrib/grpc/distributed/fetcher.rb
 - lib/datadog/tracing/contrib/grpc/distributed/propagation.rb
 - lib/datadog/tracing/contrib/grpc/ext.rb
+- lib/datadog/tracing/contrib/grpc/formatting.rb
 - lib/datadog/tracing/contrib/grpc/integration.rb
 - lib/datadog/tracing/contrib/grpc/intercept_with_datadog.rb
 - lib/datadog/tracing/contrib/grpc/patcher.rb
@@ -626,6 +650,11 @@ files:
 - lib/datadog/tracing/contrib/mysql2/instrumentation.rb
 - lib/datadog/tracing/contrib/mysql2/integration.rb
 - lib/datadog/tracing/contrib/mysql2/patcher.rb
+- lib/datadog/tracing/contrib/opensearch/configuration/settings.rb
+- lib/datadog/tracing/contrib/opensearch/ext.rb
+- lib/datadog/tracing/contrib/opensearch/integration.rb
+- lib/datadog/tracing/contrib/opensearch/patcher.rb
+- lib/datadog/tracing/contrib/opensearch/quantize.rb
 - lib/datadog/tracing/contrib/patchable.rb
 - lib/datadog/tracing/contrib/patcher.rb
 - lib/datadog/tracing/contrib/pg/configuration/settings.rb
@@ -665,6 +694,7 @@ files:
 - lib/datadog/tracing/contrib/rack/configuration/settings.rb
 - lib/datadog/tracing/contrib/rack/ext.rb
 - lib/datadog/tracing/contrib/rack/header_collection.rb
+- lib/datadog/tracing/contrib/rack/header_tagging.rb
 - lib/datadog/tracing/contrib/rack/integration.rb
 - lib/datadog/tracing/contrib/rack/middlewares.rb
 - lib/datadog/tracing/contrib/rack/patcher.rb
@@ -746,7 +776,6 @@ files:
 - lib/datadog/tracing/contrib/sinatra/env.rb
 - lib/datadog/tracing/contrib/sinatra/ext.rb
 - lib/datadog/tracing/contrib/sinatra/framework.rb
-- lib/datadog/tracing/contrib/sinatra/headers.rb
 - lib/datadog/tracing/contrib/sinatra/integration.rb
 - lib/datadog/tracing/contrib/sinatra/patcher.rb
 - lib/datadog/tracing/contrib/sinatra/tracer.rb
@@ -773,6 +802,7 @@ files:
 - lib/datadog/tracing/contrib/utils/quantization/hash.rb
 - lib/datadog/tracing/contrib/utils/quantization/http.rb
 - lib/datadog/tracing/correlation.rb
+- lib/datadog/tracing/diagnostics/environment_logger.rb
 - lib/datadog/tracing/diagnostics/ext.rb
 - lib/datadog/tracing/diagnostics/health.rb
 - lib/datadog/tracing/distributed/b3_multi.rb
@@ -796,6 +826,7 @@ files:
 - lib/datadog/tracing/pipeline/span_filter.rb
 - lib/datadog/tracing/pipeline/span_processor.rb
 - lib/datadog/tracing/propagation/http.rb
+- lib/datadog/tracing/remote.rb
 - lib/datadog/tracing/runtime/metrics.rb
 - lib/datadog/tracing/sampling/all_sampler.rb
 - lib/datadog/tracing/sampling/ext.rb
@@ -875,7 +906,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.3'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../metadata/ext'
-
-module Datadog
-  module Tracing
-    module Contrib
-      module Sinatra
-        # Gets and sets trace information from a Rack headers Hash
-        module Headers
-          module_function
-
-          def response_header_tags(headers, target_headers)
-            target_headers ||= []
-
-            {}.tap do |result|
-              target_headers.each do |header|
-                if headers.key?(header)
-                  result[Tracing::Metadata::Ext::HTTP::ResponseHeaders.to_tag(header)] = headers[header]
-                else
-                  # Try a case-insensitive lookup
-                  uppercased_header = header.to_s.upcase
-                  matching_header = headers.keys.find { |h| h.upcase == uppercased_header }
-                  if matching_header
-                    result[Tracing::Metadata::Ext::HTTP::ResponseHeaders.to_tag(header)] = headers[matching_header]
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end