ddtrace 1.5.2 → 1.6.0

data/lib/datadog/tracing/sampling/rule_sampler.rb

@@ -48,7 +48,7 @@ module Datadog
                                nil
                              else
                                # TODO: Simplify .tags access, as `Tracer#tags` can't be arbitrarily changed anymore
-                               RateByServiceSampler.new(1.0, env: -> { Tracing.send(:tracer).tags[:env] })
+                               RateByServiceSampler.new(1.0, env: -> { Tracing.send(:tracer).tags['env'] })
                              end
         end
 
@@ -76,10 +76,10 @@ module Datadog
         end
 
         # @!visibility private
-        def update(*args)
+        def update(*args, **kwargs)
           return false unless @default_sampler.respond_to?(:update)
 
-          @default_sampler.update(*args)
+          @default_sampler.update(*args, **kwargs)
         end
 
         private
@@ -100,6 +100,7 @@ module Datadog
           rate_limiter.allow?(1).tap do |allowed|
             set_priority(trace, allowed)
             set_limiter_metrics(trace, rate_limiter.effective_rate)
+            trace.set_tag(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER, Ext::Decision::TRACE_SAMPLING_RULE)
           end
         rescue StandardError => e
           Datadog.logger.error(

data/lib/datadog/tracing/sampling/span/ext.rb

@@ -18,10 +18,6 @@ module Datadog
           TAG_RULE_RATE = '_dd.span_sampling.rule_rate'
           # Rate limit configured for this span, if a rule applies
           TAG_MAX_PER_SECOND = '_dd.span_sampling.max_per_second'
-
-          # This span was sampled on account of a Span Sampling Rule
-          # @see Datadog::Tracing::Sampling::Span::Rule
-          MECHANISM_SPAN_SAMPLING_RATE = 8
         end
       end
     end

data/lib/datadog/tracing/sampling/span/rule.rb

@@ -59,7 +59,7 @@ module Datadog
             return :not_matched unless @matcher.match?(span_op)
 
             if @sampler.sample?(span_op) && @rate_limiter.allow?(1)
-              span_op.set_metric(Span::Ext::TAG_MECHANISM, Span::Ext::MECHANISM_SPAN_SAMPLING_RATE)
+              span_op.set_metric(Span::Ext::TAG_MECHANISM, Sampling::Ext::Mechanism::SPAN_SAMPLING_RATE)
               span_op.set_metric(Span::Ext::TAG_RULE_RATE, @sample_rate)
               span_op.set_metric(Span::Ext::TAG_MAX_PER_SECOND, @rate_limit)
               :kept

data/lib/datadog/tracing/sampling/span/sampler.rb

@@ -50,9 +50,20 @@ module Datadog
           def sample!(trace_op, span_op)
             return if trace_op.sampled? && trace_op.priority_sampled?
 
-            # Return as soon as one rule matches
-            @rules.any? do |rule|
-              rule.sample!(span_op) != :not_matched
+            # Applies the first matching rule
+            @rules.each do |rule|
+              decision = rule.sample!(span_op)
+
+              next if decision == :not_matched # Iterate until we find a matching decision
+
+              if decision == :kept
+                trace_op.set_tag(
+                  Metadata::Ext::Distributed::TAG_DECISION_MAKER,
+                  Sampling::Ext::Decision::SPAN_SAMPLING_RATE
+                )
+              end
+
+              break # Found either a `kept` or `rejected` decision
             end
 
             nil

data/lib/datadog/tracing/trace_digest.rb

@@ -12,6 +12,7 @@ module Datadog
         :span_resource,
         :span_service,
         :span_type,
+        :trace_distributed_tags,
         :trace_hostname,
         :trace_id,
         :trace_name,
@@ -28,6 +29,7 @@ module Datadog
         span_resource: nil,
         span_service: nil,
         span_type: nil,
+        trace_distributed_tags: nil,
         trace_hostname: nil,
         trace_id: nil,
         trace_name: nil,
@@ -43,6 +45,7 @@ module Datadog
         @span_resource = span_resource && span_resource.dup.freeze
         @span_service = span_service && span_service.dup.freeze
         @span_type = span_type && span_type.dup.freeze
+        @trace_distributed_tags = trace_distributed_tags && trace_distributed_tags.dup.freeze
         @trace_hostname = trace_hostname && trace_hostname.dup.freeze
         @trace_id = trace_id
         @trace_name = trace_name && trace_name.dup.freeze

data/lib/datadog/tracing/trace_operation.rb

@@ -133,11 +133,13 @@ module Datadog
       def keep!
         self.sampled = true
         self.sampling_priority = Sampling::Ext::Priority::USER_KEEP
+        set_tag(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER, Tracing::Sampling::Ext::Decision::MANUAL)
       end
 
       def reject!
         self.sampled = false
         self.sampling_priority = Sampling::Ext::Priority::USER_REJECT
+        set_tag(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER, Tracing::Sampling::Ext::Decision::MANUAL)
       end
 
       def name
@@ -278,6 +280,7 @@ module Datadog
           span_resource: (@active_span && @active_span.resource),
           span_service: (@active_span && @active_span.service),
           span_type: (@active_span && @active_span.type),
+          trace_distributed_tags: distributed_tags,
           trace_hostname: @hostname,
           trace_id: @id,
           trace_name: name,
@@ -452,6 +455,13 @@ module Datadog
           root_span_id: !partial ? root_span && root_span.id : nil
         )
       end
+
+      # Returns tracer tags that will be propagated if this span's context
+      # is exported through {.to_digest}.
+      # @return [Hash] key value pairs of distributed tags
+      def distributed_tags
+        meta.select { |name, _| name.start_with?(Metadata::Ext::Distributed::TAGS_PREFIX) }
+      end
     end
   end
 end

data/lib/datadog/tracing/trace_segment.rb

@@ -30,6 +30,7 @@ module Datadog
         :rule_sample_rate,
         :runtime_id,
         :sample_rate,
+        :sampling_decision_maker,
         :sampling_priority,
         :service
 
@@ -77,6 +78,7 @@ module Datadog
         @rule_sample_rate = rule_sample_rate_tag || rule_sample_rate
         @runtime_id = runtime_id || runtime_id_tag
         @sample_rate = sample_rate || sample_rate_tag
+        @sampling_decision_maker = sampling_decision_maker_tag
         @sampling_priority = sampling_priority || sampling_priority_tag
         @service = Core::Utils::SafeDup.frozen_or_dup(service || service_tag)
       end
@@ -194,6 +196,10 @@ module Datadog
         metrics[Metadata::Ext::Sampling::TAG_SAMPLE_RATE]
       end
 
+      def sampling_decision_maker_tag
+        meta[Metadata::Ext::Distributed::TAG_DECISION_MAKER]
+      end
+
       def sampling_priority_tag
         meta[Metadata::Ext::Distributed::TAG_SAMPLING_PRIORITY]
       end

data/lib/datadog/tracing/tracer.rb

@@ -326,7 +326,9 @@ module Datadog
             id: digest.trace_id,
             origin: digest.trace_origin,
             parent_span_id: digest.span_id,
-            sampling_priority: digest.trace_sampling_priority
+            sampling_priority: digest.trace_sampling_priority,
+            # Distributed tags are just regular trace tags with special meaning to Datadog
+            tags: digest.trace_distributed_tags,
           )
         else
           TraceOperation.new(

data/lib/datadog/tracing/writer.rb

@@ -175,6 +175,13 @@ module Datadog
           end
         end
       end
+
+      private
+
+      def reset_stats!
+        @traces_flushed = 0
+        @transport.stats.reset!
+      end
     end
   end
 end

data/lib/ddtrace/transport/trace_formatter.rb

@@ -48,6 +48,7 @@ module Datadog
         tag_runtime_id!
         tag_rate_limiter_rate!
         tag_sample_rate!
+        tag_sampling_decision_maker!
         tag_sampling_priority!
 
         trace
@@ -155,6 +156,12 @@ module Datadog
         )
       end
 
+      def tag_sampling_decision_maker!
+        return unless (decision = trace.sampling_decision_maker)
+
+        root_span.set_tag(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER, decision)
+      end
+
       def tag_sampling_priority!
         return unless trace.sampling_priority
 

data/lib/ddtrace/transport/traces.rb

@@ -80,7 +80,7 @@ module Datadog
 
           if encoded.size > max_size
             # This single trace is too large, we can't flush it
-            Datadog.logger.debug { "Dropping trace. Payload too large: '#{trace.map(&:to_hash)}'" }
+            Datadog.logger.debug { "Dropping trace. Payload too large: '#{trace.inspect}'" }
             Datadog.health_metrics.transport_trace_too_large(1)
 
             return nil

data/lib/ddtrace/version.rb

@@ -3,8 +3,8 @@
 module DDTrace
   module VERSION
     MAJOR = 1
-    MINOR = 5
-    PATCH = 2
+    MINOR = 6
+    PATCH = 0
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -64,14 +64,14 @@ dependencies:
     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
@@ -314,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
@@ -335,14 +334,6 @@ 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
@@ -505,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
@@ -569,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
@@ -686,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
@@ -792,7 +796,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.2.26
+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