ddtrace 0.15.0.internaltracinfeature1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6700cc19b4e8774fd5704faae484af128420ad0dbea55eea1834a066bb4b00a
-  data.tar.gz: 167719d0a22192b44c94f11ef6a0f16f42de17b8c15afe6490e0e133858e0048
+  metadata.gz: 83a0125cb996a905f1d25812abb1f64d4703b4ba870b378dbb746675322ea7f4
+  data.tar.gz: 98dbbbffe51a7912106269183b12f41fea114f1b7fa7dc42e3266ad910ba57ff
 SHA512:
-  metadata.gz: 1d82cd8c84a8f4df0b50d0d4d6d6e5a90b7d4c6638694f1fafd11e7fdcbcdfbf4ef3aab200cf56aa8a04d218fb06f985f14b618c9ad2e6be5cf3c89a28fb86db
-  data.tar.gz: a34c49958997bc2fdc0b50f09718f3675e11d4d91268bc8b0bed4ca40f3b7096ed56cbee1818e3b65af28a52d9f2435fbcb75f974e240e121829be29b62ac23a
+  metadata.gz: 4f750d5f3418be21196ee9109f1faa9eb904baf7bd5d4f8eb07b00e6bce5f1b7dc393e080a4be53e350bbfbeedf3216823b4b58df7720fa64688fb9c1ab10f64
+  data.tar.gz: 4c056618940a40462006828d0ede6613a51e78c062555544605480f540a471747a9fb76c9ee496dc3b9b82f7595a77df4a933d14eed3db18457a61c9c76ff880

data/lib/ddtrace/contrib/http/patcher.rb

@@ -14,37 +14,27 @@ module Datadog
 
       module_function
 
-      def tracing_transport?(req, address, port, transport)
+      def should_skip_tracing?(req, address, port, transport, pin)
         # we don't want to trace our own call to the API (they use net/http)
         # when we know the host & port (from the URI) we use it, else (most-likely
         # called with a block) rely on the URL at the end.
         if req.respond_to?(:uri) && req.uri
           if req.uri.host.to_s == transport.hostname.to_s &&
              req.uri.port.to_i == transport.port.to_i
-            true
+            return true
           end
         elsif address && port &&
               address.to_s == transport.hostname.to_s &&
               port.to_i == transport.port.to_i
-          true
+          return true
         end
-      end
-
-      def tracing_recursive_request?(tracer)
         # we don't want a "shotgun" effect with two nested traces for one
         # logical get, and request is likely to call itself recursively
-        active = tracer.active_span
+        active = pin.tracer.active_span()
         return true if active && (active.name == NAME)
         false
       end
 
-      # @deprecated This method will be removed in 1.0
-      def should_skip_tracing?(req, address, port, transport, pin)
-        Datadog::Tracer.log.error('should_skip_tracing? will be deprecated in 1.0')
-
-        tracing_transport?(req, address, port, transport) || tracing_recursive_request?(pin.tracer)
-      end
-
       def should_skip_distributed_tracing?(pin)
         if pin.config && pin.config.key?(:distributed_tracing)
           return !pin.config[:distributed_tracing]
@@ -109,15 +99,12 @@ module Datadog
             end
 
             def request(req, body = nil, &block) # :yield: +response+
-              transport = Datadog.configuration[:http][:tracer].writer.transport
-              if Datadog::Contrib::HTTP.tracing_transport?(req, @address, @port, transport)
-                return request_without_datadog(req, body, &block)
-              end
-
               pin = datadog_pin
               return request_without_datadog(req, body, &block) unless pin && pin.tracer
 
-              if Datadog::Contrib::HTTP.tracing_recursive_request?(pin.tracer)
+              transport = pin.tracer.writer.transport
+
+              if Datadog::Contrib::HTTP.should_skip_tracing?(req, @address, @port, transport, pin)
                 return request_without_datadog(req, body, &block)
               end
 

data/lib/ddtrace/tracer.rb

@@ -20,7 +20,7 @@ module Datadog
   # rubocop:disable Metrics/ClassLength
   class Tracer
     attr_reader :sampler, :services, :tags, :provider
-    attr_accessor :enabled, :writer, :internal_traces
+    attr_accessor :enabled, :writer
     attr_writer :default_service
 
     ALLOWED_SPAN_OPTIONS = [:service, :resource, :span_type].freeze
@@ -102,7 +102,6 @@ module Datadog
       @provider ||= Datadog::DefaultContextProvider.new # @provider should never be nil
 
       @context_flush = options[:partial_flush] ? Datadog::ContextFlush.new(options) : nil
-      @internal_traces = options[:internal_traces] || false
 
       @mutex = Mutex.new
       @services = {}
@@ -124,7 +123,6 @@ module Datadog
       enabled = options.fetch(:enabled, nil)
       hostname = options.fetch(:hostname, nil)
       port = options.fetch(:port, nil)
-      @internal_traces = options.fetch(:internal_traces, false)
 
       # Those are rare "power-user" options.
       sampler = options.fetch(:sampler, nil)

data/lib/ddtrace/transport.rb

@@ -3,7 +3,6 @@ require 'net/http'
 
 require 'ddtrace/encoding'
 require 'ddtrace/version'
-require 'ddtrace/utils'
 
 module Datadog
   # Transport class that handles the spans delivery to the
@@ -11,9 +10,6 @@ module Datadog
   # so that the Transport is thread-safe.
   # rubocop:disable Metrics/ClassLength
   class HTTPTransport
-    include Datadog::Utils::InternalTraces
-    self.internal_trace_service = 'datadog.transport'.freeze
-
     attr_accessor :hostname, :port
     attr_reader :traces_endpoint, :services_endpoint
 
@@ -49,12 +45,6 @@ module Datadog
 
     private_constant :API
 
-    CONTENT_TYPE = 'Content-Type'.freeze
-    DATADOG_META_LANG = 'Datadog-Meta-Lang'.freeze
-    DATADOG_META_LANG_VERSION = 'Datadog-Meta-Lang-Version'.freeze
-    DATADOG_META_LANG_INTERPRETER = 'Datadog-Meta-Lang-Interpreter'.freeze
-    DATADOG_META_TRACER_VERSION = 'Datadog-Meta-Tracer-Version'.freeze
-
     def initialize(hostname, port, options = {})
       api_version = options.fetch(:api_version, V3)
 
@@ -66,11 +56,11 @@ module Datadog
 
       # overwrite the Content-type with the one chosen in the Encoder
       @headers = options.fetch(:headers, {})
-      @headers[CONTENT_TYPE] = @encoder.content_type
-      @headers[DATADOG_META_LANG] = 'ruby'.freeze
-      @headers[DATADOG_META_LANG_VERSION] = RUBY_VERSION
-      @headers[DATADOG_META_LANG_INTERPRETER] = RUBY_INTERPRETER
-      @headers[DATADOG_META_TRACER_VERSION] = Datadog::VERSION::STRING
+      @headers['Content-Type'] = @encoder.content_type
+      @headers['Datadog-Meta-Lang'] = 'ruby'
+      @headers['Datadog-Meta-Lang-Version'] = RUBY_VERSION
+      @headers['Datadog-Meta-Lang-Interpreter'] = RUBY_INTERPRETER
+      @headers['Datadog-Meta-Tracer-Version'] = Datadog::VERSION::STRING
 
       # stats
       @mutex = Mutex.new
@@ -83,27 +73,28 @@ module Datadog
 
     # route the send to the right endpoint
     def send(endpoint, data)
-      internal_span_when(-> { do_trace?(data) }, 'datadog.send'.freeze) do
-        case endpoint
-        when :services
-          status_code = send_services(data)
-        when :traces
-          status_code = send_traces(data)
-        else
-          with_active_internal_span { |s| s.set_error(RuntimeError.new("Unsupported endpoint: #{endpoint}")) }
-
-          Datadog::Tracer.log.error("Unsupported endpoint: #{endpoint}")
-          return nil
+      case endpoint
+      when :services
+        payload = @encoder.encode_services(data)
+        status_code = post(@api[:services_endpoint], payload) do |response|
+          process_callback(:services, response)
         end
-
-        if downgrade?(status_code)
-          internal_child_span('datadog.send.downgrade'.freeze) do
-            downgrade!
-            send(endpoint, data)
-          end
-        else
-          status_code
+      when :traces
+        count = data.length
+        payload = @encoder.encode_traces(data)
+        status_code = post(@api[:traces_endpoint], payload, count) do |response|
+          process_callback(:traces, response)
         end
+      else
+        Datadog::Tracer.log.error("Unsupported endpoint: #{endpoint}")
+        return nil
+      end
+
+      if downgrade?(status_code)
+        downgrade!
+        send(endpoint, data)
+      else
+        status_code
       end
     end
 
@@ -115,11 +106,10 @@ module Datadog
         headers = headers.merge(@headers)
         request = Net::HTTP::Post.new(url, headers)
         request.body = data
+
         response = Net::HTTP.start(@hostname, @port, read_timeout: TIMEOUT) { |http| http.request(request) }
         handle_response(response)
       rescue StandardError => e
-        with_active_internal_span { |s| s.set_error(e) }
-
         log_error_once(e.message)
         500
       end.tap do
@@ -136,7 +126,7 @@ module Datadog
 
         @api = API.fetch(fallback_version)
         @encoder = @api[:encoder].new
-        @headers[CONTENT_TYPE] = @encoder.content_type
+        @headers['Content-Type'] = @encoder.content_type
       end
     end
 
@@ -178,10 +168,9 @@ module Datadog
     # function is handled within the HTTP mutex.synchronize so it's thread-safe.
     def handle_response(response)
       status_code = response.code.to_i
-      with_active_internal_span { |s| s.set_tag('response.code', status_code) }
 
       if success?(status_code)
-        Datadog::Tracer.log.debug('Payload correctly sent to the trace agent.'.freeze)
+        Datadog::Tracer.log.debug('Payload correctly sent to the trace agent.')
         @mutex.synchronize { @count_consecutive_errors = 0 }
         @mutex.synchronize { @count_success += 1 }
       elsif downgrade?(status_code)
@@ -197,7 +186,6 @@ module Datadog
     rescue StandardError => e
       log_error_once(e.message)
       @mutex.synchronize { @count_internal_error += 1 }
-      with_active_internal_span { |s| s.set_error(e) }
 
       500
     end
@@ -215,54 +203,6 @@ module Datadog
 
     private
 
-    def do_trace?(data)
-      # Create the span if we already are traced
-      return true if Datadog.tracer.active_span
-      # Don't trace empty data
-      return false unless data
-
-      # over 3 traces means that we most certainly send more than only internal traces
-      return true if data.length > 3
-
-      # all spans in all traces shouldn't be only 'datadog.internal' spans
-      !data.respond_to?(:all?) || data.all? do |trace|
-        !trace.respond_to?(:none?) || trace.none? do |span|
-          span.respond_to?(:get_tag) && span.get_tag(Utils::InternalTraces::INTERNAL_TAG)
-        end
-      end
-    end
-
-    def send_traces(data)
-      count = data.length
-
-      payload = internal_child_span('datadog.encode.traces'.freeze) do
-        with_active_internal_span { |s| s.set_tag('traces.count'.freeze, count) }
-        @encoder.encode_traces(data)
-      end
-
-      internal_child_span('datadog.traces.post'.freeze) do
-        post(@api[:traces_endpoint], payload, count) do |response|
-          internal_child_span('datadog.traces.response_callback'.freeze) do
-            process_callback(:traces, response)
-          end
-        end
-      end
-    end
-
-    def send_services(data)
-      payload = internal_child_span('datadog.services.encode'.freeze) do
-        @encoder.encode_services(data)
-      end
-
-      internal_child_span('datadog.services.post'.freeze) do
-        post(@api[:services_endpoint], payload) do |response|
-          internal_child_span('datadog.services.response_callback'.freeze) do
-            process_callback(:services, response)
-          end
-        end
-      end
-    end
-
     def log_error_once(*args)
       if @count_consecutive_errors > 0
         Datadog::Tracer.log.debug(*args)

data/lib/ddtrace/utils.rb

@@ -1,5 +1,4 @@
 require 'ddtrace/utils/database'
-require 'ddtrace/utils/internal_traces'
 
 module Datadog
   # Utils contains low-level utilities, typically to provide pseudo-random trace IDs.

data/lib/ddtrace/version.rb

@@ -3,7 +3,7 @@ module Datadog
     MAJOR = 0
     MINOR = 15
     PATCH = 0
-    PRE = 'internaltracinfeature1'
+    PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.15.0.internaltracinfeature1
+  version: 0.15.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -420,7 +420,6 @@ files:
 - lib/ddtrace/transport.rb
 - lib/ddtrace/utils.rb
 - lib/ddtrace/utils/database.rb
-- lib/ddtrace/utils/internal_traces.rb
 - lib/ddtrace/vendor/active_record/connection_specification.rb
 - lib/ddtrace/version.rb
 - lib/ddtrace/workers.rb
@@ -441,9 +440,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7

data/lib/ddtrace/utils/internal_traces.rb

@@ -1,53 +0,0 @@
-module Datadog
-  module Utils
-    # Traces generated by the client internals
-    module InternalTraces
-      def self.included(klass)
-        klass.extend(ClassMethods)
-      end
-
-      # ClassMethods
-      module ClassMethods
-        attr_writer :internal_trace_service
-
-        def internal_trace_service
-          @internal_trace_service ||= 'datadog.unknown'.freeze
-        end
-      end
-
-      INTERNAL_TAG = 'datadog.internal'.freeze
-
-      def internal_span(name, *args)
-        return yield unless Datadog.tracer.internal_traces
-
-        Datadog.tracer.trace(name, *args) do |span|
-          span.set_tag(INTERNAL_TAG, true)
-          span.service = self.class.internal_trace_service
-          yield
-        end
-      end
-
-      def internal_span_when(condition, name, *args, &block)
-        return yield unless Datadog.tracer.internal_traces
-
-        condition = condition.call if condition.respond_to?(:send)
-        return yield unless condition
-
-        internal_span(name, *args, &block)
-      end
-
-      def internal_child_span(name, *args, &block)
-        return yield unless Datadog.tracer.internal_traces
-
-        internal_span_when(-> { Datadog.tracer.active_span }, name, *args, &block)
-      end
-
-      def with_active_internal_span
-        return unless Datadog.tracer.internal_traces
-
-        span = Datadog.tracer.active_span
-        yield(span) if span && span.get_tag(INTERNAL_TAG)
-      end
-    end
-  end
-end