ddtrace 1.4.1 → 1.6.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.6.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -28,44 +28,50 @@ dependencies:
   name: debase-ruby_core_source
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.16
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.10.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.16
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.10.17
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0.2.0
+        version: 1.5.1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0.2.0
+        version: 1.5.1.0.0
 - !ruby/object:Gem::Dependency
   name: libdatadog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0.1.1
+        version: 0.9.0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0.1.1
+        version: 0.9.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
@@ -217,6 +223,7 @@ files:
 - lib/datadog/core/error.rb
 - lib/datadog/core/extensions.rb
 - lib/datadog/core/git/ext.rb
+- lib/datadog/core/header_collection.rb
 - lib/datadog/core/logger.rb
 - lib/datadog/core/logging/ext.rb
 - lib/datadog/core/metrics/client.rb
@@ -307,7 +314,6 @@ files:
 - lib/datadog/profiling/http_transport.rb
 - lib/datadog/profiling/load_native_extension.rb
 - lib/datadog/profiling/native_extension.rb
-- lib/datadog/profiling/old_ext.rb
 - lib/datadog/profiling/old_recorder.rb
 - lib/datadog/profiling/pprof/builder.rb
 - lib/datadog/profiling/pprof/converter.rb
@@ -328,17 +334,10 @@ files:
 - lib/datadog/profiling/tasks/setup.rb
 - lib/datadog/profiling/trace_identifiers/ddtrace.rb
 - lib/datadog/profiling/trace_identifiers/helper.rb
-- lib/datadog/profiling/transport/http.rb
-- lib/datadog/profiling/transport/http/api.rb
-- lib/datadog/profiling/transport/http/api/endpoint.rb
-- lib/datadog/profiling/transport/http/api/instance.rb
-- lib/datadog/profiling/transport/http/api/spec.rb
-- lib/datadog/profiling/transport/http/builder.rb
-- lib/datadog/profiling/transport/http/client.rb
-- lib/datadog/profiling/transport/http/response.rb
 - lib/datadog/tracing.rb
 - lib/datadog/tracing/analytics.rb
 - lib/datadog/tracing/buffer.rb
+- lib/datadog/tracing/client_ip.rb
 - lib/datadog/tracing/configuration/ext.rb
 - lib/datadog/tracing/context.rb
 - lib/datadog/tracing/context_provider.rb
@@ -470,6 +469,7 @@ files:
 - lib/datadog/tracing/contrib/excon/integration.rb
 - lib/datadog/tracing/contrib/excon/middleware.rb
 - lib/datadog/tracing/contrib/excon/patcher.rb
+- lib/datadog/tracing/contrib/ext.rb
 - lib/datadog/tracing/contrib/extensions.rb
 - lib/datadog/tracing/contrib/faraday/configuration/settings.rb
 - lib/datadog/tracing/contrib/faraday/connection.rb
@@ -496,6 +496,14 @@ files:
 - lib/datadog/tracing/contrib/grpc/integration.rb
 - lib/datadog/tracing/contrib/grpc/intercept_with_datadog.rb
 - lib/datadog/tracing/contrib/grpc/patcher.rb
+- lib/datadog/tracing/contrib/hanami/action_tracer.rb
+- lib/datadog/tracing/contrib/hanami/configuration/settings.rb
+- lib/datadog/tracing/contrib/hanami/ext.rb
+- lib/datadog/tracing/contrib/hanami/integration.rb
+- lib/datadog/tracing/contrib/hanami/patcher.rb
+- lib/datadog/tracing/contrib/hanami/plugin.rb
+- lib/datadog/tracing/contrib/hanami/renderer_policy_tracing.rb
+- lib/datadog/tracing/contrib/hanami/router_tracing.rb
 - lib/datadog/tracing/contrib/http/circuit_breaker.rb
 - lib/datadog/tracing/contrib/http/configuration/settings.rb
 - lib/datadog/tracing/contrib/http/ext.rb
@@ -560,6 +568,10 @@ files:
 - lib/datadog/tracing/contrib/presto/instrumentation.rb
 - lib/datadog/tracing/contrib/presto/integration.rb
 - lib/datadog/tracing/contrib/presto/patcher.rb
+- lib/datadog/tracing/contrib/propagation/sql_comment.rb
+- lib/datadog/tracing/contrib/propagation/sql_comment/comment.rb
+- lib/datadog/tracing/contrib/propagation/sql_comment/ext.rb
+- lib/datadog/tracing/contrib/propagation/sql_comment/mode.rb
 - lib/datadog/tracing/contrib/qless/configuration/settings.rb
 - lib/datadog/tracing/contrib/qless/ext.rb
 - lib/datadog/tracing/contrib/qless/integration.rb
@@ -582,6 +594,7 @@ files:
 - lib/datadog/tracing/contrib/racecar/patcher.rb
 - 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/integration.rb
 - lib/datadog/tracing/contrib/rack/middlewares.rb
 - lib/datadog/tracing/contrib/rack/patcher.rb
@@ -676,6 +689,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/distributed/datadog_tags_codec.rb
 - lib/datadog/tracing/distributed/headers/b3.rb
 - lib/datadog/tracing/distributed/headers/b3_single.rb
 - lib/datadog/tracing/distributed/headers/datadog.rb
@@ -710,7 +724,11 @@ files:
 - lib/datadog/tracing/sampling/rule.rb
 - lib/datadog/tracing/sampling/rule_sampler.rb
 - lib/datadog/tracing/sampling/sampler.rb
+- lib/datadog/tracing/sampling/span/ext.rb
 - lib/datadog/tracing/sampling/span/matcher.rb
+- lib/datadog/tracing/sampling/span/rule.rb
+- lib/datadog/tracing/sampling/span/rule_parser.rb
+- lib/datadog/tracing/sampling/span/sampler.rb
 - lib/datadog/tracing/span.rb
 - lib/datadog/tracing/span_operation.rb
 - lib/datadog/tracing/sync_writer.rb
@@ -778,7 +796,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications

data/lib/datadog/profiling/old_ext.rb

@@ -1,42 +0,0 @@
-# typed: true
-
-module Datadog
-  module Profiling
-    # NOTE: This OldExt file is temporary and expected to be removed once the migration to the new `HttpTransport` class
-    # is complete
-    module OldExt
-      module Transport
-        module HTTP
-          URI_TEMPLATE_DD_API = 'https://intake.profile.%s/'.freeze
-
-          FORM_FIELD_RECORDING_START = 'start'.freeze
-          FORM_FIELD_RECORDING_END = 'end'.freeze
-          FORM_FIELD_FAMILY = 'family'.freeze
-          FORM_FIELD_TAG_ENV = 'env'.freeze
-          FORM_FIELD_TAG_HOST = 'host'.freeze
-          FORM_FIELD_TAG_LANGUAGE = 'language'.freeze
-          FORM_FIELD_TAG_PID = 'process_id'.freeze
-          FORM_FIELD_TAG_PROFILER_VERSION = 'profiler_version'.freeze
-          FORM_FIELD_TAG_RUNTIME = 'runtime'.freeze
-          FORM_FIELD_TAG_RUNTIME_ENGINE = 'runtime_engine'.freeze
-          FORM_FIELD_TAG_RUNTIME_ID = 'runtime-id'.freeze
-          FORM_FIELD_TAG_RUNTIME_PLATFORM = 'runtime_platform'.freeze
-          FORM_FIELD_TAG_RUNTIME_VERSION = 'runtime_version'.freeze
-          FORM_FIELD_TAG_SERVICE = 'service'.freeze
-          FORM_FIELD_TAG_VERSION = 'version'.freeze
-          FORM_FIELD_TAGS = 'tags'.freeze
-          FORM_FIELD_INTAKE_VERSION = 'version'.freeze
-
-          HEADER_CONTENT_TYPE = 'Content-Type'.freeze
-          HEADER_CONTENT_TYPE_OCTET_STREAM = 'application/octet-stream'.freeze
-
-          FORM_FIELD_PPROF_DATA = 'data[rubyprofile.pprof]'.freeze
-          PPROF_DEFAULT_FILENAME = 'rubyprofile.pprof.gz'.freeze
-
-          FORM_FIELD_CODE_PROVENANCE_DATA = 'data[code-provenance.json]'.freeze
-          CODE_PROVENANCE_FILENAME = 'code-provenance.json.gz'.freeze
-        end
-      end
-    end
-  end
-end

data/lib/datadog/profiling/transport/http/api/endpoint.rb

@@ -1,85 +0,0 @@
-# typed: true
-
-require_relative '../../../../core/utils/compression'
-require_relative '../../../../core/vendor/multipart-post/multipart/post/composite_read_io'
-require_relative '../../../old_ext'
-require_relative '../response'
-require_relative '../../../../../ddtrace/transport/http/api/endpoint'
-
-module Datadog
-  module Profiling
-    module Transport
-      module HTTP
-        module API
-          # Datadog API endpoint for profiling
-          class Endpoint < Datadog::Transport::HTTP::API::Endpoint
-            include Profiling::OldExt::Transport::HTTP
-
-            # These tags are read from the flush object (see below) directly and so we ignore any extra copies that
-            # may come in the tags hash to avoid duplicates.
-            TAGS_TO_IGNORE_IN_TAGS_HASH = %w[service env version].freeze
-            private_constant :TAGS_TO_IGNORE_IN_TAGS_HASH
-
-            attr_reader \
-              :encoder
-
-            def initialize(path, encoder = nil)
-              super(:post, path)
-              @encoder = encoder
-            end
-
-            def call(env, &block)
-              # Build request
-              env.form = build_form(env)
-
-              # Send request
-              http_response = super(env, &block)
-
-              # Build response
-              Profiling::Transport::HTTP::Response.new(http_response)
-            end
-
-            def build_form(env)
-              flush = env.request
-              pprof_file = build_pprof(flush)
-
-              form = {
-                FORM_FIELD_INTAKE_VERSION => '3', # Aka 1.3 intake format
-                FORM_FIELD_RECORDING_START => flush.start.utc.iso8601,
-                FORM_FIELD_RECORDING_END => flush.finish.utc.iso8601,
-                FORM_FIELD_TAGS => flush.tags_as_array.map { |key, value| "#{key}:#{value}" },
-                FORM_FIELD_PPROF_DATA => pprof_file,
-                FORM_FIELD_FAMILY => 'ruby',
-              }
-
-              # May not be available/enabled
-              form[FORM_FIELD_CODE_PROVENANCE_DATA] = build_code_provenance(flush) if flush.code_provenance_data
-
-              form
-            end
-
-            def build_pprof(flush)
-              gzipped_pprof_data = flush.pprof_data
-
-              Core::Vendor::Multipart::Post::UploadIO.new(
-                StringIO.new(gzipped_pprof_data),
-                HEADER_CONTENT_TYPE_OCTET_STREAM,
-                PPROF_DEFAULT_FILENAME
-              )
-            end
-
-            def build_code_provenance(flush)
-              gzipped_code_provenance = flush.code_provenance_data
-
-              Core::Vendor::Multipart::Post::UploadIO.new(
-                StringIO.new(gzipped_code_provenance),
-                HEADER_CONTENT_TYPE_OCTET_STREAM,
-                CODE_PROVENANCE_FILENAME,
-              )
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/profiling/transport/http/api/instance.rb

@@ -1,38 +0,0 @@
-# typed: true
-
-require_relative '../../../../../ddtrace/transport/http/api/instance'
-require_relative 'spec'
-
-module Datadog
-  module Profiling
-    module Transport
-      module HTTP
-        module API
-          # API instance for profiling
-          class Instance < Datadog::Transport::HTTP::API::Instance
-            def send_profiling_flush(env)
-              raise ProfilesNotSupportedError, spec unless spec.is_a?(Spec)
-
-              spec.send_profiling_flush(env) do |request_env|
-                call(request_env)
-              end
-            end
-
-            # Raised when profiles sent to API that does not support profiles
-            class ProfilesNotSupportedError < StandardError
-              attr_reader :spec
-
-              def initialize(spec)
-                @spec = spec
-              end
-
-              def message
-                'Profiles not supported for this API!'
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/profiling/transport/http/api/spec.rb

@@ -1,42 +0,0 @@
-# typed: true
-
-require_relative '../../../../../ddtrace/transport/http/api/spec'
-
-module Datadog
-  module Profiling
-    module Transport
-      module HTTP
-        module API
-          # API specification for profiling
-          class Spec < Datadog::Transport::HTTP::API::Spec
-            attr_accessor \
-              :profiles
-
-            def send_profiling_flush(env, &block)
-              raise NoProfilesEndpointDefinedError, self if profiles.nil?
-
-              profiles.call(env, &block)
-            end
-
-            def encoder
-              profiles.encoder
-            end
-
-            # Raised when profiles sent but no profiles endpoint is defined
-            class NoProfilesEndpointDefinedError < StandardError
-              attr_reader :spec
-
-              def initialize(spec)
-                @spec = spec
-              end
-
-              def message
-                'No profiles endpoint is defined for API specification!'
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/profiling/transport/http/api.rb

@@ -1,45 +0,0 @@
-# typed: true
-
-require_relative '../../../../ddtrace/transport/http/api/map'
-require_relative '../../encoding/profile'
-require_relative 'api/spec'
-require_relative 'api/instance'
-require_relative 'api/endpoint'
-
-module Datadog
-  module Profiling
-    module Transport
-      module HTTP
-        # Extensions for HTTP API Spec
-        module API
-          # Default API versions
-          V1 = 'v1'.freeze
-
-          module_function
-
-          def agent_defaults
-            @agent_defaults ||= Datadog::Transport::HTTP::API::Map[
-              V1 => Spec.new do |s|
-                s.profiles = Endpoint.new(
-                  '/profiling/v1/input'.freeze,
-                  Profiling::Encoding::Profile::Protobuf
-                )
-              end
-            ]
-          end
-
-          def api_defaults
-            @api_defaults ||= Datadog::Transport::HTTP::API::Map[
-              V1 => Spec.new do |s|
-                s.profiles = Endpoint.new(
-                  '/v1/input'.freeze,
-                  Profiling::Encoding::Profile::Protobuf
-                )
-              end
-            ]
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/profiling/transport/http/builder.rb

@@ -1,30 +0,0 @@
-# typed: true
-
-require_relative '../../../../ddtrace/transport/http/builder'
-
-require_relative 'api'
-require_relative 'client'
-
-module Datadog
-  module Profiling
-    module Transport
-      module HTTP
-        # Builds new instances of Transport::HTTP::Client
-        class Builder < Datadog::Transport::HTTP::Builder
-          def api_instance_class
-            API::Instance
-          end
-
-          def to_transport
-            raise Datadog::Transport::HTTP::Builder::NoDefaultApiError if @default_api.nil?
-
-            # TODO: Profiling doesn't have multiple APIs yet.
-            #       When it does, we should build it out with these APIs.
-            #       Just use :default_api for now.
-            Client.new(to_api_instances[@default_api])
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/profiling/transport/http/client.rb

@@ -1,37 +0,0 @@
-# typed: true
-
-require_relative '../../../../ddtrace/transport/http/client'
-require_relative '../../../../ddtrace/transport/request'
-
-module Datadog
-  module Profiling
-    module Transport
-      module HTTP
-        # Routes, encodes, and sends tracer data to the trace agent via HTTP.
-        class Client < Datadog::Transport::HTTP::Client
-          def export(flush)
-            send_profiling_flush(flush)
-          end
-
-          def send_profiling_flush(flush)
-            # Build a request
-            request = flush
-            send_payload(request).tap do |response|
-              if response.ok?
-                Datadog.logger.debug('Successfully reported profiling data')
-              else
-                Datadog.logger.debug { "Failed to report profiling data -- #{response.inspect}" }
-              end
-            end
-          end
-
-          def send_payload(request)
-            send_request(request) do |api, env|
-              api.send_profiling_flush(env)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/profiling/transport/http/response.rb

@@ -1,21 +0,0 @@
-# typed: true
-
-require_relative '../../../../ddtrace/transport/http/response'
-
-module Datadog
-  module Profiling
-    module Transport
-      # HTTP transport behavior for profiling
-      module HTTP
-        # Response from HTTP transport for profiling
-        class Response
-          include Datadog::Transport::HTTP::Response
-
-          def initialize(http_response, options = {})
-            super(http_response)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/profiling/transport/http.rb

@@ -1,118 +0,0 @@
-# typed: true
-
-require_relative '../../core/environment/ext'
-require_relative '../../../ddtrace/transport/ext'
-
-require_relative '../../core/environment/container'
-require_relative '../../core/environment/variable_helpers'
-
-require_relative 'http/builder'
-require_relative 'http/api'
-
-require_relative '../../../ddtrace/transport/http/adapters/net'
-require_relative '../../../ddtrace/transport/http/adapters/test'
-require_relative '../../../ddtrace/transport/http/adapters/unix_socket'
-
-module Datadog
-  module Profiling
-    module Transport
-      # Namespace for HTTP transport components
-      module HTTP
-        # Builds a new Transport::HTTP::Client
-        def self.new(&block)
-          Builder.new(&block).to_transport
-        end
-
-        # Builds a new Transport::HTTP::Client with default settings
-        def self.default(
-          profiling_upload_timeout_seconds:,
-          agent_settings:,
-          site: nil,
-          api_key: nil,
-          agentless_allowed: agentless_allowed?
-        )
-          new do |transport|
-            transport.headers default_headers
-
-            # Configure adapter & API
-            if site && api_key && agentless_allowed
-              configure_for_agentless(
-                transport,
-                profiling_upload_timeout_seconds: profiling_upload_timeout_seconds,
-                site: site,
-                api_key: api_key
-              )
-            else
-              configure_for_agent(
-                transport,
-                profiling_upload_timeout_seconds: profiling_upload_timeout_seconds,
-                agent_settings: agent_settings
-              )
-            end
-          end
-        end
-
-        def self.default_headers
-          {
-            Datadog::Transport::Ext::HTTP::HEADER_META_LANG => Core::Environment::Ext::LANG,
-            Datadog::Transport::Ext::HTTP::HEADER_META_LANG_VERSION => Core::Environment::Ext::LANG_VERSION,
-            Datadog::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER => Core::Environment::Ext::LANG_INTERPRETER,
-            Datadog::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION => Core::Environment::Ext::TRACER_VERSION
-          }.tap do |headers|
-            # Add container ID, if present.
-            container_id = Core::Environment::Container.container_id
-            headers[Datadog::Transport::Ext::HTTP::HEADER_CONTAINER_ID] = container_id unless container_id.nil?
-          end
-        end
-
-        private_class_method def self.configure_for_agent(transport, profiling_upload_timeout_seconds:, agent_settings:)
-          apis = API.agent_defaults
-
-          transport.adapter(agent_settings.merge(timeout_seconds: profiling_upload_timeout_seconds))
-          transport.api(API::V1, apis[API::V1], default: true)
-
-          # NOTE: This proc, when it exists, usually overrides the transport specified above
-          if agent_settings.deprecated_for_removal_transport_configuration_proc
-            agent_settings.deprecated_for_removal_transport_configuration_proc.call(transport)
-          end
-        end
-
-        private_class_method def self.configure_for_agentless(transport, profiling_upload_timeout_seconds:, site:, api_key:)
-          apis = API.api_defaults
-
-          site_uri = URI(format(Profiling::OldExt::Transport::HTTP::URI_TEMPLATE_DD_API, site))
-          hostname = site_uri.host
-          port = site_uri.port
-
-          transport.adapter(
-            Datadog::Transport::Ext::HTTP::ADAPTER,
-            hostname,
-            port,
-            timeout: profiling_upload_timeout_seconds,
-            ssl: site_uri.scheme == 'https'
-          )
-          transport.api(API::V1, apis[API::V1], default: true)
-          transport.headers(Datadog::Transport::Ext::HTTP::HEADER_DD_API_KEY => api_key)
-        end
-
-        private_class_method def self.agentless_allowed?
-          Core::Environment::VariableHelpers.env_to_bool(Profiling::Ext::ENV_AGENTLESS, false)
-        end
-
-        # Add adapters to registry
-        Datadog::Transport::HTTP::Builder::REGISTRY.set(
-          Datadog::Transport::HTTP::Adapters::Net,
-          Datadog::Transport::Ext::HTTP::ADAPTER
-        )
-        Datadog::Transport::HTTP::Builder::REGISTRY.set(
-          Datadog::Transport::HTTP::Adapters::Test,
-          Datadog::Transport::Ext::Test::ADAPTER
-        )
-        Datadog::Transport::HTTP::Builder::REGISTRY.set(
-          Datadog::Transport::HTTP::Adapters::UnixSocket,
-          Datadog::Transport::Ext::UnixSocket::ADAPTER
-        )
-      end
-    end
-  end
-end