ddtrace 1.0.0.beta1 → 1.1.0

data/lib/datadog/tracing/trace_operation.rb

@@ -1,3 +1,5 @@
+# typed: false
+
 require 'datadog/core'
 require 'datadog/core/environment/identity'
 require 'datadog/core/utils'
@@ -7,6 +9,7 @@ require 'datadog/tracing/event'
 require 'datadog/tracing/span_operation'
 require 'datadog/tracing/trace_segment'
 require 'datadog/tracing/trace_digest'
+require 'datadog/tracing/metadata/tagging'
 
 module Datadog
   module Tracing
@@ -22,19 +25,18 @@ module Datadog
     # rubocop:disable Metrics/ClassLength
     # @public_api
     class TraceOperation
+      include Metadata::Tagging
+
       DEFAULT_MAX_LENGTH = 100_000
 
       attr_accessor \
         :agent_sample_rate,
         :hostname,
-        :name,
         :origin,
         :rate_limiter_rate,
-        :resource,
         :rule_sample_rate,
         :sample_rate,
-        :sampling_priority,
-        :service
+        :sampling_priority
 
       attr_reader \
         :active_span_count,
@@ -44,7 +46,10 @@ module Datadog
         :parent_span_id
 
       attr_writer \
-        :sampled
+        :name,
+        :resource,
+        :sampled,
+        :service
 
       def initialize(
         agent_sample_rate: nil,
@@ -61,10 +66,11 @@ module Datadog
         sample_rate: nil,
         sampled: nil,
         sampling_priority: nil,
-        service: nil
+        service: nil,
+        tags: nil,
+        metrics: nil
       )
         # Attributes
-        @events = events || Events.new
         @id = id || Core::Utils.next_id
         @max_length = max_length || DEFAULT_MAX_LENGTH
         @parent_span_id = parent_span_id
@@ -82,6 +88,10 @@ module Datadog
         @sampling_priority = sampling_priority
         @service = service
 
+        # Generic tags
+        set_tags(tags) if tags
+        set_tags(metrics) if metrics
+
         # State
         @root_span = nil
         @active_span = nil
@@ -117,6 +127,18 @@ module Datadog
         self.sampling_priority = Sampling::Ext::Priority::USER_REJECT
       end
 
+      def name
+        @name || (root_span && root_span.name)
+      end
+
+      def resource
+        @resource || (root_span && root_span.resource)
+      end
+
+      def service
+        @service || (root_span && root_span.service)
+      end
+
       def measure(
         op_name,
         events: nil,
@@ -231,13 +253,13 @@ module Datadog
           span_type: (@active_span && @active_span.type),
           trace_hostname: @hostname,
           trace_id: @id,
-          trace_name: @name,
+          trace_name: name,
           trace_origin: @origin,
           trace_process_id: Core::Environment::Identity.pid,
-          trace_resource: @resource,
+          trace_resource: resource,
           trace_runtime_id: Core::Environment::Identity.id,
           trace_sampling_priority: @sampling_priority,
-          trace_service: @service
+          trace_service: service,
         ).freeze
       end
 
@@ -250,16 +272,18 @@ module Datadog
           hostname: (@hostname && @hostname.dup),
           id: @id,
           max_length: @max_length,
-          name: (@name && @name.dup),
+          name: (name && name.dup),
           origin: (@origin && @origin.dup),
           parent_span_id: (@active_span && @active_span.id) || @parent_span_id,
           rate_limiter_rate: @rate_limiter_rate,
-          resource: (@resource && @resource.dup),
+          resource: (resource && resource.dup),
           rule_sample_rate: @rule_sample_rate,
           sample_rate: @sample_rate,
           sampled: @sampled,
           sampling_priority: @sampling_priority,
-          service: (@service && @service.dup)
+          service: (service && service.dup),
+          tags: meta.dup,
+          metrics: metrics.dup
         )
       end
 
@@ -357,7 +381,7 @@ module Datadog
           deactivate_span!(span_op)
 
           # Set finished, to signal root span has completed.
-          @finished = true if span_op == @root_span
+          @finished = true if span_op == root_span
 
           # Update active span count
           @active_span_count -= 1
@@ -377,12 +401,6 @@ module Datadog
         return if span.nil? || root_span
 
         @root_span = span
-
-        # Auto populate these attributes if
-        # they haven't been set yet.
-        @name ||= span.name
-        @resource ||= span.resource
-        @service ||= span.service
       end
 
       def build_trace(spans, partial = false)
@@ -399,10 +417,12 @@ module Datadog
           runtime_id: Core::Environment::Identity.id,
           sample_rate: @sample_rate,
           sampling_priority: @sampling_priority,
-          name: @name,
-          resource: @resource,
-          service: @service,
-          root_span_id: !partial ? @root_span && @root_span.id : nil
+          name: name,
+          resource: resource,
+          service: service,
+          tags: meta,
+          metrics: metrics,
+          root_span_id: !partial ? root_span && root_span.id : nil
         )
       end
     end

data/lib/datadog/tracing/trace_segment.rb

@@ -1,7 +1,11 @@
+# typed: true
+
 require 'datadog/core/runtime/ext'
+require 'datadog/core/utils/safe_dup'
 
 require 'datadog/tracing/sampling/ext'
 require 'datadog/tracing/metadata/ext'
+require 'datadog/tracing/metadata/tagging'
 
 module Datadog
   module Tracing
@@ -16,21 +20,22 @@ module Datadog
       attr_reader \
         :id,
         :spans,
-        :tags
-
-      if RUBY_VERSION < '2.2' # nil.dup only fails in Ruby 2.1
-        # Ensures #initialize can call nil.dup safely
-        module RefineNil
-          refine NilClass do
-            def dup
-              self
-            end
-          end
-        end
-
-        using RefineNil
-      end
-
+        :agent_sample_rate,
+        :hostname,
+        :lang,
+        :name,
+        :origin,
+        :process_id,
+        :rate_limiter_rate,
+        :resource,
+        :rule_sample_rate,
+        :runtime_id,
+        :sample_rate,
+        :sampling_priority,
+        :service
+
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       def initialize(
         spans,
         agent_sample_rate: nil,
@@ -47,28 +52,36 @@ module Datadog
         runtime_id: nil,
         sample_rate: nil,
         sampling_priority: nil,
-        service: nil
+        service: nil,
+        tags: nil,
+        metrics: nil
       )
         @id = id
         @root_span_id = root_span_id
         @spans = spans || []
-        @tags = {}
-
-        # Set well-known tags
-        self.agent_sample_rate = agent_sample_rate
-        self.hostname = hostname
-        self.lang = lang
-        self.name = (name.frozen? ? name : name.dup)
-        self.origin = (origin.frozen? ? origin : origin.dup)
-        self.process_id = process_id
-        self.rate_limiter_rate = rate_limiter_rate
-        self.resource = (resource.frozen? ? resource : resource.dup)
-        self.rule_sample_rate = rule_sample_rate
-        self.runtime_id = runtime_id
-        self.sample_rate = sample_rate
-        self.sampling_priority = sampling_priority
-        self.service = (service.frozen? ? service : service.dup)
-      end
+
+        # Does not make an effort to move metrics out of tags
+        # The caller is expected to have done that
+        @meta = (tags && tags.dup) || {}
+        @metrics = (metrics && metrics.dup) || {}
+
+        # Set well-known tags, defaulting to getting the values from tags
+        @agent_sample_rate = agent_sample_rate || agent_sample_rate_tag
+        @hostname = hostname || hostname_tag
+        @lang = lang || lang_tag
+        @name = Core::Utils::SafeDup.frozen_or_dup(name || name_tag)
+        @origin = Core::Utils::SafeDup.frozen_or_dup(origin || origin_tag)
+        @process_id = process_id || process_id_tag
+        @rate_limiter_rate = rate_limiter_rate || rate_limiter_rate_tag
+        @resource = Core::Utils::SafeDup.frozen_or_dup(resource || resource_tag)
+        @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_priority = sampling_priority || sampling_priority_tag
+        @service = Core::Utils::SafeDup.frozen_or_dup(service || service_tag)
+      end
+      # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       def any?
         @spans.any?
@@ -90,202 +103,104 @@ module Datadog
         @spans.size
       end
 
-      def agent_sample_rate
-        tags[Metadata::Ext::Sampling::TAG_AGENT_RATE]
-      end
-
-      def agent_sample_rate=(value)
-        if value.nil?
-          tags.delete(Metadata::Ext::Sampling::TAG_AGENT_RATE)
-          return
-        end
-
-        tags[Metadata::Ext::Sampling::TAG_AGENT_RATE] = value
-      end
-
-      def hostname
-        tags[Metadata::Ext::NET::TAG_HOSTNAME]
-      end
-
-      def hostname=(value)
-        if value.nil?
-          tags.delete(Metadata::Ext::NET::TAG_HOSTNAME)
-          return
-        end
-
-        tags[Metadata::Ext::NET::TAG_HOSTNAME] = value
-      end
-
-      def lang
-        tags[Core::Runtime::Ext::TAG_LANG]
-      end
-
-      def lang=(value)
-        if value.nil?
-          tags.delete(Core::Runtime::Ext::TAG_LANG)
-          return
-        end
-
-        tags[Core::Runtime::Ext::TAG_LANG] = value
-      end
-
-      def name
-        tags[TAG_NAME]
-      end
-
-      def name=(value)
-        if value.nil?
-          tags.delete(TAG_NAME)
-          return
-        end
-
-        tags[TAG_NAME] = value
-      end
-
-      def origin
-        tags[Metadata::Ext::Distributed::TAG_ORIGIN]
-      end
-
-      def origin=(value)
-        if value.nil?
-          tags.delete(Metadata::Ext::Distributed::TAG_ORIGIN)
-          return
-        end
-
-        tags[Metadata::Ext::Distributed::TAG_ORIGIN] = value
-      end
-
-      def process_id
-        tags[Core::Runtime::Ext::TAG_PID]
+      # If an active trace is present, forces it to be retained by the Datadog backend.
+      #
+      # Any sampling logic will not be able to change this decision.
+      #
+      # @return [void]
+      def keep!
+        self.sampling_priority = Sampling::Ext::Priority::USER_KEEP
       end
 
-      def process_id=(value)
-        if value.nil?
-          tags.delete(Core::Runtime::Ext::TAG_PID)
-          return
-        end
-
-        tags[Core::Runtime::Ext::TAG_PID] = value
+      # If an active trace is present, forces it to be dropped and not stored by the Datadog backend.
+      #
+      # Any sampling logic will not be able to change this decision.
+      #
+      # @return [void]
+      def reject!
+        self.sampling_priority = Sampling::Ext::Priority::USER_REJECT
       end
 
-      def rate_limiter_rate
-        tags[Metadata::Ext::Sampling::TAG_RATE_LIMITER_RATE]
+      def sampled?
+        sampling_priority == Sampling::Ext::Priority::AUTO_KEEP \
+          || sampling_priority == Sampling::Ext::Priority::USER_KEEP
       end
 
-      def rate_limiter_rate=(value)
-        if value.nil?
-          tags.delete(Metadata::Ext::Sampling::TAG_RATE_LIMITER_RATE)
-          return
-        end
-
-        tags[Metadata::Ext::Sampling::TAG_RATE_LIMITER_RATE] = value
-      end
+      protected
 
-      def resource
-        tags[TAG_RESOURCE]
-      end
+      attr_reader \
+        :root_span_id,
+        :meta,
+        :metrics
 
-      def resource=(value)
-        if value.nil?
-          tags.delete(TAG_RESOURCE)
-          return
-        end
+      private
 
-        tags[TAG_RESOURCE] = value
-      end
+      attr_writer \
+        :agent_sample_rate,
+        :hostname,
+        :lang,
+        :name,
+        :origin,
+        :process_id,
+        :rate_limiter_rate,
+        :resource,
+        :rule_sample_rate,
+        :runtime_id,
+        :sample_rate,
+        :sampling_priority,
+        :service
 
-      def rule_sample_rate
-        tags[Metadata::Ext::Sampling::TAG_RULE_SAMPLE_RATE]
+      def agent_sample_rate_tag
+        metrics[Metadata::Ext::Sampling::TAG_AGENT_RATE]
       end
 
-      def rule_sample_rate=(value)
-        if value.nil?
-          tags.delete(Metadata::Ext::Sampling::TAG_RULE_SAMPLE_RATE)
-          return
-        end
-
-        tags[Metadata::Ext::Sampling::TAG_RULE_SAMPLE_RATE] = value
+      def hostname_tag
+        meta[Metadata::Ext::NET::TAG_HOSTNAME]
       end
 
-      def runtime_id
-        tags[Core::Runtime::Ext::TAG_ID]
+      def lang_tag
+        meta[Core::Runtime::Ext::TAG_LANG]
       end
 
-      def runtime_id=(value)
-        if value.nil?
-          tags.delete(Core::Runtime::Ext::TAG_ID)
-          return
-        end
-
-        tags[Core::Runtime::Ext::TAG_ID] = value
+      def name_tag
+        meta[TAG_NAME]
       end
 
-      def sample_rate
-        tags[Metadata::Ext::Sampling::TAG_SAMPLE_RATE]
+      def origin_tag
+        meta[Metadata::Ext::Distributed::TAG_ORIGIN]
       end
 
-      def sample_rate=(value)
-        if value.nil?
-          tags.delete(Metadata::Ext::Sampling::TAG_SAMPLE_RATE)
-          return
-        end
-
-        tags[Metadata::Ext::Sampling::TAG_SAMPLE_RATE] = value
+      def process_id_tag
+        meta[Core::Runtime::Ext::TAG_PID]
       end
 
-      def sampling_priority
-        tags[Metadata::Ext::Distributed::TAG_SAMPLING_PRIORITY]
+      def rate_limiter_rate_tag
+        metrics[Metadata::Ext::Sampling::TAG_RATE_LIMITER_RATE]
       end
 
-      def sampling_priority=(value)
-        if value.nil?
-          tags.delete(Metadata::Ext::Distributed::TAG_SAMPLING_PRIORITY)
-          return
-        end
-
-        tags[Metadata::Ext::Distributed::TAG_SAMPLING_PRIORITY] = value
+      def resource_tag
+        meta[TAG_RESOURCE]
       end
 
-      def service
-        tags[TAG_SERVICE]
+      def rule_sample_rate_tag
+        metrics[Metadata::Ext::Sampling::TAG_RULE_SAMPLE_RATE]
       end
 
-      def service=(value)
-        if value.nil?
-          tags.delete(TAG_SERVICE)
-          return
-        end
-
-        tags[TAG_SERVICE] = value
+      def runtime_id_tag
+        meta[Core::Runtime::Ext::TAG_ID]
       end
 
-      # If an active trace is present, forces it to be retained by the Datadog backend.
-      #
-      # Any sampling logic will not be able to change this decision.
-      #
-      # @return [void]
-      def keep!
-        self.sampling_priority = Sampling::Ext::Priority::USER_KEEP
+      def sample_rate_tag
+        metrics[Metadata::Ext::Sampling::TAG_SAMPLE_RATE]
       end
 
-      # If an active trace is present, forces it to be dropped and not stored by the Datadog backend.
-      #
-      # Any sampling logic will not be able to change this decision.
-      #
-      # @return [void]
-      def reject!
-        self.sampling_priority = Sampling::Ext::Priority::USER_REJECT
+      def sampling_priority_tag
+        meta[Metadata::Ext::Distributed::TAG_SAMPLING_PRIORITY]
       end
 
-      def sampled?
-        sampling_priority == Sampling::Ext::Priority::AUTO_KEEP \
-          || sampling_priority == Sampling::Ext::Priority::USER_KEEP
+      def service_tag
+        meta[TAG_SERVICE]
       end
-
-      protected
-
-      attr_reader \
-        :root_span_id
     end
     # rubocop:enable Metrics/ClassLength
   end

data/lib/datadog/tracing/tracer.rb

@@ -1,4 +1,5 @@
-# typed: false
+# typed: true
+
 require 'datadog/core'
 require 'datadog/core/environment/ext'
 require 'datadog/core/environment/socket'
@@ -198,7 +199,7 @@ module Datadog
 
       # The active, unfinished trace, representing the current instrumentation context.
       #
-      # The active trace is thread-local.
+      # The active trace is fiber-local.
       #
       # @param [Thread] key Thread to retrieve trace from. Defaults to current thread. For internal use only.
       # @return [Datadog::Tracing::TraceSegment] the active trace

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/core'
 require 'datadog/core/worker'
 require 'datadog/core/workers/async'

data/lib/datadog/tracing/workers.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/core'
 
 require 'datadog/tracing/buffer'

data/lib/datadog/tracing/writer.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/core'
 
 require 'datadog/tracing/event'

data/lib/datadog/tracing.rb

@@ -1,3 +1,5 @@
+# typed: false
+
 require 'datadog/core'
 require 'datadog/tracing/pipeline'
 

data/lib/ddtrace/auto_instrument.rb

@@ -1,8 +1,9 @@
 # typed: strict
+
 # Entrypoint file for auto instrumentation.
 #
 # This file's path is part of the @public_api.
 require 'ddtrace'
+require 'datadog/tracing/contrib/auto_instrument'
 
-Datadog.add_auto_instrument
 Datadog::Profiling.start_if_enabled

data/lib/ddtrace/auto_instrument_base.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   # base methods stubbed for adding auto instrument extensions
   module AutoInstrumentBase

data/lib/ddtrace/profiling/preload.rb

@@ -1,2 +1,4 @@
+# typed: strict
+
 # TODO: Warns users after 1.0 upgrade. Remove this file in 2.0.
 raise LoadError, 'This file has been moved to `datadog/profiling/preload` in 1.0.0'

data/lib/ddtrace/transport/ext.rb

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

data/lib/ddtrace/transport/http/adapters/net.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'ddtrace/transport/response'
 require 'datadog/core/vendor/multipart-post/net/http/post/multipart'
 

data/lib/ddtrace/transport/http/adapters/registry.rb

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

data/lib/ddtrace/transport/http/adapters/test.rb

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

data/lib/ddtrace/transport/http/adapters/unix_socket.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'net/http'
 require 'ddtrace/transport/ext'
 require 'ddtrace/transport/http/adapters/net'

data/lib/ddtrace/transport/http/api/endpoint.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'json'
 
 module Datadog

data/lib/ddtrace/transport/http/api/fallbacks.rb

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

data/lib/ddtrace/transport/http/api/instance.rb

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

data/lib/ddtrace/transport/http/api/map.rb

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

data/lib/ddtrace/transport/http/api/spec.rb

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/core/encoding'
 
 require 'ddtrace/transport/http/api/map'