ddtrace 0.42.0 → 0.54.2

data/benchmarks/postgres_database.yml

@@ -1,9 +0,0 @@
-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

@@ -1,154 +0,0 @@
-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/docker-compose.yml

@@ -1,370 +0,0 @@
-version: '3.2'
-services:
-  # MRI
-  tracer-2.0:
-    image: palazzem/docker-library:ddtrace_rb_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_REDIS_HOST=redis
-    stdin_open: true
-    tty: true
-    volumes:
-      - .:/app
-      - 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
-      - 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.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
-      - 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.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
-      - 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.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
-      - 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.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
-      - 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.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
-  # JRuby
-  tracer-jruby-9.2:
-    image: marcotc/docker-library:ddtrace_rb_jruby_9_2
-    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:/usr/local/bundle
-      - gemfiles-jruby-9.2:/app/gemfiles
-  ddagent:
-    image: datadog/agent
-    environment:
-      - DD_APM_ENABLED=true
-      - DD_BIND_HOST=0.0.0.0
-      - DD_API_KEY=00000000000000000000000000000000
-    expose:
-      - "8125/udp"
-      - "8126"
-    ports:
-      - "${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]
-    # see https://github.com/docker-library/elasticsearch/issues/98 for details
-    # For now, just rely on a 2.X server.
-    image: elasticsearch:2.4
-    expose:
-      - "9200"
-      - "9300"
-    ports:
-      - "${TEST_ELASTICSEARCH_REST_PORT}:9200"
-      - "${TEST_ELASTICSEARCH_NATIVE_PORT}:9300"
-  memcached:
-    image: memcached:1.5-alpine
-    expose:
-      - "11211"
-    ports:
-      - "${TEST_MEMCACHED_PORT}:11211"
-  mongodb:
-    image: mongo:3.5
-    expose:
-      - "27017"
-    ports:
-      - "${TEST_MONGODB_PORT}:27017"
-  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
-    expose:
-      - "3306"
-    ports:
-      - "${TEST_MYSQL_PORT}:3306"
-  postgres:
-    image: postgres:9.6
-    environment:
-      - POSTGRES_PASSWORD=$TEST_POSTGRES_PASSWORD
-      - POSTGRES_USER=$TEST_POSTGRES_USER
-      - POSTGRES_DB=$TEST_POSTGRES_DB
-    expose:
-      - "5432"
-    ports:
-      - "${TEST_POSTGRES_PORT}:5432"
-  presto:
-    image:  prestosql/presto
-    expose:
-      - "8080"
-    ports:
-      - "${TEST_PRESTO_PORT}:8080"
-  redis:
-    image: redis:3.0
-    expose:
-      - "6379"
-    ports:
-      - "${TEST_REDIS_PORT}:6379"
-volumes:
-  bundle-2.0:
-  bundle-2.1:
-  bundle-2.2:
-  bundle-2.3:
-  bundle-2.4:
-  bundle-2.5:
-  bundle-2.6:
-  bundle-2.7:
-  bundle-jruby-9.2:
-  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-jruby-9.2:

data/lib/ddtrace/augmentation/method_wrapper.rb

@@ -1,20 +0,0 @@
-module Datadog
-  # Represents an wrapped method, with a reference to the original block
-  # and the block that wraps around it.
-  class MethodWrapper
-    attr_reader \
-      :original,
-      :wrapper
-
-    DEFAULT_WRAPPER = proc { |original, *args, &block| original.call(*args, &block) }
-
-    def initialize(original, &block)
-      @original = original
-      @wrapper = block_given? ? block : DEFAULT_WRAPPER
-    end
-
-    def call(*args, &block)
-      wrapper.call(original, *args, &block)
-    end
-  end
-end

data/lib/ddtrace/augmentation/method_wrapping.rb

@@ -1,38 +0,0 @@
-require 'set'
-require 'ddtrace/patcher'
-
-module Datadog
-  # Shorthands for wrapping methods
-  module MethodWrapping
-    include Datadog::Patcher
-
-    def wrapped_methods
-      @wrapped_methods ||= Set.new
-    end
-
-    # Adds method block directly to the object.
-    # Block is evaluated in the context of the object.
-    # Faster than #wrap_method!
-    def override_method!(method_name, &block)
-      return unless block_given?
-
-      without_warnings do
-        define_singleton_method(method_name, &block).tap do
-          wrapped_methods.add(method_name)
-        end
-      end
-    end
-
-    # Adds method wrapper to the object.
-    # Block is evaluated in the original context of the block.
-    # Slower than #override_method!
-    def wrap_method!(original_method, &block)
-      return unless block_given?
-      original_method = original_method.is_a?(Symbol) ? method(original_method) : original_method
-
-      override_method!(original_method.name) do |*original_args, &original_block|
-        block.call(original_method, *original_args, &original_block)
-      end
-    end
-  end
-end

data/lib/ddtrace/augmentation/shim.rb

@@ -1,102 +0,0 @@
-require 'set'
-require 'ddtrace/patcher'
-require 'ddtrace/augmentation/method_wrapping'
-
-module Datadog
-  # A "stand-in" that intercepts calls to another object. i.e. man-in-the-middle.
-  # This shim forwards all methods to object, except those overriden.
-  # Useful if you want to intercept inbound behavior to an object without modifying
-  # the object in question, especially useful if the overridding behavior shouldn't be global.
-  class Shim
-    extend Forwardable
-    include Datadog::Patcher
-    include Datadog::MethodWrapping
-
-    METHODS = Set[
-      :override_method!,
-      :shim,
-      :shim?,
-      :shim_target,
-      :wrap_method!,
-      :wrapped_methods
-    ].freeze
-
-    EXCLUDED_METHODS = Set[
-      # For all objects
-      :__binding__,
-      :__id__,
-      :__send__,
-      :extend,
-      :itself,
-      :object_id,
-      :respond_to?,
-      :tap
-    ].freeze
-
-    attr_reader :shim_target, :shim
-
-    def self.shim?(object)
-      # Check whether it responds to #shim? because otherwise the
-      # Shim forwards all method calls, including type checks to
-      # the wrapped object, to mimimize its intrusion.
-      object.respond_to?(:shim?)
-    end
-
-    # Pass this a block to override methods
-    def initialize(shim_target)
-      @shim = self
-      @shim_target = shim_target
-
-      # Save a reference to the original :define_singleton_method
-      # so methods can be defined on the shim after forwarding is applied.
-      @definition_method = method(:define_singleton_method)
-
-      # Wrap any methods
-      yield(self) if block_given?
-
-      # Forward methods
-      forwarded_methods = (
-        shim_target.public_methods.to_set \
-        - METHODS \
-        - EXCLUDED_METHODS \
-        - wrapped_methods
-      )
-      forward_methods!(*forwarded_methods)
-    end
-
-    def override_method!(method_name, &block)
-      return unless block_given?
-
-      without_warnings do
-        @definition_method.call(method_name, &block).tap do
-          wrapped_methods.add(method_name)
-        end
-      end
-    end
-
-    def wrap_method!(method_name, &block)
-      super(shim_target.method(method_name), &block)
-    end
-
-    def shim?
-      true
-    end
-
-    def respond_to?(method_name)
-      return true if METHODS.include?(method_name)
-      shim_target.respond_to?(method_name)
-    end
-
-    private
-
-    def forward_methods!(*forwarded_methods)
-      return if forwarded_methods.empty?
-
-      singleton_class.send(
-        :def_delegators,
-        :@shim_target,
-        *forwarded_methods
-      )
-    end
-  end
-end

data/lib/ddtrace/augmentation.rb

@@ -1,13 +0,0 @@
-require 'ddtrace/augmentation/method_wrapper'
-require 'ddtrace/augmentation/method_wrapping'
-require 'ddtrace/augmentation/shim'
-
-module Datadog
-  # Namespace for components that help modify
-  # existing code for instrumentation purposes.
-  module Augmentation
-    def shim(object, &block)
-      Shim.new(object, &block)
-    end
-  end
-end