ddtrace 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a89641ee85dac608c0c2a580dfd413c47505ffa
-  data.tar.gz: 4cff7490665c4e954cb82466e0e77eacdf9bce99
+  metadata.gz: 3d35e4bd757dc77db293835d432a10cd51ad1d28
+  data.tar.gz: e1e6eb937c6be61d0fcea356ed23c2edc4f33991
 SHA512:
-  metadata.gz: 8580fbbf837c16cbbcfc4652bed1455796f4f710c47042c93f913eb5a1df9b95e7cf400f0fa15b573f9f9eb86468c37da73add7dc5cb00dfc41035f36a136772
-  data.tar.gz: e0c4b207097f1efbee93a08150c5a2ed32a9352f8a82531f2d5432396fc698726909896250b1f0e01ee3786743832cd7fa092135bbf83f98eede9d515736546c
+  metadata.gz: 17e882a034471da9d5f032c0b4f2b3e243b7a85452a51994439423a2950ead7927e2bf98d9f8922751f32b749ea8975230f34001960f153822ae9efcd12d2051
+  data.tar.gz: b5bb863b4f742be7479fe02a311c956cf41ed1f8b2eb8c8796ee2fb1a4a1f4cc093655252b9a3d43ec5597e48b96bdd8382a68ef90bb1761ad8383a83351077d

data/.circleci/config.yml

@@ -83,6 +83,21 @@ step_run_all_tests: &step_run_all_tests
   run:
     name: Run tests
     command: bundle exec rake ci
+step_release_docs: &step_release_docs
+  run:
+    name: Upload release docs
+    command: S3_DIR=trace bundle exec rake release:docs
+
+filters_all_branches_and_tags: &filters_all_branches_and_tags
+  filters:
+    tags:
+      only: /.*/
+filters_only_release_tags: &filters_only_release_tags
+  filters:
+    branches:
+      ignore: /.*/
+    tags:
+      only: /^v\d+(\.\d+){0,3}(\.(alpha|beta|rc)\d+)?$/
 
 version: 2.0
 jobs:
@@ -364,6 +379,29 @@ jobs:
           keys:
             - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.3-{{ checksum ".circleci/bundle_checksum" }}'
       - *step_run_all_tests
+  benchmark-2.3:
+    <<: *job_defaults
+    docker:
+      - <<: *container-2_3
+        environment:
+          - TEST_DATADOG_INTEGRATION: 1
+      - *container_postgres
+      - *container_redis
+      - *container_agent
+    steps:
+      - restore_cache:
+          keys:
+            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.3-{{ .Environment.CIRCLE_SHA1 }}'
+      - restore_cache:
+          keys:
+            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.3-{{ checksum ".circleci/bundle_checksum" }}'
+      - run:
+          name: Run Benchmark
+          command: bundle exec appraisal rails5-postgres-sidekiq ruby benchmarks/sidekiq_test.rb 2>&1 1> /dev/null | tee benchmark_results.csv
+      - run:
+          name: Run Benchmark without ddtracer
+          command: rm -f lib/ddtrace.rb && bundle exec appraisal rails5-postgres-sidekiq ruby benchmarks/sidekiq_test.rb 2>&1 1> /dev/null | tee benchmark_results.csv
+
   checkout-2.4:
     <<: *job_defaults
     docker:
@@ -420,49 +458,93 @@ jobs:
           keys:
             - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.4-{{ checksum ".circleci/bundle_checksum" }}'
       - *step_run_all_tests
+  deploy-release:
+    <<: *job_defaults
+    docker:
+      - *container-2_4
+    steps:
+      - checkout
+      - run:
+          command: |
+            apt-get -y -qq update
+            apt-get -y -qq install awscli
+      - *step_bundle_install
+      - *step_release_docs
+
 workflows:
   version: 2
   build-and-test:
     jobs:
-      - checkout-1.9
+      - checkout-1.9:
+          <<: *filters_all_branches_and_tags
       - build-1.9:
+          <<: *filters_all_branches_and_tags
           requires:
             - checkout-1.9
       - test-1.9:
+          <<: *filters_all_branches_and_tags
           requires:
             - build-1.9
-      - checkout-2.0
+      - checkout-2.0:
+          <<: *filters_all_branches_and_tags
       - build-2.0:
+          <<: *filters_all_branches_and_tags
           requires:
             - checkout-2.0
       - test-2.0:
+          <<: *filters_all_branches_and_tags
           requires:
             - build-2.0
-      - checkout-2.1
+      - checkout-2.1:
+          <<: *filters_all_branches_and_tags
       - build-2.1:
+          <<: *filters_all_branches_and_tags
           requires:
             - checkout-2.1
       - test-2.1:
+          <<: *filters_all_branches_and_tags
           requires:
             - build-2.1
-      - checkout-2.2
+      - checkout-2.2:
+          <<: *filters_all_branches_and_tags
       - build-2.2:
+          <<: *filters_all_branches_and_tags
           requires:
             - checkout-2.2
       - test-2.2:
+          <<: *filters_all_branches_and_tags
           requires:
             - build-2.2
-      - checkout-2.3
+      - checkout-2.3:
+          <<: *filters_all_branches_and_tags
       - build-2.3:
+          <<: *filters_all_branches_and_tags
           requires:
             - checkout-2.3
       - test-2.3:
+          <<: *filters_all_branches_and_tags
           requires:
             - build-2.3
-      - checkout-2.4
+      - benchmark-2.3:
+          <<: *filters_all_branches_and_tags
+          requires:
+            - build-2.3
+      - checkout-2.4:
+          <<: *filters_all_branches_and_tags
       - build-2.4:
+          <<: *filters_all_branches_and_tags
           requires:
             - checkout-2.4
       - test-2.4:
+          <<: *filters_all_branches_and_tags
           requires:
             - build-2.4
+      - deploy-release:
+          <<: *filters_only_release_tags
+          requires:
+            - test-1.9
+            - test-2.0
+            - test-2.1
+            - test-2.2
+            - test-2.3
+            - test-2.4

data/CHANGELOG.md

@@ -4,6 +4,24 @@
 
 ## [Unreleased (beta)]
 
+## [0.13.1] - 2018-07-17
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.13.1
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.13.0...v0.13.1
+
+### Changed
+
+ - Configuration class variables don't lazy load (#477)
+ - Default tracer host `localhost` --> `127.0.0.1` (#466, #480) (@NobodysNightmare)
+
+### Fixed
+
+ - Workers not shutting down quickly in some short running processes (#475)
+ - Missing documentation for mysql2 and Rails (#476, #488)
+ - Missing variable in rescue block (#481) (@kitop)
+ - Unclosed spans in ActiveSupport::Notifications with multithreading (#431, #478) (@senny)
+
 ## [0.13.0] - 2018-06-20
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.13.0
@@ -362,6 +380,7 @@ 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.13.0...master
 [Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.13.0...0.14-dev
+[0.13.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.13.0...v0.13.1
 [0.13.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.1...v0.13.0
 [0.13.0.beta1]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.0...v0.13.0.beta1
 [0.12.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.0...v0.12.1

data/Rakefile

@@ -223,6 +223,7 @@ task :ci do
       sh 'bundle exec appraisal contrib-old rake spec:active_record'
       sh 'bundle exec appraisal contrib-old rake spec:active_support'
       sh 'bundle exec appraisal contrib-old rake spec:dalli'
+      sh 'bundle exec appraisal contrib-old rake spec:elasticsearch'
       sh 'bundle exec appraisal contrib-old rake spec:excon'
       sh 'bundle exec appraisal contrib-old rake spec:faraday'
       sh 'bundle exec appraisal contrib-old rake spec:http'
@@ -264,6 +265,7 @@ task :ci do
       sh 'bundle exec appraisal contrib-old rake spec:active_record'
       sh 'bundle exec appraisal contrib-old rake spec:active_support'
       sh 'bundle exec appraisal contrib-old rake spec:dalli'
+      sh 'bundle exec appraisal contrib-old rake spec:elasticsearch'
       sh 'bundle exec appraisal contrib-old rake spec:excon'
       sh 'bundle exec appraisal contrib-old rake spec:faraday'
       sh 'bundle exec appraisal contrib-old rake spec:http'
@@ -308,6 +310,7 @@ task :ci do
       sh 'bundle exec appraisal contrib-old rake spec:active_record'
       sh 'bundle exec appraisal contrib-old rake spec:active_support'
       sh 'bundle exec appraisal contrib-old rake spec:dalli'
+      sh 'bundle exec appraisal contrib-old rake spec:elasticsearch'
       sh 'bundle exec appraisal contrib-old rake spec:excon'
       sh 'bundle exec appraisal contrib-old rake spec:faraday'
       sh 'bundle exec appraisal contrib-old rake spec:http'
@@ -358,6 +361,7 @@ task :ci do
       sh 'bundle exec appraisal contrib rake spec:active_record'
       sh 'bundle exec appraisal contrib rake spec:active_support'
       sh 'bundle exec appraisal contrib rake spec:dalli'
+      sh 'bundle exec appraisal contrib rake spec:elasticsearch'
       sh 'bundle exec appraisal contrib rake spec:excon'
       sh 'bundle exec appraisal contrib rake spec:faraday'
       sh 'bundle exec appraisal contrib rake spec:graphql'
@@ -420,6 +424,7 @@ task :ci do
       sh 'bundle exec appraisal contrib rake spec:active_support'
       sh 'bundle exec appraisal contrib rake spec:dalli'
       sh 'bundle exec appraisal contrib rake spec:excon'
+      sh 'bundle exec appraisal contrib rake spec:elasticsearch'
       sh 'bundle exec appraisal contrib rake spec:faraday'
       sh 'bundle exec appraisal contrib rake spec:graphql'
       sh 'bundle exec appraisal contrib rake spec:grpc'
@@ -479,6 +484,7 @@ task :ci do
       sh 'bundle exec appraisal contrib rake spec:active_record'
       sh 'bundle exec appraisal contrib rake spec:active_support'
       sh 'bundle exec appraisal contrib rake spec:dalli'
+      sh 'bundle exec appraisal contrib rake spec:elasticsearch'
       sh 'bundle exec appraisal contrib rake spec:excon'
       sh 'bundle exec appraisal contrib rake spec:faraday'
       sh 'bundle exec appraisal contrib rake spec:graphql'

data/benchmarks/postgres_database.yml

@@ -0,0 +1,9 @@
+production:
+  adapter: 'postgresql'
+  timeout: 5000
+  database: <%= ENV.fetch('TEST_POSTGRES_DB', 'postgres') %>
+  host: <%= ENV.fetch('TEST_POSTGRES_HOST', '127.0.0.1') %>
+  port: <%= ENV.fetch('TEST_POSTGRES_PORT', 5432) %>
+  username: <%= ENV.fetch('TEST_POSTGRES_USER', 'postgres') %>
+  password: <%= ENV.fetch('TEST_POSTGRES_PASSWORD', 'postgres') %>
+  pool: 30

data/benchmarks/sidekiq_test.rb

@@ -0,0 +1,154 @@
+ENV['RAILS_ENV'] = 'production'
+require 'English'
+
+# Benchmark Configuration container
+module TestConfiguration
+  module_function
+
+  def sidekiq
+    Sidekiq.options.tap do |options|
+      options[:tag] = 'test'
+      options[:queues] << 'default'
+      options[:concurrency] = 20
+      options[:timeout] = 2
+    end
+  end
+
+  def redis
+    { pool_size: 30, timeout: 3 }
+  end
+
+  def iteration_count
+    1000
+  end
+end
+
+require 'bundler/setup'
+require 'rails/all'
+Bundler.require(*Rails.groups)
+
+# Example Rails App
+module SampleApp
+  class Application < Rails::Application; end
+end
+
+# Overrides rails configueration locations
+module OverrideConfiguration
+  def paths
+    super.tap { |path| path.add 'config/database', with: 'benchmarks/postgres_database.yml' }
+  end
+end
+
+Rails::Application::Configuration.prepend(OverrideConfiguration)
+
+Rails.application.configure do
+  config.cache_classes = true
+  config.eager_load = true
+  config.active_job.queue_adapter = :sidekiq
+end
+
+ActiveRecord::Base.configurations = Rails.application.config.database_configuration
+Rails.application.initialize!
+
+ActiveRecord::Schema.define do
+  drop_table(:samples) if connection.table_exists?(:samples)
+
+  create_table :samples do |t|
+    t.string :name
+    t.timestamps
+  end
+end
+
+class Sample < ActiveRecord::Base; end
+
+require 'sidekiq/launcher'
+require 'sidekiq/cli'
+require 'concurrent/atomic/atomic_fixnum'
+
+Sidekiq.configure_server do |config|
+  redis_conn = proc do
+    Redis.new(
+      host: ENV.fetch('TEST_REDIS_HOST', '127.0.0.1'),
+      port: ENV.fetch('TEST_REDIS_PORT', 6379)
+    )
+  end
+  config.redis = ConnectionPool.new(size: TestConfiguration.redis[:pool_size],
+                                    timeout: TestConfiguration.redis[:timeout],
+                                    &redis_conn)
+end
+
+# Simple Sidekiq worker performing the real benchmark
+class Worker
+  class << self
+    attr_reader :iterations, :conditional_variable
+  end
+
+  @iterations = Concurrent::AtomicFixnum.new(0)
+  @conditional_variable = ConditionVariable.new
+
+  include Sidekiq::Worker
+  def perform(iter, max_iterations)
+    self.class.iterations.increment
+    self.class.conditional_variable.broadcast if self.class.iterations.value > max_iterations
+
+    Sample.create!(name: iter.to_s).save
+
+    100.times do
+      Sample.last.name
+    end
+
+    Sample.last(100).to_a
+  end
+end
+
+if Datadog.respond_to?(:configure)
+  Datadog.configure do |d|
+    d.use :rails, enabled: true, tags: { 'tag' => 'value' }
+    d.use :http
+    d.use :sidekiq, service_name: 'service'
+    d.use :redis
+    d.use :dalli
+    d.use :resque, workers: [Worker]
+
+    processor = Datadog::Pipeline::SpanProcessor.new do |span|
+      true if span.service == 'B'
+    end
+
+    Datadog::Pipeline.before_flush(processor)
+  end
+end
+
+def current_memory
+  `ps -o rss #{$PROCESS_ID}`.split("\n")[1].to_f / 1024
+end
+
+def time
+  Process.clock_gettime(Process::CLOCK_MONOTONIC)
+end
+
+def launch(iterations, options)
+  iterations.times do |i|
+    Worker.perform_async(i, iterations)
+  end
+
+  launcher = Sidekiq::Launcher.new(options)
+  launcher.run
+end
+
+def wait_and_measure(iterations)
+  start = time
+
+  STDERR.puts "#{time - start}, #{current_memory}"
+
+  mutex = Mutex.new
+
+  while Worker.iterations.value < iterations
+    mutex.synchronize do
+      Worker.conditional_variable.wait(mutex, 1)
+      STDERR.puts "#{time - start}, #{current_memory}"
+    end
+  end
+end
+
+launch(TestConfiguration.iteration_count, TestConfiguration.sidekiq)
+wait_and_measure(TestConfiguration.iteration_count)

data/ddtrace.gemspec

@@ -43,6 +43,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'webmock', '~> 2.0'
   spec.add_development_dependency 'builder'
+  spec.add_development_dependency 'ruby-prof'
+  spec.add_development_dependency 'sqlite3'
+
   # locking transitive dependency of webmock
   spec.add_development_dependency 'addressable', '~> 2.4.0'
   spec.add_development_dependency 'redcarpet', '~> 3.4' if RUBY_PLATFORM != 'java'

data/docs/GettingStarted.md

@@ -33,6 +33,7 @@ For descriptions of terminology used in APM, take a look at the [official docume
      - [Grape](#grape)
      - [GraphQL](#graphql)
      - [MongoDB](#mongodb)
+     - [MySQL2](#mysql2)
      - [Net/HTTP](#nethttp)
      - [Racecar](#racecar)
      - [Rack](#rack)
@@ -96,7 +97,7 @@ The Ruby APM tracer sends trace data through the Datadog Agent.
 ### Quickstart for Rails applications
 
 1. Add the `ddtrace` gem to your Gemfile:
-    
+
     ```ruby
     source 'https://rubygems.org'
     gem 'ddtrace'
@@ -228,11 +229,11 @@ end
 ```
 #####Enriching traces from nested methods
 
-You can tag additional information to 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. 
+You can tag additional information to 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.
 
 ```ruby
 # e.g. adding tag to active span
-    
+
 current_span = Datadog.tracer.active_span
 current_span.set_tag('my_tag', 'my_value') unless current_span.nil?
 ```
@@ -264,6 +265,7 @@ For a list of available integrations, and their configuration options, please re
 | Grape          | `grape`         | `>= 1.0`               | *[Link](#grape)*          | *[Link](https://github.com/ruby-grape/grape)*                                  |
 | GraphQL        | `graphql`       | `>= 1.7.9`             | *[Link](#graphql)*        | *[Link](https://github.com/rmosolgo/graphql-ruby)*                             |
 | MongoDB        | `mongo`         | `>= 2.0, < 2.5`        | *[Link](#mongodb)*        | *[Link](https://github.com/mongodb/mongo-ruby-driver)*                         |
+| MySQL2         | `mysql2`        | `>= 0.5`               | *[Link](#mysql2)*         | *[Link](https://github.com/brianmario/mysql2)*                                 |
 | Net/HTTP       | `http`          | *(Any supported Ruby)* | *[Link](#nethttp)*        | *[Link](https://ruby-doc.org/stdlib-2.4.0/libdoc/net/http/rdoc/Net/HTTP.html)* |
 | Racecar        | `racecar`       | `>= 0.3.5`             | *[Link](#racecar)*        | *[Link](https://github.com/zendesk/racecar)*                                   |
 | Rack           | `rack`          | `>= 1.4.7`             | *[Link](#rack)*           | *[Link](https://github.com/rack/rack)*                                         |
@@ -455,7 +457,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 
 ### gRPC
 
-The `grpc` integration adds both client and server interceptors, which run as middleware prior to executing the service's remote procedure call. As gRPC applications are often distributed, the integration shares trace information between client and server. 
+The `grpc` integration adds both client and server interceptors, which run as middleware prior to executing the service's remote procedure call. As gRPC applications are often distributed, the integration shares trace information between client and server.
 
 To setup your integration, use the ``Datadog.configure`` method like so:
 
@@ -613,6 +615,29 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | ``service_name`` | Service name used for `mongo` instrumentation | mongodb |
 | ``quantize`` | Hash containing options for quantization. May include `:show` with an Array of keys to not quantize (or `:all` to skip quantization), or `:exclude` with Array of keys to exclude entirely. | ```{ show: [:collection, :database, :operation]  }``` |
 
+### MySQL2
+
+The MySQL2 integration traces any SQL command sent through `mysql2` gem.
+
+```ruby
+require 'mysql2'
+require 'ddtrace'
+
+Datadog.configure do |c|
+  c.use :mysql2, options
+end
+
+client = Mysql2::Client.new(:host => "localhost", :username => "root")
+client.query("SELECT * FROM users WHERE group='x'")
+```
+
+Where `options` is an optional `Hash` that accepts the following parameters:
+
+| Key | Description | Default |
+| --- | --- | --- |
+| ``service_name`` | Service name used for MySQL2 instrumentation | `mysql2` |
+| ``tracer`` | A ``Datadog::Tracer`` instance used to instrument the application. Usually you don't need to set that. | ``Datadog.tracer`` |
+
 ### Net/HTTP
 
 The Net/HTTP integration will trace any HTTP call using the standard lib Net::HTTP module.
@@ -759,7 +784,7 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | Key | Description | Default |
 | --- | --- | --- |
 | ``service_name`` | Service name used when tracing application requests (on the `rack` level) | ``<app_name>`` (inferred from your Rails application namespace) |
-| ``controller_service`` | Service name used when tracing a Rails action controller | ``<app_name>-controller`` |
+| ``controller_service`` | Service name used when tracing a Rails action controller | ``<app_name>`` |
 | ``cache_service`` | Cache service name used when tracing cache activity | ``<app_name>-cache`` |
 | ``database_service`` | Database service name used when tracing database activity | ``<app_name>-<adapter_name>`` |
 | ``exception_controller`` | Class or Module which identifies a custom exception controller class. Tracer provides improved error behavior when it can identify custom exception controllers. By default, without this option, it 'guesses' what a custom exception controller looks like. Providing this option aids this identification. | ``nil`` |

data/lib/ddtrace.rb

@@ -14,6 +14,7 @@ require 'ddtrace/patcher'
 module Datadog
   @tracer = Tracer.new
   @registry = Registry.new
+  @configuration = Configuration.new(registry: @registry)
 
   # Default tracer that can be used as soon as +ddtrace+ is required:
   #
@@ -28,21 +29,9 @@ module Datadog
   #   tracer = Datadog::Tracer.new
   #   pin = Datadog::Pin.get_from(mypatchcomponent)
   #   pin.tracer = tracer
-
-  def self.tracer
-    @tracer
-  end
-
-  def self.registry
-    @registry
-  end
-
   class << self
-    attr_writer :configuration
-
-    def configuration
-      @configuration ||= Configuration.new
-    end
+    attr_reader :tracer, :registry
+    attr_accessor :configuration
 
     def configure(target = configuration, opts = {})
       if target.is_a?(Configuration)

data/lib/ddtrace/configuration.rb

@@ -8,7 +8,7 @@ module Datadog
     InvalidIntegrationError = Class.new(StandardError)
 
     def initialize(options = {})
-      @registry = options.fetch(:registry, Datadog.registry)
+      @registry = options.fetch(:registry) { Datadog.registry }
       @wrapped_registry = {}
     end
 

data/lib/ddtrace/contrib/active_support/notifications/subscription.rb

@@ -75,11 +75,12 @@ module Datadog
             tracer.trace(@span_name, @options).tap do |span|
               # Assign start time if provided
               span.start_time = start unless start.nil?
+              payload[:datadog_span] = span
             end
           end
 
           def finish_span(name, id, payload, finish = nil)
-            tracer.active_span.tap do |span|
+            payload[:datadog_span].tap do |span|
               # If no active span, return.
               return nil if span.nil?
 

data/lib/ddtrace/version.rb

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

data/lib/ddtrace/workers.rb

@@ -43,7 +43,7 @@ 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 #{items.length} items. Cause: #{e}")
+          Datadog::Tracer.log.error("Error during traces flush: dropped #{traces.length} items. Cause: #{e}")
         end
       end
 
@@ -58,7 +58,7 @@ 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 services flush: dropped #{items.length} items. Cause: #{e}")
+          Datadog::Tracer.log.error("Error during services flush: dropped #{services.length} items. Cause: #{e}")
         end
       end
 
@@ -106,15 +106,17 @@ module Datadog
 
       private
 
+      alias flush_data callback_traces
+
       def perform
         loop do
-          @back_off = callback_traces ? @flush_interval : [@back_off * BACK_OFF_RATIO, BACK_OFF_MAX].min
+          @back_off = flush_data ? @flush_interval : [@back_off * BACK_OFF_RATIO, BACK_OFF_MAX].min
 
           callback_services
 
           @mutex.synchronize do
             return if !@run && @trace_buffer.empty? && @service_buffer.empty?
-            @shutdown.wait(@mutex, @back_off)
+            @shutdown.wait(@mutex, @back_off) if @run # do not wait when shutting down
           end
         end
       end

data/lib/ddtrace/writer.rb

@@ -7,7 +7,7 @@ module Datadog
   class Writer
     attr_reader :transport, :worker, :priority_sampler
 
-    HOSTNAME = 'localhost'.freeze
+    HOSTNAME = '127.0.0.1'.freeze
     PORT = '8126'.freeze
 
     def initialize(options = {})
@@ -15,7 +15,6 @@ module Datadog
       @buff_size = options.fetch(:buffer_size, 100)
       @flush_interval = options.fetch(:flush_interval, 1)
       transport_options = options.fetch(:transport_options, {})
-
       # priority sampling
       if options[:priority_sampler]
         @priority_sampler = options[:priority_sampler]
@@ -95,10 +94,10 @@ module Datadog
       # This check ensures that if a process doesn't own the current +Writer+, async workers
       # will be initialized again (but only once for each process).
       pid = Process.pid
-      @mutex_after_fork.synchronize do
-        if pid != @pid
+      if pid != @pid # avoid using Mutex when pids are equal
+        @mutex_after_fork.synchronize do
           # we should start threads because the worker doesn't own this
-          start()
+          start if pid != @pid
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -150,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +263,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- benchmarks/postgres_database.yml
+- benchmarks/sidekiq_test.rb
 - ddtrace.gemspec
 - docker-compose.yml
 - docs/GettingStarted.md