ddtrace 0.13.0 → 0.47.0

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

@@ -7,7 +7,8 @@ require 'ddtrace/version'
 Gem::Specification.new do |spec|
   spec.name                  = 'ddtrace'
   spec.version               = Datadog::VERSION::STRING
-  spec.required_ruby_version = '>= 1.9.1'
+  spec.required_ruby_version = ">= #{Datadog::VERSION::MINIMUM_RUBY_VERSION}"
+  spec.required_rubygems_version = '>= 2.0.0'
   spec.authors               = ['Datadog, Inc.']
   spec.email                 = ['dev@datadoghq.com']
 
@@ -32,20 +33,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'msgpack'
-
-  spec.add_development_dependency 'rake', '>= 10.5'
-  spec.add_development_dependency 'rubocop', '= 0.49.1' if RUBY_VERSION >= '2.1.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rspec-collection_matchers', '~> 1.1'
-  spec.add_development_dependency 'minitest', '= 5.10.1'
-  spec.add_development_dependency 'appraisal', '~> 2.2'
-  spec.add_development_dependency 'yard', '~> 0.9'
-  spec.add_development_dependency 'webmock', '~> 2.0'
-  spec.add_development_dependency 'builder'
-  # locking transitive dependency of webmock
-  spec.add_development_dependency 'addressable', '~> 2.4.0'
-  spec.add_development_dependency 'redcarpet', '~> 3.4' if RUBY_PLATFORM != 'java'
-  spec.add_development_dependency 'pry', '~> 0.10.4'
-  spec.add_development_dependency 'pry-stack_explorer', '~> 0.4.9.2'
+  if RUBY_VERSION >= '2.2.0'
+    spec.add_dependency 'msgpack'
+  else
+    # msgpack 1.4 fails for Ruby 2.0 and 2.1: https://github.com/msgpack/msgpack-ruby/issues/205
+    spec.add_dependency 'msgpack', '< 1.4'
+  end
 end

data/docker-compose.yml

@@ -1,9 +1,8 @@
 version: '3.2'
 services:
-  tracer-1.9:
-    build:
-      context: ./.circleci/images/primary
-      dockerfile: Dockerfile-1.9.3
+  # MRI
+  tracer-2.0:
+    image: palazzem/docker-library:ddtrace_rb_2_0_0
     command: /bin/bash
     depends_on:
       - ddagent
@@ -12,28 +11,28 @@ services:
       - mongodb
       - mysql
       - postgres
+      - presto
       - redis
     env_file: ./.env
     environment:
       - BUNDLE_GEMFILE=/app/Gemfile
+      - DD_AGENT_HOST=ddagent
       - TEST_DATADOG_INTEGRATION=1
-      - TEST_DDAGENT_HOST=ddagent
       - TEST_ELASTICSEARCH_HOST=elasticsearch
       - TEST_MEMCACHED_HOST=memcached
       - TEST_MONGODB_HOST=mongodb
       - TEST_MYSQL_HOST=mysql
       - TEST_POSTGRES_HOST=postgres
+      - TEST_PRESTO_HOST=presto
       - TEST_REDIS_HOST=redis
     stdin_open: true
     tty: true
     volumes:
       - .:/app
-      - bundle-1.9:/usr/local/bundle
-      - gemfiles-1.9:/app/gemfiles
-  tracer-2.0:
-    build:
-      context: ./.circleci/images/primary
-      dockerfile: Dockerfile-2.0.0
+      - bundle-2.0:/usr/local/bundle
+      - gemfiles-2.0:/app/gemfiles
+  tracer-2.1:
+    image: palazzem/docker-library:ddtrace_rb_2_1_10
     command: /bin/bash
     depends_on:
       - ddagent
@@ -42,28 +41,29 @@ services:
       - mongodb
       - mysql
       - postgres
+      - presto
       - redis
     env_file: ./.env
     environment:
       - BUNDLE_GEMFILE=/app/Gemfile
+      - DD_AGENT_HOST=ddagent
       - TEST_DATADOG_INTEGRATION=1
-      - TEST_DDAGENT_HOST=ddagent
       - TEST_ELASTICSEARCH_HOST=elasticsearch
       - TEST_MEMCACHED_HOST=memcached
       - TEST_MONGODB_HOST=mongodb
       - TEST_MYSQL_HOST=mysql
       - TEST_POSTGRES_HOST=postgres
+      - TEST_PRESTO_HOST=presto
+      - TEST_PRESTO_PORT=8080
       - TEST_REDIS_HOST=redis
     stdin_open: true
     tty: true
     volumes:
       - .:/app
-      - bundle-2.0:/usr/local/bundle
-      - gemfiles-2.0:/app/gemfiles
-  tracer-2.1:
-    build:
-      context: ./.circleci/images/primary
-      dockerfile: Dockerfile-2.1.10
+      - bundle-2.1:/usr/local/bundle
+      - gemfiles-2.1:/app/gemfiles
+  tracer-2.2:
+    image: palazzem/docker-library:ddtrace_rb_2_2_10
     command: /bin/bash
     depends_on:
       - ddagent
@@ -72,28 +72,29 @@ services:
       - mongodb
       - mysql
       - postgres
+      - presto
       - redis
     env_file: ./.env
     environment:
       - BUNDLE_GEMFILE=/app/Gemfile
+      - DD_AGENT_HOST=ddagent
       - TEST_DATADOG_INTEGRATION=1
-      - TEST_DDAGENT_HOST=ddagent
       - TEST_ELASTICSEARCH_HOST=elasticsearch
       - TEST_MEMCACHED_HOST=memcached
       - TEST_MONGODB_HOST=mongodb
       - TEST_MYSQL_HOST=mysql
       - TEST_POSTGRES_HOST=postgres
+      - TEST_PRESTO_HOST=presto
+      - TEST_PRESTO_PORT=8080
       - TEST_REDIS_HOST=redis
     stdin_open: true
     tty: true
     volumes:
       - .:/app
-      - bundle-2.1:/usr/local/bundle
-      - gemfiles-2.1:/app/gemfiles
-  tracer-2.2:
-    build:
-      context: ./.circleci/images/primary
-      dockerfile: Dockerfile-2.2.10
+      - bundle-2.2:/usr/local/bundle
+      - gemfiles-2.2:/app/gemfiles
+  tracer-2.3:
+    image: palazzem/docker-library:ddtrace_rb_2_3_8
     command: /bin/bash
     depends_on:
       - ddagent
@@ -102,28 +103,29 @@ services:
       - mongodb
       - mysql
       - postgres
+      - presto
       - redis
     env_file: ./.env
     environment:
       - BUNDLE_GEMFILE=/app/Gemfile
+      - DD_AGENT_HOST=ddagent
       - TEST_DATADOG_INTEGRATION=1
-      - TEST_DDAGENT_HOST=ddagent
       - TEST_ELASTICSEARCH_HOST=elasticsearch
       - TEST_MEMCACHED_HOST=memcached
       - TEST_MONGODB_HOST=mongodb
       - TEST_MYSQL_HOST=mysql
       - TEST_POSTGRES_HOST=postgres
+      - TEST_PRESTO_HOST=presto
+      - TEST_PRESTO_PORT=8080
       - TEST_REDIS_HOST=redis
     stdin_open: true
     tty: true
     volumes:
       - .:/app
-      - bundle-2.2:/usr/local/bundle
-      - gemfiles-2.2:/app/gemfiles
-  tracer-2.3:
-    build:
-      context: ./.circleci/images/primary
-      dockerfile: Dockerfile-2.3.7
+      - bundle-2.3:/usr/local/bundle
+      - gemfiles-2.3:/app/gemfiles
+  tracer-2.4:
+    image: palazzem/docker-library:ddtrace_rb_2_4_6
     command: /bin/bash
     depends_on:
       - ddagent
@@ -132,28 +134,29 @@ services:
       - mongodb
       - mysql
       - postgres
+      - presto
       - redis
     env_file: ./.env
     environment:
       - BUNDLE_GEMFILE=/app/Gemfile
+      - DD_AGENT_HOST=ddagent
       - TEST_DATADOG_INTEGRATION=1
-      - TEST_DDAGENT_HOST=ddagent
       - TEST_ELASTICSEARCH_HOST=elasticsearch
       - TEST_MEMCACHED_HOST=memcached
       - TEST_MONGODB_HOST=mongodb
       - TEST_MYSQL_HOST=mysql
       - TEST_POSTGRES_HOST=postgres
+      - TEST_PRESTO_HOST=presto
+      - TEST_PRESTO_PORT=8080
       - TEST_REDIS_HOST=redis
     stdin_open: true
     tty: true
     volumes:
       - .:/app
-      - bundle-2.3:/usr/local/bundle
-      - gemfiles-2.3:/app/gemfiles
-  tracer-2.4:
-    build:
-      context: ./.circleci/images/primary
-      dockerfile: Dockerfile-2.4.4
+      - bundle-2.4:/usr/local/bundle
+      - gemfiles-2.4:/app/gemfiles
+  tracer-2.5:
+    image: marcotc/docker-library:ddtrace_rb_2_5_6
     command: /bin/bash
     depends_on:
       - ddagent
@@ -162,34 +165,224 @@ services:
       - mongodb
       - mysql
       - postgres
+      - presto
       - redis
     env_file: ./.env
     environment:
       - BUNDLE_GEMFILE=/app/Gemfile
+      - DD_AGENT_HOST=ddagent
       - TEST_DATADOG_INTEGRATION=1
-      - TEST_DDAGENT_HOST=ddagent
       - TEST_ELASTICSEARCH_HOST=elasticsearch
       - TEST_MEMCACHED_HOST=memcached
       - TEST_MONGODB_HOST=mongodb
       - TEST_MYSQL_HOST=mysql
       - TEST_POSTGRES_HOST=postgres
+      - TEST_PRESTO_HOST=presto
+      - TEST_PRESTO_PORT=8080
       - TEST_REDIS_HOST=redis
     stdin_open: true
     tty: true
     volumes:
       - .:/app
-      - bundle-2.4:/usr/local/bundle
-      - gemfiles-2.4:/app/gemfiles
+      - bundle-2.5:/usr/local/bundle
+      - gemfiles-2.5:/app/gemfiles
+  tracer-2.6:
+    image: marcotc/docker-library:ddtrace_rb_2_6_4
+    command: /bin/bash
+    depends_on:
+      - ddagent
+      - elasticsearch
+      - memcached
+      - mongodb
+      - mysql
+      - postgres
+      - presto
+      - redis
+    env_file: ./.env
+    environment:
+      - BUNDLE_GEMFILE=/app/Gemfile
+      - DD_AGENT_HOST=ddagent
+      - TEST_DATADOG_INTEGRATION=1
+      - TEST_ELASTICSEARCH_HOST=elasticsearch
+      - TEST_MEMCACHED_HOST=memcached
+      - TEST_MONGODB_HOST=mongodb
+      - TEST_MYSQL_HOST=mysql
+      - TEST_POSTGRES_HOST=postgres
+      - TEST_PRESTO_HOST=presto
+      - TEST_PRESTO_PORT=8080
+      - TEST_REDIS_HOST=redis
+    stdin_open: true
+    tty: true
+    volumes:
+      - .:/app
+      - bundle-2.6:/usr/local/bundle
+      - gemfiles-2.6:/app/gemfiles
+  tracer-2.7:
+    image: marcotc/docker-library:ddtrace_rb_2_7_0
+    command: /bin/bash
+    depends_on:
+      - ddagent
+      - elasticsearch
+      - memcached
+      - mongodb
+      - mysql
+      - postgres
+      - presto
+      - redis
+    env_file: ./.env
+    environment:
+      - BUNDLE_GEMFILE=/app/Gemfile
+      - DD_AGENT_HOST=ddagent
+      - TEST_DATADOG_INTEGRATION=1
+      - TEST_ELASTICSEARCH_HOST=elasticsearch
+      - TEST_MEMCACHED_HOST=memcached
+      - TEST_MONGODB_HOST=mongodb
+      - TEST_MYSQL_HOST=mysql
+      - TEST_POSTGRES_HOST=postgres
+      - TEST_PRESTO_HOST=presto
+      - TEST_PRESTO_PORT=8080
+      - TEST_REDIS_HOST=redis
+    stdin_open: true
+    tty: true
+    volumes:
+      - .:/app
+      - bundle-2.7:/usr/local/bundle
+      - gemfiles-2.7:/app/gemfiles
+  tracer-3.0:
+    image: marcotc/docker-library:ddtrace_rb_3.0.0
+    command: /bin/bash
+    depends_on:
+      - ddagent
+      - elasticsearch
+      - memcached
+      - mongodb
+      - mysql
+      - postgres
+      - redis
+    env_file: ./.env
+    environment:
+      - BUNDLE_GEMFILE=/app/Gemfile
+      - DD_AGENT_HOST=ddagent
+      - TEST_DATADOG_INTEGRATION=1
+      - TEST_ELASTICSEARCH_HOST=elasticsearch
+      - TEST_MEMCACHED_HOST=memcached
+      - TEST_MONGODB_HOST=mongodb
+      - TEST_MYSQL_HOST=mysql
+      - TEST_POSTGRES_HOST=postgres
+      - TEST_REDIS_HOST=redis
+    stdin_open: true
+    tty: true
+    volumes:
+      - .:/app
+      - bundle-3.0:/usr/local/bundle
+      - gemfiles-3.0:/app/gemfiles
+  # JRuby
+  tracer-jruby-9.2.0.0:
+    image: marcotc/docker-library:ddtrace_rb_jruby_9_2_0_0
+    command: /bin/bash
+    depends_on:
+      - ddagent
+      - elasticsearch
+      - memcached
+      - mongodb
+      - mysql
+      - postgres
+      - presto
+      - redis
+    env_file: ./.env
+    environment:
+      - BUNDLE_GEMFILE=/app/Gemfile
+      - DD_AGENT_HOST=ddagent
+      - TEST_DATADOG_INTEGRATION=1
+      - TEST_ELASTICSEARCH_HOST=elasticsearch
+      - TEST_MEMCACHED_HOST=memcached
+      - TEST_MONGODB_HOST=mongodb
+      - TEST_MYSQL_HOST=mysql
+      - TEST_POSTGRES_HOST=postgres
+      - TEST_PRESTO_HOST=presto
+      - TEST_PRESTO_PORT=8080
+      - TEST_REDIS_HOST=redis
+    stdin_open: true
+    tty: true
+    volumes:
+      - .:/app
+      - bundle-jruby-9.2.0.0:/usr/local/bundle
+      - gemfiles-jruby-9.2.0.0:/app/gemfiles
+  tracer-jruby-9.2-latest:
+    image: marcotc/docker-library:ddtrace_rb_jruby_9_2_11_1
+    command: /bin/bash
+    depends_on:
+      - ddagent
+      - elasticsearch
+      - memcached
+      - mongodb
+      - mysql
+      - postgres
+      - presto
+      - redis
+    env_file: ./.env
+    environment:
+      - BUNDLE_GEMFILE=/app/Gemfile
+      - DD_AGENT_HOST=ddagent
+      - TEST_DATADOG_INTEGRATION=1
+      - TEST_ELASTICSEARCH_HOST=elasticsearch
+      - TEST_MEMCACHED_HOST=memcached
+      - TEST_MONGODB_HOST=mongodb
+      - TEST_MYSQL_HOST=mysql
+      - TEST_POSTGRES_HOST=postgres
+      - TEST_PRESTO_HOST=presto
+      - TEST_PRESTO_PORT=8080
+      - TEST_REDIS_HOST=redis
+    stdin_open: true
+    tty: true
+    volumes:
+      - .:/app
+      - bundle-jruby-9.2-latest:/usr/local/bundle
+      - gemfiles-jruby-9.2-latest:/app/gemfiles
+  # TruffleRuby
+  tracer-truffleruby-21.0.0:
+    image: ivoanjo/docker-library:ddtrace_rb_truffleruby_21_0_0
+    command: /bin/bash
+    depends_on:
+      - ddagent
+      - elasticsearch
+      - memcached
+      - mongodb
+      - mysql
+      - postgres
+      - presto
+      - redis
+    env_file: ./.env
+    environment:
+      - BUNDLE_GEMFILE=/app/Gemfile
+      - DD_AGENT_HOST=ddagent
+      - TEST_DATADOG_INTEGRATION=1
+      - TEST_ELASTICSEARCH_HOST=elasticsearch
+      - TEST_MEMCACHED_HOST=memcached
+      - TEST_MONGODB_HOST=mongodb
+      - TEST_MYSQL_HOST=mysql
+      - TEST_POSTGRES_HOST=postgres
+      - TEST_PRESTO_HOST=presto
+      - TEST_PRESTO_PORT=8080
+      - TEST_REDIS_HOST=redis
+    stdin_open: true
+    tty: true
+    volumes:
+      - .:/app
+      - bundle-truffleruby-21.0.0:/usr/local/bundle
+      - gemfiles-truffleruby-21.0.0:/app/gemfiles
   ddagent:
-    image: datadog/docker-dd-agent
+    image: datadog/agent
     environment:
       - DD_APM_ENABLED=true
       - DD_BIND_HOST=0.0.0.0
-      - DD_API_KEY=invalid_key_but_this_is_fine
+      - DD_API_KEY=00000000000000000000000000000000
     expose:
+      - "8125/udp"
       - "8126"
     ports:
-      - "${TEST_DDAGENT_PORT}:8126"
+      - "${DD_METRIC_AGENT_PORT}:8125/udp"
+      - "${DD_TRACE_AGENT_PORT}:8126"
   elasticsearch:
     # Note: ES 5.0 dies with error:
     # max virtual memory areas vm.max_map_count [65530] is too low, increase to at least [262144]
@@ -217,6 +410,7 @@ services:
   mysql:
     image: mysql:5.6
     environment:
+      - MYSQL_DATABASE=$TEST_MYSQL_DB
       - MYSQL_ROOT_PASSWORD=$TEST_MYSQL_ROOT_PASSWORD
       - MYSQL_PASSWORD=$TEST_MYSQL_PASSWORD
       - MYSQL_USER=$TEST_MYSQL_USER
@@ -234,6 +428,13 @@ services:
       - "5432"
     ports:
       - "${TEST_POSTGRES_PORT}:5432"
+  presto:
+    # Move to trinodb/trino after https://github.com/treasure-data/presto-client-ruby/issues/64 is resolved.
+    image: starburstdata/presto:332-e.9
+    expose:
+      - "8080"
+    ports:
+      - "${TEST_PRESTO_PORT}:8080"
   redis:
     image: redis:3.0
     expose:
@@ -241,15 +442,27 @@ services:
     ports:
       - "${TEST_REDIS_PORT}:6379"
 volumes:
-  bundle-1.9:
   bundle-2.0:
   bundle-2.1:
   bundle-2.2:
   bundle-2.3:
   bundle-2.4:
-  gemfiles-1.9:
+  bundle-2.5:
+  bundle-2.6:
+  bundle-2.7:
+  bundle-3.0:
+  bundle-jruby-9.2.0.0:
+  bundle-jruby-9.2-latest:
+  bundle-truffleruby-21.0.0:
   gemfiles-2.0:
   gemfiles-2.1:
   gemfiles-2.2:
   gemfiles-2.3:
   gemfiles-2.4:
+  gemfiles-2.5:
+  gemfiles-2.6:
+  gemfiles-2.7:
+  gemfiles-3.0:
+  gemfiles-jruby-9.2.0.0:
+  gemfiles-jruby-9.2-latest:
+  gemfiles-truffleruby-21.0.0: