ddtrace 0.24.0 → 0.25.0

data/lib/ddtrace/version.rb

@@ -1,7 +1,7 @@
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 24
+    MINOR = 25
     PATCH = 0
     PRE = nil
 

data/lib/ddtrace/workers.rb

@@ -53,14 +53,18 @@ module Datadog
           # ensures that the thread will not die because of an exception.
           # TODO[manu]: findout the reason and reschedule the send if it's not
           # a fatal exception
-          Datadog::Tracer.log.error("Error during traces flush: dropped #{traces.length} items. Cause: #{e}")
+          Datadog::Tracer.log.error(
+            "Error during traces flush: dropped #{traces.length} items. Cause: #{e} Location: #{e.backtrace.first}"
+          )
         end
       end
 
       def callback_runtime_metrics
         @runtime_metrics_task.call unless @runtime_metrics_task.nil?
       rescue StandardError => e
-        Datadog::Tracer.log.error("Error during runtime metrics flush. Cause: #{e}")
+        Datadog::Tracer.log.error(
+          "Error during runtime metrics flush. Cause: #{e} Location: #{e.backtrace.first}"
+        )
       end
 
       # Start the timer execution.

data/lib/ddtrace/writer.rb

@@ -1,7 +1,10 @@
+require 'json'
+
 require 'ddtrace/ext/net'
 require 'ddtrace/runtime/socket'
 
 require 'ddtrace/transport'
+require 'ddtrace/transport/http'
 require 'ddtrace/encoding'
 require 'ddtrace/workers'
 
@@ -23,13 +26,12 @@ module Datadog
       # priority sampling
       if options[:priority_sampler]
         @priority_sampler = options[:priority_sampler]
-        transport_options[:api_version] ||= HTTPTransport::V4
-        transport_options[:response_callback] ||= method(:sampling_updater)
+        transport_options[:api_version] ||= Transport::HTTP::API::V4
       end
 
       # transport and buffers
       @transport = options.fetch(:transport) do
-        HTTPTransport.new(transport_options)
+        Transport::HTTP.default(transport_options)
       end
 
       # Runtime metrics
@@ -65,7 +67,8 @@ module Datadog
 
     # stops worker for spans.
     def stop
-      @worker.stop()
+      return if worker.nil?
+      @worker.stop
       @worker = nil
     end
 
@@ -76,11 +79,29 @@ module Datadog
       # Inject hostname if configured to do so
       inject_hostname!(traces) if Datadog.configuration.report_hostname
 
-      code = transport.send(:traces, traces)
-      status = !transport.server_error?(code)
-      @traces_flushed += traces.length if status
+      if transport.is_a?(Datadog::HTTPTransport)
+        # For older Datadog::HTTPTransport...
+        code = transport.send(:traces, traces)
+        (!transport.server_error?(code)).tap do |status|
+          @traces_flushed += traces.length if status
+        end
+      else
+        # For newer Datadog::Transports...
+        # Send traces an get a response.
+        response = transport.send_traces(traces)
 
-      status
+        unless response.internal_error?
+          @traces_flushed += traces.length unless response.server_error?
+
+          # Update priority sampler
+          unless priority_sampler.nil? || response.service_rates.nil?
+            priority_sampler.update(response.service_rates)
+          end
+        end
+
+        # Return if server error occurred.
+        !response.server_error?
+      end
     end
 
     def send_runtime_metrics
@@ -130,19 +151,12 @@ module Datadog
       }
     end
 
-    private
-
-    def inject_hostname!(traces)
-      traces.each do |trace|
-        next if trace.first.nil?
-
-        hostname = Datadog::Runtime::Socket.hostname
-        unless hostname.nil? || hostname.empty?
-          trace.first.set_tag(Ext::NET::TAG_HOSTNAME, hostname)
-        end
-      end
-    end
-
+    # Updates the priority sampler with rates from transport response.
+    # action (Symbol): Symbol representing data submitted.
+    # response: A Datadog::Transport::Response object.
+    # api: API version used to process this request.
+    #
+    # NOTE: Used only by old Datadog::HTTPTransport; will be removed.
     def sampling_updater(action, response, api)
       return unless action == :traces && response.is_a?(Net::HTTPOK)
 
@@ -156,5 +170,18 @@ module Datadog
         false
       end
     end
+
+    private
+
+    def inject_hostname!(traces)
+      traces.each do |trace|
+        next if trace.first.nil?
+
+        hostname = Datadog::Runtime::Socket.hostname
+        unless hostname.nil? || hostname.empty?
+          trace.first.set_tag(Ext::NET::TAG_HOSTNAME, hostname)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -291,8 +291,8 @@ files:
 - ".circleci/images/primary/Dockerfile-2.0.0"
 - ".circleci/images/primary/Dockerfile-2.1.10"
 - ".circleci/images/primary/Dockerfile-2.2.10"
-- ".circleci/images/primary/Dockerfile-2.3.7"
-- ".circleci/images/primary/Dockerfile-2.4.4"
+- ".circleci/images/primary/Dockerfile-2.3.8"
+- ".circleci/images/primary/Dockerfile-2.4.6"
 - ".dockerignore"
 - ".env"
 - ".gitignore"
@@ -532,6 +532,7 @@ files:
 - lib/ddtrace/ext/errors.rb
 - lib/ddtrace/ext/forced_tracing.rb
 - lib/ddtrace/ext/http.rb
+- lib/ddtrace/ext/manual_tracing.rb
 - lib/ddtrace/ext/metrics.rb
 - lib/ddtrace/ext/net.rb
 - lib/ddtrace/ext/priority.rb
@@ -578,6 +579,27 @@ files:
 - lib/ddtrace/sync_writer.rb
 - lib/ddtrace/tracer.rb
 - lib/ddtrace/transport.rb
+- lib/ddtrace/transport/http.rb
+- lib/ddtrace/transport/http/adapters/net.rb
+- lib/ddtrace/transport/http/adapters/registry.rb
+- lib/ddtrace/transport/http/adapters/test.rb
+- lib/ddtrace/transport/http/adapters/unix_socket.rb
+- lib/ddtrace/transport/http/api.rb
+- lib/ddtrace/transport/http/api/endpoint.rb
+- lib/ddtrace/transport/http/api/fallbacks.rb
+- lib/ddtrace/transport/http/api/instance.rb
+- lib/ddtrace/transport/http/api/map.rb
+- lib/ddtrace/transport/http/api/spec.rb
+- lib/ddtrace/transport/http/builder.rb
+- lib/ddtrace/transport/http/client.rb
+- lib/ddtrace/transport/http/env.rb
+- lib/ddtrace/transport/http/response.rb
+- lib/ddtrace/transport/http/traces.rb
+- lib/ddtrace/transport/parcel.rb
+- lib/ddtrace/transport/request.rb
+- lib/ddtrace/transport/response.rb
+- lib/ddtrace/transport/statistics.rb
+- lib/ddtrace/transport/traces.rb
 - lib/ddtrace/utils.rb
 - lib/ddtrace/utils/database.rb
 - lib/ddtrace/utils/time.rb