ddtrace 0.25.1 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 355cf6450731c598911ebe51c98e5212e1041dfd
-  data.tar.gz: 6fc731d38849f3be7c243ca10aca66c3e90fb6ce
+  metadata.gz: afb28eea48bf86f3cac41970e8b600e2f6daed82
+  data.tar.gz: 1a712a917211717bb409754fcffda978f7146522
 SHA512:
-  metadata.gz: cd5a4b10976db57363e83ee8876dbcea361fa845f992eb4d92e280c42d6601423601e08abeab6e8ad49557ed3a5c2578d93f864538a63a12d946463e41b13bc5
-  data.tar.gz: c53f09353336e3c3b5a6588542db0f2b92979c745ccf1cd3354d471ff168abc4946b130663e87c13ef957221defa299f23da5e5ff2e86b080e07f1a280d8e380
+  metadata.gz: be061d7e43faaafb0f1f3b45d78e556eda4bdacca67d8ac471f0588066152d84f53a4e88143dcfca4b1ea58cb4be1e74f3a75f143196a345966b8099704bf329
+  data.tar.gz: 7b805cd9b5a623f7100f0572ab281e999e1f3e18879a0b3ddb951d30572023058d6465fd78e4d67b4011c5ec84af6a668992232217ea60ba1ac9d513cf3c40f8

data/CHANGELOG.md

@@ -4,6 +4,32 @@
 
 ## [Unreleased (beta)]
 
+## [0.26.0] - 2019-08-06
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.26.0
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.25.1...v0.26.0
+
+Support for Ruby < 2.0 is *deprecated*. Plan for timeline is as follows:
+
+ - 0.25.0: Support for Ruby < 2.0 is deprecated; retains full feature support.
+ - 0.26.0: Last version to support Ruby < 2.0; any new features will not support 1.9.
+ - 0.27.0: Support for Ruby < 2.0 is removed.
+
+Version 0.26.x will receive only critical bugfixes for 1 year following the release of 0.26.0 (August 6th, 2020.)
+
+### Added
+
+- Container ID tagging for containerized environments (#784)
+
+### Refactored
+
+- Datadog::Metrics constants (#789)
+
+### Removed
+
+- Datadog::HTTPTransport and related components (#782)
+
 ## [0.25.1] - 2019-07-16
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.25.1
@@ -876,8 +902,9 @@ Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.3.1
 
 Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 
-[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.25.1...master
-[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.25.1...0.26-dev
+[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.26.0...master
+[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.26.0...0.27-dev
+[0.26.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.25.1...v0.26.0
 [0.25.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.25.0...v0.25.1
 [0.25.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.24.0...v0.25.0
 [0.24.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.23.3...v0.24.0

data/docs/GettingStarted.md

@@ -240,7 +240,7 @@ get '/posts' do
 end
 ```
 
-**Asynchronous tracing**
+### Asynchronous tracing
 
 It might not always be possible to wrap `Datadog.tracer.trace` around a block of code. Some event or notification based instrumentation might only notify you when an event begins or ends.
 
@@ -279,7 +279,7 @@ def finish(name, id, payload)
   end
 end
 ```
-##### Enriching traces from nested methods
+### Enriching traces from nested methods
 
 You can tag additional information to the current active span from any method. Note however that if the method is called and there is no span currently active `active_span` will be nil.
 
@@ -344,7 +344,7 @@ For a list of available integrations, and their configuration options, please re
 | Sinatra                  | `sinatra`                  | `>= 1.4.5`               | *[Link](#sinatra)*                  | *[Link](https://github.com/sinatra/sinatra)*                                   |
 | Sucker Punch             | `sucker_punch`             | `>= 2.0`                 | *[Link](#sucker-punch)*             | *[Link](https://github.com/brandonhilkert/sucker_punch)*                       |
 
-#### Active Model Serializers
+### Active Model Serializers
 
 The Active Model Serializers integration traces the `serialize` event for version 0.9+ and the `render` event for version 0.10+.
 
@@ -366,7 +366,7 @@ ActiveModelSerializers::SerializableResource.new(test_obj).serializable_hash
 | `service_name` | Service name used for `active_model_serializers` instrumentation. | `'active_model_serializers'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### Active Record
+### Active Record
 
 Most of the time, Active Record is set up as part of a web framework (Rails, Sinatra...) however, it can be set up alone:
 
@@ -434,7 +434,7 @@ end
 
 If ActiveRecord traces an event that uses a connection that matches a key defined by `describes`, it will use the trace settings assigned to that connection. If the connection does not match any of the described connections, it will use default settings defined by `c.use :active_record` instead.
 
-#### AWS
+### AWS
 
 The AWS integration will trace every interaction (e.g. API calls) with AWS services (S3, ElastiCache etc.).
 
@@ -458,7 +458,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for `aws` instrumentation | `'aws'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### Concurrent Ruby
+### Concurrent Ruby
 
 The Concurrent Ruby integration adds support for context propagation when using `::Concurrent::Future`.
 Making sure that code traced within the `Future#execute` will have correct parent set.
@@ -485,7 +485,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for `concurrent-ruby` instrumentation | `'concurrent-ruby'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### Dalli
+### Dalli
 
 Dalli integration will trace all calls to your `memcached` server:
 
@@ -511,7 +511,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for `dalli` instrumentation | `'memcached'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### DelayedJob
+### DelayedJob
 
 The DelayedJob integration uses lifecycle hooks to trace the job executions.
 
@@ -533,7 +533,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for `DelayedJob` instrumentation | `'delayed_job'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### Elastic Search
+### Elastic Search
 
 The Elasticsearch integration will trace any call to `perform_request` in the `Client` object:
 
@@ -559,7 +559,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for `elasticsearch` instrumentation | `'elasticsearch'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### Excon
+### Excon
 
 The `excon` integration is available through the `ddtrace` middleware:
 
@@ -612,7 +612,7 @@ Excon.new(
 
 Where `options` is a Hash that contains any of the parameters listed in the table above.
 
-#### Faraday
+### Faraday
 
 The `faraday` integration is available through the `ddtrace` middleware:
 
@@ -645,7 +645,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `split_by_domain` | Uses the request domain as the service name when set to `true`. | `false` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually, you don't need to set this. | `Datadog.tracer` |
 
-#### Grape
+### Grape
 
 The Grape integration adds the instrumentation to Grape endpoints and filters. This integration can work side by side with other integrations like Rack and Rails.
 
@@ -678,7 +678,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for `grape` instrumentation | `'grape'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### GraphQL
+### GraphQL
 
 The GraphQL integration activates instrumentation for GraphQL queries.
 
@@ -729,7 +729,7 @@ end
 
 Do *NOT* `use :graphql` in `Datadog.configure` if you choose to configure manually, as to avoid double tracing. These two means of configuring GraphQL tracing are considered mutually exclusive.
 
-#### gRPC
+### gRPC
 
 The `grpc` integration adds both client and server interceptors, which run as middleware before executing the service's remote procedure call. As gRPC applications are often distributed, the integration shares trace information between client and server.
 
@@ -780,7 +780,7 @@ alternate_client = Demo::Echo::Service.rpc_stub_class.new(
 
 The integration will ensure that the `configured_interceptor` establishes a unique tracing setup for that client instance.
 
-#### MongoDB
+### MongoDB
 
 The integration traces any `Command` that is sent from the [MongoDB Ruby Driver](https://github.com/mongodb/mongo-ruby-driver) to a MongoDB cluster. By extension, Object Document Mappers (ODM) such as Mongoid are automatically instrumented if they use the official Ruby driver. To activate the integration, simply:
 
@@ -810,7 +810,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for `mongo` instrumentation | `'mongodb'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### MySQL2
+### MySQL2
 
 The MySQL2 integration traces any SQL command sent through `mysql2` gem.
 
@@ -834,7 +834,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for `mysql2` instrumentation | `'mysql2'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### Net/HTTP
+### Net/HTTP
 
 The Net/HTTP integration will trace any HTTP call using the standard lib Net::HTTP module.
 
@@ -870,7 +870,7 @@ client = Net::HTTP.new(host, port)
 Datadog.configure(client, options)
 ```
 
-#### Racecar
+### Racecar
 
 The Racecar integration provides tracing for Racecar jobs.
 
@@ -892,7 +892,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for `racecar` instrumentation | `'racecar'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### Rack
+### Rack
 
 The Rack integration provides a middleware that traces all requests before they reach the underlying framework or application. It responds to the Rack minimal interface, providing reasonable values that can be retrieved at the Rack level.
 
@@ -965,7 +965,7 @@ Datadog.configure do |c|
 end
 ```
 
-#### Rails
+### Rails
 
 The Rails integration will trace requests, database calls, templates rendering, and cache read/write/delete operations. The integration makes use of the Active Support Instrumentation, listening to the Notification API so that any operation instrumented by the API is traced.
 
@@ -1005,7 +1005,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 |  2.2 - 2.3    |  3.0 - 5.2               |
 |  2.4 - 2.5    |  4.2.8 - 5.2             |
 
-#### Rake
+### Rake
 
 You can add instrumentation around your Rake tasks by activating the `rake` integration. Each task and its subsequent subtasks will be traced.
 
@@ -1071,7 +1071,7 @@ Datadog.configure do |c|
 end
 ```
 
-#### Redis
+### Redis
 
 The Redis integration will trace simple calls as well as pipelines.
 
@@ -1111,7 +1111,7 @@ customer_cache.get(...)
 invoice_cache.get(...)
 ```
 
-#### Resque
+### Resque
 
 The Resque integration uses Resque hooks that wraps the `perform` method.
 
@@ -1140,7 +1140,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually, you don't need to set this. | `Datadog.tracer` |
 | `workers` | An array including all worker classes you want to trace (e.g. `[MyJob]`) | `[]` |
 
-#### Rest Client
+### Rest Client
 
 The `rest-client` integration is available through the `ddtrace` middleware:
 
@@ -1162,7 +1162,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name for `rest_client` instrumentation. | `'rest_client'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### Sequel
+### Sequel
 
 The Sequel integration traces queries made to your database.
 
@@ -1211,7 +1211,7 @@ Datadog.configure(sqlite_database, service_name: 'my-sqlite-db')
 Datadog.configure(postgres_database, service_name: 'my-postgres-db')
 ```
 
-#### Shoryuken
+### Shoryuken
 
 The Shoryuken integration is a server-side middleware which will trace job executions.
 
@@ -1233,7 +1233,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for `shoryuken` instrumentation | `'shoryuken'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### Sidekiq
+### Sidekiq
 
 The Sidekiq integration is a client-side & server-side middleware which will trace job queuing and executions respectively.
 
@@ -1256,7 +1256,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for server-side `sidekiq` instrumentation | `'sidekiq'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### Sinatra
+### Sinatra
 
 The Sinatra integration traces requests and template rendering.
 
@@ -1286,7 +1286,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | `service_name` | Service name used for `sinatra` instrumentation | `'sinatra'` |
 | `tracer` | `Datadog::Tracer` used to perform instrumentation. Usually you don't need to set this. | `Datadog.tracer` |
 
-#### Sucker Punch
+### Sucker Punch
 
 The `sucker_punch` integration traces all scheduled jobs:
 
@@ -1516,7 +1516,7 @@ Service C:
 
 **Activating distributed tracing for integrations**
 
-Many integrations included in `ddtrace` support distributed tracing. Distributed tracing is disabled by default, but can be activated via configuration settings.
+Many integrations included in `ddtrace` support distributed tracing. Distributed tracing is enabled by default, but can be activated via configuration settings.
 
 - If your application receives requests from services with distributed tracing activated, you must activate distributed tracing on the integrations that handle these requests (e.g. Rails)
 - If your application send requests to services with distributed tracing activated, you must activate distributed tracing on the integrations that send these requests (e.g. Faraday)

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

@@ -1,4 +1,3 @@
-
 module Datadog
   module Contrib
     module HTTP
@@ -27,9 +26,6 @@ module Datadog
 
           # Get settings from transport, if available.
           case transport
-          when Datadog::HTTPTransport
-            transport_hostname = transport.hostname.to_s
-            transport_port = transport.port.to_i
           when Datadog::Transport::HTTP::Client
             adapter = transport.current_api.adapter
             if adapter.is_a?(Datadog::Transport::HTTP::Adapters::Net)

data/lib/ddtrace/ext/metrics.rb

@@ -1,6 +1,11 @@
 module Datadog
   module Ext
     module Metrics
+      DEFAULT_HOST = '127.0.0.1'.freeze
+      DEFAULT_PORT = 8125
+      ENV_DEFAULT_HOST = 'DD_AGENT_HOST'.freeze
+      ENV_DEFAULT_PORT = 'DD_METRIC_AGENT_PORT'.freeze
+
       TAG_LANG = 'language'.freeze
       TAG_LANG_INTERPRETER = 'language-interpreter'.freeze
       TAG_LANG_VERSION = 'language-version'.freeze

data/lib/ddtrace/ext/transport.rb

@@ -0,0 +1,17 @@
+module Datadog
+  module Ext
+    module Transport
+      module HTTP
+        DEFAULT_HOST = '127.0.0.1'.freeze
+        DEFAULT_PORT = 8126
+        ENV_DEFAULT_HOST = 'DD_AGENT_HOST'.freeze
+        ENV_DEFAULT_PORT = 'DD_TRACE_AGENT_PORT'.freeze
+        HEADER_CONTAINER_ID = 'Datadog-Container-ID'.freeze
+        HEADER_META_LANG = 'Datadog-Meta-Lang'.freeze
+        HEADER_META_LANG_VERSION = 'Datadog-Meta-Lang-Version'.freeze
+        HEADER_META_LANG_INTERPRETER = 'Datadog-Meta-Lang-Interpreter'.freeze
+        HEADER_META_TRACER_VERSION = 'Datadog-Meta-Tracer-Version'.freeze
+      end
+    end
+  end
+end

data/lib/ddtrace/metrics.rb

@@ -8,9 +8,6 @@ module Datadog
   # Acts as client for sending metrics (via Statsd)
   # Wraps a Statsd client with default tags and additional configuration.
   class Metrics
-    DEFAULT_AGENT_HOST = '127.0.0.1'.freeze
-    DEFAULT_METRIC_AGENT_PORT = '8125'.freeze
-
     attr_reader :statsd
 
     def initialize(options = {})
@@ -19,8 +16,10 @@ module Datadog
     end
 
     def supported?
-      Gem.loaded_specs['dogstatsd-ruby'] \
-        && Gem.loaded_specs['dogstatsd-ruby'].version >= Gem::Version.new('3.3.0')
+      version = Gem.loaded_specs['dogstatsd-ruby'] \
+                  && Gem.loaded_specs['dogstatsd-ruby'].version
+
+      !version.nil? && (version >= Gem::Version.new('3.3.0'))
     end
 
     def enabled?
@@ -31,19 +30,24 @@ module Datadog
       @enabled = (enabled == true)
     end
 
+    def default_hostname
+      ENV.fetch(Datadog::Ext::Metrics::ENV_DEFAULT_HOST, Datadog::Ext::Metrics::DEFAULT_HOST)
+    end
+
+    def default_port
+      ENV.fetch(Datadog::Ext::Metrics::ENV_DEFAULT_PORT, Datadog::Ext::Metrics::DEFAULT_PORT).to_i
+    end
+
     def default_statsd_client
       require 'datadog/statsd' unless defined?(::Datadog::Statsd)
 
       # Create a StatsD client that points to the agent.
-      Datadog::Statsd.new(
-        ENV.fetch('DD_AGENT_HOST', DEFAULT_AGENT_HOST),
-        ENV.fetch('DD_METRIC_AGENT_PORT', DEFAULT_METRIC_AGENT_PORT)
-      )
+      Datadog::Statsd.new(default_hostname, default_port)
     end
 
     def configure(options = {})
       @statsd = options[:statsd] if options.key?(:statsd)
-      @enabled = options[:enabled] if options.key?(:enabled)
+      self.enabled = options[:enabled] if options.key?(:enabled)
     end
 
     def send_stats?

data/lib/ddtrace/runtime/cgroup.rb

@@ -0,0 +1,44 @@
+require 'ddtrace/ext/runtime'
+
+module Datadog
+  module Runtime
+    # For control groups
+    module Cgroup
+      LINE_REGEX = /^(\d+):([^:]*):(.+)$/
+
+      Descriptor = Struct.new(
+        :id,
+        :groups,
+        :path,
+        :controllers
+      )
+
+      module_function
+
+      def descriptors(process = 'self')
+        [].tap do |descriptors|
+          begin
+            filepath = "/proc/#{process}/cgroup"
+
+            if File.exist?(filepath)
+              File.open("/proc/#{process}/cgroup").each do |line|
+                line = line.strip
+                descriptors << parse(line) unless line.empty?
+              end
+            end
+          rescue StandardError => e
+            Datadog::Tracer.log.error("Error while parsing cgroup. Cause: #{e.message} Location: #{e.backtrace.first}")
+          end
+        end
+      end
+
+      def parse(line)
+        id, groups, path = line.scan(LINE_REGEX).first
+
+        Descriptor.new(id, groups, path).tap do |descriptor|
+          descriptor.controllers = groups.split(',') unless groups.nil?
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/runtime/container.rb

@@ -0,0 +1,73 @@
+require 'ddtrace/ext/runtime'
+require 'ddtrace/runtime/cgroup'
+
+module Datadog
+  module Runtime
+    # For container environments
+    module Container
+      UUID_PATTERN = '[0-9a-f]{8}[-_]?[0-9a-f]{4}[-_]?[0-9a-f]{4}[-_]?[0-9a-f]{4}[-_]?[0-9a-f]{12}'.freeze
+      CONTAINER_PATTERN = '[0-9a-f]{64}'.freeze
+
+      POD_REGEX = /(pod)?(#{UUID_PATTERN})(?:.slice)?$/
+      CONTAINER_REGEX = /(#{UUID_PATTERN}|#{CONTAINER_PATTERN})(?:.scope)?$/
+
+      Descriptor = Struct.new(
+        :platform,
+        :container_id,
+        :task_uid
+      )
+
+      module_function
+
+      def platform
+        descriptor.platform
+      end
+
+      def container_id
+        descriptor.container_id
+      end
+
+      def task_uid
+        descriptor.task_uid
+      end
+
+      def descriptor
+        @descriptor ||= begin
+          Descriptor.new.tap do |descriptor|
+            begin
+              Cgroup.descriptors.each do |cgroup_descriptor|
+                # Parse container data from cgroup descriptor
+                path = cgroup_descriptor.path
+                next if path.nil?
+
+                # Split path into parts
+                parts = path.split('/')
+                parts.shift # Remove leading empty part
+                next if parts.length < 2
+
+                # Read info from path
+                platform = parts[0]
+                container_id = parts[-1][CONTAINER_REGEX]
+                task_uid = parts[-2][POD_REGEX]
+
+                # If container ID wasn't found, ignore.
+                # Path might describe a non-container environment.
+                next if container_id.nil?
+
+                descriptor.platform = platform
+                descriptor.container_id = container_id
+                descriptor.task_uid = task_uid
+
+                break
+              end
+            rescue StandardError => e
+              Datadog::Tracer.log.error(
+                "Error while parsing container info. Cause: #{e.message} Location: #{e.backtrace.first}"
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/transport/http.rb

@@ -1,5 +1,8 @@
 require 'ddtrace/version'
 require 'ddtrace/ext/runtime'
+require 'ddtrace/ext/transport'
+
+require 'ddtrace/runtime/container'
 
 require 'ddtrace/transport/http/builder'
 require 'ddtrace/transport/http/api'
@@ -12,15 +15,6 @@ module Datadog
   module Transport
     # Namespace for HTTP transport components
     module HTTP
-      DEFAULT_AGENT_HOST = '127.0.0.1'.freeze
-      DEFAULT_TRACE_AGENT_PORT = 8126
-      DEFAULT_HEADERS = {
-        'Datadog-Meta-Lang'.freeze => Datadog::Ext::Runtime::LANG,
-        'Datadog-Meta-Lang-Version'.freeze => Datadog::Ext::Runtime::LANG_VERSION,
-        'Datadog-Meta-Lang-Interpreter'.freeze => Datadog::Ext::Runtime::LANG_INTERPRETER,
-        'Datadog-Meta-Tracer-Version'.freeze => Datadog::Ext::Runtime::TRACER_VERSION
-      }.freeze
-
       module_function
 
       # Builds a new Transport::HTTP::Client
@@ -32,11 +26,8 @@ module Datadog
       # Pass a block to override any settings.
       def default(options = {})
         new do |transport|
-          transport.adapter :net_http,
-                            ENV.fetch('DD_AGENT_HOST', DEFAULT_AGENT_HOST),
-                            ENV.fetch('DD_TRACE_AGENT_PORT', DEFAULT_TRACE_AGENT_PORT)
-
-          transport.headers DEFAULT_HEADERS
+          transport.adapter :net_http, default_hostname, default_port
+          transport.headers default_headers
 
           apis = API.defaults
 
@@ -68,12 +59,27 @@ module Datadog
         end
       end
 
+      def default_headers
+        {
+          Datadog::Ext::Transport::HTTP::HEADER_META_LANG => Datadog::Ext::Runtime::LANG,
+          Datadog::Ext::Transport::HTTP::HEADER_META_LANG_VERSION => Datadog::Ext::Runtime::LANG_VERSION,
+          Datadog::Ext::Transport::HTTP::HEADER_META_LANG_INTERPRETER => Datadog::Ext::Runtime::LANG_INTERPRETER,
+          Datadog::Ext::Transport::HTTP::HEADER_META_TRACER_VERSION => Datadog::Ext::Runtime::TRACER_VERSION
+        }.tap do |headers|
+          # Add container ID, if present.
+          container_id = Datadog::Runtime::Container.container_id
+          unless container_id.nil?
+            headers[Datadog::Ext::Transport::HTTP::HEADER_CONTAINER_ID] = container_id
+          end
+        end
+      end
+
       def default_hostname
-        ENV.fetch('DD_AGENT_HOST', DEFAULT_AGENT_HOST)
+        ENV.fetch(Datadog::Ext::Transport::HTTP::ENV_DEFAULT_HOST, Datadog::Ext::Transport::HTTP::DEFAULT_HOST)
       end
 
       def default_port
-        ENV.fetch('DD_TRACE_AGENT_PORT', DEFAULT_TRACE_AGENT_PORT)
+        ENV.fetch(Datadog::Ext::Transport::HTTP::ENV_DEFAULT_PORT, Datadog::Ext::Transport::HTTP::DEFAULT_PORT).to_i
       end
 
       # Add adapters to registry

data/lib/ddtrace/version.rb

@@ -1,8 +1,8 @@
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 25
-    PATCH = 1
+    MINOR = 26
+    PATCH = 0
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/lib/ddtrace/writer.rb

@@ -3,7 +3,6 @@ require 'json'
 require 'ddtrace/ext/net'
 require 'ddtrace/runtime/socket'
 
-require 'ddtrace/transport'
 require 'ddtrace/transport/http'
 require 'ddtrace/encoding'
 require 'ddtrace/workers'
@@ -79,29 +78,20 @@ module Datadog
       # Inject hostname if configured to do so
       inject_hostname!(traces) if Datadog.configuration.report_hostname
 
-      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)
-
-        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
+      # Send traces an get a response.
+      response = transport.send_traces(traces)
+
+      unless response.internal_error?
+        @traces_flushed += traces.length unless response.server_error?
 
-        # Return if server error occurred.
-        !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
 
     def send_runtime_metrics
@@ -151,26 +141,6 @@ module Datadog
       }
     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)
-
-      if api[:version] == HTTPTransport::V4
-        body = JSON.parse(response.body)
-        if body.is_a?(Hash) && body.key?('rate_by_service')
-          @priority_sampler.update(body['rate_by_service'])
-        end
-        true
-      else
-        false
-      end
-    end
-
     private
 
     def inject_hostname!(traces)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.26.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -538,6 +538,7 @@ files:
 - lib/ddtrace/ext/priority.rb
 - lib/ddtrace/ext/runtime.rb
 - lib/ddtrace/ext/sql.rb
+- lib/ddtrace/ext/transport.rb
 - lib/ddtrace/forced_tracing.rb
 - lib/ddtrace/logger.rb
 - lib/ddtrace/metrics.rb
@@ -568,7 +569,9 @@ files:
 - lib/ddtrace/provider.rb
 - lib/ddtrace/quantization/hash.rb
 - lib/ddtrace/quantization/http.rb
+- lib/ddtrace/runtime/cgroup.rb
 - lib/ddtrace/runtime/class_count.rb
+- lib/ddtrace/runtime/container.rb
 - lib/ddtrace/runtime/gc.rb
 - lib/ddtrace/runtime/identity.rb
 - lib/ddtrace/runtime/metrics.rb
@@ -578,7 +581,6 @@ files:
 - lib/ddtrace/span.rb
 - 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

data/lib/ddtrace/transport.rb

@@ -1,233 +0,0 @@
-require 'thread'
-require 'net/http'
-
-require 'ddtrace/encoding'
-require 'ddtrace/version'
-
-module Datadog
-  # Transport class that handles the spans delivery to the
-  # local trace-agent. The class wraps a Net:HTTP instance
-  # so that the Transport is thread-safe.
-  # rubocop:disable Metrics/ClassLength
-  class HTTPTransport
-    attr_accessor :hostname, :port
-    attr_reader :traces_endpoint
-
-    DEFAULT_AGENT_HOST = '127.0.0.1'.freeze
-    DEFAULT_TRACE_AGENT_PORT = '8126'.freeze
-
-    DEPRECATION_WARNING = %(
-      Datadog::HTTPTransport is deprecated as of version 0.24.0.
-      It has been replaced by Datadog::Transport:HTTP, which is the new default.
-      You can create one with `Datadog::Transport::HTTP.default`
-      Datadog::HTTPTransport will be REMOVED in version 0.25.0).freeze
-
-    # seconds before the transport timeout
-    TIMEOUT = 1
-
-    # header containing the number of traces in a payload
-    TRACE_COUNT_HEADER = 'X-Datadog-Trace-Count'.freeze
-    RUBY_INTERPRETER = RUBY_VERSION > '1.9' ? RUBY_ENGINE + '-' + RUBY_PLATFORM : 'ruby-' + RUBY_PLATFORM
-
-    API = {
-      V4 = 'v0.4'.freeze => {
-        version: V4,
-        traces_endpoint: '/v0.4/traces'.freeze,
-        encoder: Encoding::MsgpackEncoder,
-        fallback: 'v0.3'.freeze
-      }.freeze,
-      V3 = 'v0.3'.freeze => {
-        version: V3,
-        traces_endpoint: '/v0.3/traces'.freeze,
-        encoder: Encoding::MsgpackEncoder,
-        fallback: 'v0.2'.freeze
-      }.freeze,
-      V2 = 'v0.2'.freeze => {
-        version: V2,
-        traces_endpoint: '/v0.2/traces'.freeze,
-        encoder: Encoding::JSONEncoder
-      }.freeze
-    }.freeze
-
-    private_constant :API
-
-    def initialize(options = {})
-      # Log deprecation warning
-      Datadog::Tracer.log.warn(DEPRECATION_WARNING)
-
-      api_version = options.fetch(:api_version, V3)
-
-      @hostname = options[:hostname] || ENV['DD_AGENT_HOST'] || DEFAULT_AGENT_HOST
-      @port = options[:port] || ENV['DD_TRACE_AGENT_PORT'] || DEFAULT_TRACE_AGENT_PORT
-      @api = API.fetch(api_version)
-      @encoder = options[:encoder] || @api[:encoder]
-      @response_callback = options[:response_callback]
-
-      # 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'
-      @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
-      @count_success = 0
-      @count_client_error = 0
-      @count_server_error = 0
-      @count_internal_error = 0
-      @count_consecutive_errors = 0
-    end
-
-    # route the send to the right endpoint
-    def send(endpoint, data)
-      case endpoint
-      when :services
-        return nil
-      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
-
-    # send data to the trace-agent; the method is thread-safe
-    def post(url, data, count = nil)
-      begin
-        Datadog::Tracer.log.debug("Sending data from process: #{Process.pid}")
-        headers = count.nil? ? {} : { TRACE_COUNT_HEADER => count.to_s }
-        headers = headers.merge(@headers)
-        request = Net::HTTP::Post.new(url, headers)
-        request.body = data
-
-        response = Net::HTTP.start(@hostname, @port, open_timeout: TIMEOUT, read_timeout: TIMEOUT) do |http|
-          http.request(request)
-        end
-        handle_response(response)
-      rescue StandardError => e
-        log_error_once(e.message)
-        500
-      end.tap do
-        yield(response) if block_given?
-      end
-    end
-
-    # Downgrade the connection to a compatibility version of the HTTPTransport;
-    # this method should target a stable API that works whatever is the agent
-    # or the tracing client versions.
-    def downgrade!
-      @mutex.synchronize do
-        fallback_version = @api.fetch(:fallback)
-
-        @api = API.fetch(fallback_version)
-        @encoder = @api[:encoder]
-        @headers['Content-Type'] = @encoder.content_type
-      end
-    end
-
-    def informational?(code)
-      code.between?(100, 199)
-    end
-
-    def success?(code)
-      code.between?(200, 299)
-    end
-
-    def redirect?(code)
-      code.between?(300, 399)
-    end
-
-    def client_error?(code)
-      code.between?(400, 499)
-    end
-
-    def server_error?(code)
-      code.between?(500, 599)
-    end
-
-    # receiving a 404 means that we're targeting an endpoint that is not available
-    # in the trace agent. Usually this means that we've an up-to-date tracing client,
-    # while running an obsolete agent.
-    # receiving a 415 means that we're using an unsupported content-type with an existing
-    # endpoint. Usually this means that we're using a newer encoder with a previous
-    # endpoint. In both cases, we're going to downgrade the transporter encoder so that
-    # it will target a stable API.
-    def downgrade?(code)
-      return unless @api[:fallback]
-
-      code == 404 || code == 415
-    end
-
-    # handles the server response; here you can log the trace-agent response
-    # or do something more complex to recover from a possible error. This
-    # function is handled within the HTTP mutex.synchronize so it's thread-safe.
-    def handle_response(response)
-      status_code = response.code.to_i
-
-      if success?(status_code)
-        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)
-        Datadog::Tracer.log.debug("calling the endpoint but received #{status_code}; downgrading the API")
-      elsif client_error?(status_code)
-        log_error_once("Client error: #{response.message}")
-        @mutex.synchronize { @count_client_error += 1 }
-      elsif server_error?(status_code)
-        log_error_once("Server error: #{response.message}")
-      end
-
-      status_code
-    rescue StandardError => e
-      log_error_once(e.message)
-      @mutex.synchronize { @count_internal_error += 1 }
-
-      500
-    end
-
-    def stats
-      @mutex.synchronize do
-        {
-          success: @count_success,
-          client_error: @count_client_error,
-          server_error: @count_server_error,
-          internal_error: @count_internal_error
-        }
-      end
-    end
-
-    private
-
-    def log_error_once(*args)
-      if @count_consecutive_errors > 0
-        Datadog::Tracer.log.debug(*args)
-      else
-        Datadog::Tracer.log.error(*args)
-      end
-
-      @mutex.synchronize { @count_consecutive_errors += 1 }
-    end
-
-    def process_callback(action, response)
-      return unless @response_callback && @response_callback.respond_to?(:call)
-
-      @response_callback.call(action, response, @api)
-    rescue => e
-      Tracer.log.debug("Error processing callback: #{e}")
-      @mutex.synchronize { @count_internal_error += 1 }
-    end
-  end
-end