ddtrace 1.6.0 → 1.7.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -33,7 +33,7 @@ dependencies:
         version: 0.10.16
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.10.17
+        version: 0.10.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: 0.10.16
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.10.17
+        version: 0.10.18
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
@@ -114,11 +114,15 @@ files:
 - ext/ddtrace_profiling_native_extension/profiling.c
 - ext/ddtrace_profiling_native_extension/ruby_helpers.c
 - ext/ddtrace_profiling_native_extension/ruby_helpers.h
+- ext/ddtrace_profiling_native_extension/setup_signal_handler.c
+- ext/ddtrace_profiling_native_extension/setup_signal_handler.h
 - 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
+- lib/datadog/appsec/assets/blocked.json
+- lib/datadog/appsec/assets/blocked.text
 - lib/datadog/appsec/assets/waf_rules/README.md
 - lib/datadog/appsec/assets/waf_rules/recommended.json
 - lib/datadog/appsec/assets/waf_rules/risky.json
@@ -168,6 +172,7 @@ files:
 - lib/datadog/appsec/reactive/engine.rb
 - lib/datadog/appsec/reactive/operation.rb
 - lib/datadog/appsec/reactive/subscriber.rb
+- lib/datadog/appsec/response.rb
 - lib/datadog/ci.rb
 - lib/datadog/ci/configuration/components.rb
 - lib/datadog/ci/configuration/settings.rb
@@ -492,6 +497,8 @@ files:
 - lib/datadog/tracing/contrib/grpc/datadog_interceptor.rb
 - lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb
 - lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb
+- 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/integration.rb
 - lib/datadog/tracing/contrib/grpc/intercept_with_datadog.rb
@@ -506,6 +513,8 @@ files:
 - 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/distributed/fetcher.rb
+- lib/datadog/tracing/contrib/http/distributed/propagation.rb
 - lib/datadog/tracing/contrib/http/ext.rb
 - lib/datadog/tracing/contrib/http/instrumentation.rb
 - lib/datadog/tracing/contrib/http/integration.rb
@@ -689,17 +698,14 @@ 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/b3.rb
+- lib/datadog/tracing/distributed/b3_single.rb
+- lib/datadog/tracing/distributed/datadog.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
+- lib/datadog/tracing/distributed/fetcher.rb
 - lib/datadog/tracing/distributed/headers/ext.rb
-- lib/datadog/tracing/distributed/headers/parser.rb
 - lib/datadog/tracing/distributed/helpers.rb
-- lib/datadog/tracing/distributed/metadata/b3.rb
-- lib/datadog/tracing/distributed/metadata/b3_single.rb
-- lib/datadog/tracing/distributed/metadata/datadog.rb
-- lib/datadog/tracing/distributed/metadata/parser.rb
+- lib/datadog/tracing/distributed/propagation.rb
 - lib/datadog/tracing/event.rb
 - lib/datadog/tracing/flush.rb
 - lib/datadog/tracing/metadata.rb
@@ -710,7 +716,6 @@ files:
 - lib/datadog/tracing/pipeline.rb
 - lib/datadog/tracing/pipeline/span_filter.rb
 - lib/datadog/tracing/pipeline/span_processor.rb
-- lib/datadog/tracing/propagation/grpc.rb
 - lib/datadog/tracing/propagation/http.rb
 - lib/datadog/tracing/runtime/metrics.rb
 - lib/datadog/tracing/sampling/all_sampler.rb
@@ -796,7 +801,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications

data/lib/datadog/tracing/distributed/headers/b3.rb

@@ -1,55 +0,0 @@
-# typed: true
-
-require_relative 'parser'
-require_relative '../helpers'
-require_relative 'ext'
-require_relative '../../trace_digest'
-
-module Datadog
-  module Tracing
-    module Distributed
-      module Headers
-        # B3 provides helpers to inject or extract headers for B3 style headers
-        module B3
-          include Ext
-
-          def self.inject!(digest, env)
-            return if digest.nil?
-
-            # DEV: We need these to be hex encoded
-            env[B3_HEADER_TRACE_ID] = digest.trace_id.to_s(16)
-            env[B3_HEADER_SPAN_ID] = digest.span_id.to_s(16)
-
-            if digest.trace_sampling_priority
-              sampling_priority = Helpers.clamp_sampling_priority(
-                digest.trace_sampling_priority
-              )
-              env[B3_HEADER_SAMPLED] = sampling_priority.to_s
-            end
-
-            env
-          end
-
-          def self.extract(env)
-            # Extract values from headers
-            # DEV: B3 doesn't have "origin"
-            headers = Parser.new(env)
-            trace_id = headers.id(B3_HEADER_TRACE_ID, 16)
-            span_id = headers.id(B3_HEADER_SPAN_ID, 16)
-            # We don't need to try and convert sampled since B3 supports 0/1 (AUTO_REJECT/AUTO_KEEP)
-            sampling_priority = headers.number(B3_HEADER_SAMPLED)
-
-            # Return early if this propagation is not valid
-            return unless trace_id && span_id
-
-            TraceDigest.new(
-              trace_id: trace_id,
-              span_id: span_id,
-              trace_sampling_priority: sampling_priority
-            )
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/tracing/distributed/headers/b3_single.rb

@@ -1,67 +0,0 @@
-# typed: true
-
-require_relative 'parser'
-require_relative '../helpers'
-require_relative 'ext'
-require_relative '../../trace_digest'
-
-module Datadog
-  module Tracing
-    module Distributed
-      module Headers
-        # B3Single provides helpers to inject or extract headers for B3 single header style headers
-        module B3Single
-          include Ext
-
-          def self.inject!(digest, env)
-            return if digest.nil?
-
-            # Header format:
-            #   b3: {TraceId}-{SpanId}-{SamplingState}-{ParentSpanId}
-            # https://github.com/apache/incubator-zipkin-b3-propagation/tree/7c6e9f14d6627832bd80baa87ac7dabee7be23cf#single-header
-            # DEV: `{SamplingState}` and `{ParentSpanId`}` are optional
-
-            # DEV: We need these to be hex encoded
-            header = "#{digest.trace_id.to_s(16)}-#{digest.span_id.to_s(16)}"
-
-            if digest.trace_sampling_priority
-              sampling_priority = Helpers.clamp_sampling_priority(
-                digest.trace_sampling_priority
-              )
-              header += "-#{sampling_priority}"
-            end
-
-            env[B3_HEADER_SINGLE] = header
-
-            env
-          end
-
-          def self.extract(env)
-            # Header format:
-            #   b3: {TraceId}-{SpanId}-{SamplingState}-{ParentSpanId}
-            # https://github.com/apache/incubator-zipkin-b3-propagation/tree/7c6e9f14d6627832bd80baa87ac7dabee7be23cf#single-header
-            # DEV: `{SamplingState}` and `{ParentSpanId`}` are optional
-
-            headers = Parser.new(env)
-            value = headers.header(B3_HEADER_SINGLE)
-            return if value.nil?
-
-            parts = value.split('-')
-            trace_id = Helpers.value_to_id(parts[0], 16) unless parts.empty?
-            span_id = Helpers.value_to_id(parts[1], 16) if parts.length > 1
-            sampling_priority = Helpers.value_to_number(parts[2]) if parts.length > 2
-
-            # Return early if this propagation is not valid
-            return unless trace_id && span_id
-
-            TraceDigest.new(
-              span_id: span_id,
-              trace_id: trace_id,
-              trace_sampling_priority: sampling_priority
-            )
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/tracing/distributed/headers/datadog.rb

@@ -1,144 +0,0 @@
-# frozen_string_literal: true
-# typed: true
-
-require_relative 'parser'
-require_relative 'ext'
-require_relative '../../metadata/ext'
-require_relative '../../trace_digest'
-require_relative '../datadog_tags_codec'
-
-module Datadog
-  module Tracing
-    module Distributed
-      module Headers
-        # Datadog provides helpers to inject or extract headers for Datadog style headers
-        module Datadog
-          class << self
-            include Ext
-
-            def inject!(digest, env)
-              return if digest.nil?
-
-              env[HTTP_HEADER_TRACE_ID] = digest.trace_id.to_s
-              env[HTTP_HEADER_PARENT_ID] = digest.span_id.to_s
-              env[HTTP_HEADER_SAMPLING_PRIORITY] = digest.trace_sampling_priority.to_s if digest.trace_sampling_priority
-              env[HTTP_HEADER_ORIGIN] = digest.trace_origin.to_s unless digest.trace_origin.nil?
-
-              inject_tags(digest, env)
-
-              env
-            end
-
-            def extract(env)
-              # Extract values from headers
-              headers = Parser.new(env)
-              trace_id = headers.id(HTTP_HEADER_TRACE_ID)
-              parent_id = headers.id(HTTP_HEADER_PARENT_ID)
-              origin = headers.header(HTTP_HEADER_ORIGIN)
-              sampling_priority = headers.number(HTTP_HEADER_SAMPLING_PRIORITY)
-
-              # Return early if this propagation is not valid
-              # DEV: To be valid we need to have a trace id and a parent id
-              #      or when it is a synthetics trace, just the trace id.
-              # DEV: `Parser#id` will not return 0
-              return unless (trace_id && parent_id) || (origin && trace_id)
-
-              trace_distributed_tags = extract_tags(headers)
-
-              # Return new trace headers
-              TraceDigest.new(
-                span_id: parent_id,
-                trace_id: trace_id,
-                trace_origin: origin,
-                trace_sampling_priority: sampling_priority,
-                trace_distributed_tags: trace_distributed_tags,
-              )
-            end
-
-            private
-
-            # Export trace distributed tags through the `x-datadog-tags` header.
-            #
-            # DEV: This method accesses global state (the active trace) to record its error state as a trace tag.
-            # DEV: This means errors cannot be reported if there's not active span.
-            # DEV: Ideally, we'd have a dedicated error reporting stream for all of ddtrace.
-            # DEV: The same comment applies to the {.extract_tags}.
-            def inject_tags(digest, env)
-              return if digest.trace_distributed_tags.nil? || digest.trace_distributed_tags.empty?
-
-              if ::Datadog.configuration.tracing.x_datadog_tags_max_length <= 0
-                active_trace = Tracing.active_trace
-                active_trace.set_tag('_dd.propagation_error', 'disabled') if active_trace
-                return
-              end
-
-              encoded_tags = DatadogTagsCodec.encode(digest.trace_distributed_tags)
-
-              if encoded_tags.size > ::Datadog.configuration.tracing.x_datadog_tags_max_length
-                active_trace = Tracing.active_trace
-                active_trace.set_tag('_dd.propagation_error', 'inject_max_size') if active_trace
-
-                ::Datadog.logger.warn(
-                  "Failed to inject x-datadog-tags: tags are too large (size:#{encoded_tags.size} " \
-                  "limit:#{::Datadog.configuration.tracing.x_datadog_tags_max_length}). This limit can be configured " \
-                  'through the DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH environment variable.'
-                )
-                return
-              end
-
-              env[HTTP_HEADER_TAGS] = encoded_tags
-            rescue => e
-              active_trace = Tracing.active_trace
-              active_trace.set_tag('_dd.propagation_error', 'encoding_error') if active_trace
-              ::Datadog.logger.warn(
-                "Failed to inject x-datadog-tags: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-            end
-
-            # Import `x-datadog-tags` header tags as trace distributed tags.
-            # Only tags that have the `_dd.p.` prefix are processed.
-            def extract_tags(headers)
-              tags_header = headers.header(HTTP_HEADER_TAGS)
-              return unless tags_header
-
-              if ::Datadog.configuration.tracing.x_datadog_tags_max_length <= 0
-                active_trace = Tracing.active_trace
-                active_trace.set_tag('_dd.propagation_error', 'disabled') if active_trace
-                return
-              end
-
-              if tags_header.size > ::Datadog.configuration.tracing.x_datadog_tags_max_length
-                active_trace = Tracing.active_trace
-                active_trace.set_tag('_dd.propagation_error', 'extract_max_size') if active_trace
-
-                ::Datadog.logger.warn(
-                  "Failed to extract x-datadog-tags: tags are too large (size:#{tags_header.size} " \
-                  "limit:#{::Datadog.configuration.tracing.x_datadog_tags_max_length}). This limit can be configured " \
-                  'through the DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH environment variable.'
-                )
-                return
-              end
-
-              tags = DatadogTagsCodec.decode(tags_header)
-              # Only extract keys with the expected Datadog prefix
-              tags.select! do |key, _|
-                key.start_with?(Tracing::Metadata::Ext::Distributed::TAGS_PREFIX) && key != EXCLUDED_TAG
-              end
-              tags
-            rescue => e
-              active_trace = Tracing.active_trace
-              active_trace.set_tag('_dd.propagation_error', 'decoding_error') if active_trace
-              ::Datadog.logger.warn(
-                "Failed to extract x-datadog-tags: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-            end
-
-            # We want to exclude tags that we don't want to propagate downstream.
-            EXCLUDED_TAG = '_dd.p.upstream_services'
-            private_constant :EXCLUDED_TAG
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/tracing/distributed/headers/parser.rb

@@ -1,37 +0,0 @@
-# typed: false
-
-require_relative '../helpers'
-
-module Datadog
-  module Tracing
-    module Distributed
-      module Headers
-        # Parser provides easy access and validation methods for Rack headers
-        class Parser
-          def initialize(env)
-            @env = env
-          end
-
-          # TODO: Don't assume Rack format.
-          #       Make distributed tracing headers apathetic.
-          def header(name)
-            rack_header = "http-#{name}".upcase!.tr('-', '_')
-
-            hdr = @env[rack_header]
-
-            # Only return the value if it is not an empty string
-            hdr if hdr != ''
-          end
-
-          def id(hdr, base = 10)
-            Helpers.value_to_id(header(hdr), base)
-          end
-
-          def number(hdr, base = 10)
-            Helpers.value_to_number(header(hdr), base)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/tracing/distributed/metadata/b3.rb

@@ -1,55 +0,0 @@
-# typed: true
-
-require_relative '../helpers'
-require_relative 'parser'
-require_relative '../headers/ext'
-require_relative '../../trace_digest'
-
-module Datadog
-  module Tracing
-    module Distributed
-      module Metadata
-        # B3 provides helpers to inject or extract metadata for B3 style headers
-        module B3
-          include Distributed::Headers::Ext
-
-          def self.inject!(digest, metadata)
-            return if digest.nil?
-
-            # DEV: We need these to be hex encoded
-            metadata[B3_HEADER_TRACE_ID] = digest.trace_id.to_s(16)
-            metadata[B3_HEADER_SPAN_ID] = digest.span_id.to_s(16)
-
-            if digest.trace_sampling_priority
-              sampling_priority = Helpers.clamp_sampling_priority(
-                digest.trace_sampling_priority
-              )
-              metadata[B3_HEADER_SAMPLED] = sampling_priority.to_s
-            end
-
-            metadata
-          end
-
-          def self.extract(metadata)
-            # Extract values from gRPC metadata
-            # DEV: B3 doesn't have "origin"
-            metadata = Parser.new(metadata)
-            trace_id = metadata.id(B3_HEADER_TRACE_ID, 16)
-            span_id = metadata.id(B3_HEADER_SPAN_ID, 16)
-            # We don't need to try and convert sampled since B3 supports 0/1 (AUTO_REJECT/AUTO_KEEP)
-            sampling_priority = metadata.number(B3_HEADER_SAMPLED)
-
-            # Return early if this propagation is not valid
-            return unless trace_id && span_id
-
-            TraceDigest.new(
-              trace_id: trace_id,
-              span_id: span_id,
-              trace_sampling_priority: sampling_priority
-            )
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/tracing/distributed/metadata/b3_single.rb

@@ -1,66 +0,0 @@
-# typed: true
-
-require_relative 'parser'
-require_relative '../helpers'
-require_relative '../headers/ext'
-require_relative '../../trace_digest'
-
-module Datadog
-  module Tracing
-    module Distributed
-      module Metadata
-        # B3Single provides helpers to inject or extract metadata for B3 single header style headers
-        module B3Single
-          include Distributed::Headers::Ext
-
-          def self.inject!(digest, metadata)
-            return if digest.nil?
-
-            # Header format:
-            #   b3: {TraceId}-{SpanId}-{SamplingState}-{ParentSpanId}
-            # https://github.com/apache/incubator-zipkin-b3-propagation/tree/7c6e9f14d6627832bd80baa87ac7dabee7be23cf#single-header
-            # DEV: `{SamplingState}` and `{ParentSpanId`}` are optional
-
-            # DEV: We need these to be hex encoded
-            b3_header = "#{digest.trace_id.to_s(16)}-#{digest.span_id.to_s(16)}"
-
-            if digest.trace_sampling_priority
-              sampling_priority = Helpers.clamp_sampling_priority(
-                digest.trace_sampling_priority
-              )
-              b3_header += "-#{sampling_priority}"
-            end
-
-            metadata[B3_HEADER_SINGLE] = b3_header
-
-            metadata
-          end
-
-          def self.extract(metadata)
-            # Metadata format:
-            #   b3: {TraceId}-{SpanId}-{SamplingState}-{ParentSpanId}
-            # https://github.com/apache/incubator-zipkin-b3-propagation/tree/7c6e9f14d6627832bd80baa87ac7dabee7be23cf#single-header
-            # DEV: `{SamplingState}` and `{ParentSpanId`}` are optional
-
-            b3_single = Parser.new(metadata).metadata_for_key(B3_HEADER_SINGLE)
-            return if b3_single.nil?
-
-            parts = b3_single.split('-')
-            trace_id = Helpers.value_to_id(parts[0], 16) unless parts.empty?
-            span_id = Helpers.value_to_id(parts[1], 16) if parts.length > 1
-            sampling_priority = Helpers.value_to_number(parts[2]) if parts.length > 2
-
-            # Return early if this propagation is not valid
-            return unless trace_id && span_id
-
-            TraceDigest.new(
-              span_id: span_id,
-              trace_id: trace_id,
-              trace_sampling_priority: sampling_priority
-            )
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/tracing/distributed/metadata/datadog.rb

@@ -1,73 +0,0 @@
-require_relative '../headers/ext'
-require_relative 'parser'
-
-module Datadog
-  module Tracing
-    module Distributed
-      module Metadata
-        # Datadog provides helpers to inject or extract metadata for Datadog style headers
-        class Datadog
-          include Distributed::Headers::Ext
-
-          def self.inject!(digest, metadata)
-            return if digest.nil?
-
-            metadata[GRPC_METADATA_TRACE_ID] = digest.trace_id.to_s
-            metadata[GRPC_METADATA_PARENT_ID] = digest.span_id.to_s
-            if digest.trace_sampling_priority
-              metadata[GRPC_METADATA_SAMPLING_PRIORITY] =
-                digest.trace_sampling_priority.to_s
-            end
-            metadata[GRPC_METADATA_ORIGIN] = digest.trace_origin.to_s if digest.trace_origin
-
-            metadata
-          end
-
-          def self.extract(metadata)
-            carrier = Carrier.new(metadata)
-
-            return nil unless carrier.valid?
-
-            TraceDigest.new(
-              span_id: carrier.parent_id,
-              trace_id: carrier.trace_id,
-              trace_origin: carrier.origin,
-              trace_sampling_priority: carrier.sampling_priority
-            )
-          end
-
-          # opentracing.io compliant carrier object
-          class Carrier
-            include Distributed::Headers::Ext
-
-            def initialize(metadata = {})
-              @metadata = Parser.new(metadata || {})
-            end
-
-            def valid?
-              (trace_id && parent_id) || (origin && trace_id)
-            end
-
-            def trace_id
-              @metadata.id(GRPC_METADATA_TRACE_ID)
-            end
-
-            def parent_id
-              @metadata.id(GRPC_METADATA_PARENT_ID)
-            end
-
-            def sampling_priority
-              value = @metadata.metadata_for_key(GRPC_METADATA_SAMPLING_PRIORITY)
-              value && value.to_i
-            end
-
-            def origin
-              value = @metadata.metadata_for_key(GRPC_METADATA_ORIGIN)
-              value if value != ''
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/tracing/distributed/metadata/parser.rb

@@ -1,34 +0,0 @@
-require_relative '../helpers'
-
-module Datadog
-  module Tracing
-    module Distributed
-      module Metadata
-        # Parser provides easy access and validation methods for metadata headers
-        class Parser
-          def initialize(metadata)
-            @metadata = metadata
-          end
-
-          def id(key, base = 10)
-            Helpers.value_to_id(metadata_for_key(key), base)
-          end
-
-          def number(key, base = 10)
-            Helpers.value_to_number(metadata_for_key(key), base)
-          end
-
-          def metadata_for_key(key)
-            # metadata values can be arrays (multiple headers with the same key)
-            value = @metadata[key]
-            if value.is_a?(Array)
-              value.first
-            else
-              value
-            end
-          end
-        end
-      end
-    end
-  end
-end