ddtrace 0.49.0 → 0.52.0

data/integration/apps/rack/docker-compose.ci.yml

@@ -1,62 +0,0 @@
-version: '3.4'
-services:
-  app:
-    # Build at dd-trace-rb level to copy in current code
-    # and use it as the `ddtrace` gem.
-    build:
-      context: ../../..
-      dockerfile: integration/apps/rack/Dockerfile-ci
-      args:
-        BASE_IMAGE: ${APP_IMAGE}
-    depends_on:
-      - ddagent
-    environment:
-      - BUNDLE_GEMFILE=/app/Gemfile
-      - DD_AGENT_HOST=ddagent
-      - DD_METRIC_AGENT_PORT=8125
-      - DD_TRACE_AGENT_PORT=8126
-      - DD_HEALTH_METRICS_ENABLED=true
-      - DD_SERVICE=acme-rack
-      - DD_PROFILING_ENABLED=true
-      # Use these to choose what is run
-      - DD_DEMO_ENV_PROCESS=puma
-      - DD_DEMO_ENV_FEATURES=tracing
-    expose:
-      - "80"
-    stdin_open: true
-    tty: true
-  ddagent:
-    image: datadog/dd-apm-demo:agent
-    environment:
-      - DD_APM_ENABLED=true
-      - DD_PROCESS_AGENT_ENABLED=false
-      - DD_BIND_HOST=0.0.0.0
-      - DD_API_KEY=invalid_api_key
-      - LOG_LEVEL=DEBUG
-      - DD_LOGS_STDOUT=yes
-      - DD_DOGSTATSD_NON_LOCAL_TRAFFIC=true
-    expose:
-      - "8125/udp"
-      - "8126"
-  # Build at dd-trace-rb level to copy in current code
-  # and use it as the `ddtrace` gem.
-  integration-tester:
-    build:
-      context: ../../..
-      dockerfile: integration/apps/rack/Dockerfile-ci
-      args:
-        BASE_IMAGE: ${APP_IMAGE}
-    command: bin/test
-    depends_on:
-      - app
-    environment:
-      - TEST_HOSTNAME=app
-      - TEST_PORT=80
-      - TEST_INTEGRATION=true
-      - HEALTH_CHECK_URL=http://app/health
-      - HEALTH_CHECK_INTERVAL=1
-      - HEALTH_CHECK_MAX_ATTEMPTS=30
-    # volumes:
-    #   - .:/app
-    #   - ../../images/include:/vendor/dd-demo
-    #   - ../../..:/vendor/dd-trace-rb

data/integration/apps/rack/docker-compose.yml

@@ -1,78 +0,0 @@
-version: '3.4'
-services:
-  app:
-    build:
-      context: .
-      args:
-        BASE_IMAGE: datadog/dd-apm-demo:rb-2.7
-    depends_on:
-      - ddagent
-    environment:
-      - BUNDLE_GEMFILE=/app/Gemfile
-      - DD_AGENT_HOST=ddagent
-      - DD_METRIC_AGENT_PORT=8125
-      - DD_TRACE_AGENT_PORT=8126
-      - DD_HEALTH_METRICS_ENABLED=true
-      - DD_SERVICE=acme-rack
-      - DD_PROFILING_ENABLED=true
-      # Use these to choose what is run
-      - DD_DEMO_ENV_PROCESS=puma
-      - DD_DEMO_ENV_FEATURES=tracing
-      # Use this for a local version of ddtrace
-      - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb
-      # Use these for a specific revision of ddtrace
-      # - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git
-      # - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a
-    expose:
-      - "80"
-    stdin_open: true
-    tty: true
-    volumes:
-      - .:/app
-      - ./data/app:/data/app
-      - bundle:/usr/local/bundle
-      - ../../images/include:/vendor/dd-demo
-      - ../../..:/vendor/dd-trace-rb
-  ddagent:
-    image: datadog/dd-apm-demo:agent
-    environment:
-      - DD_APM_ENABLED=true
-      - DD_PROCESS_AGENT_ENABLED=false
-      - DD_BIND_HOST=0.0.0.0
-      - DD_API_KEY
-      - LOG_LEVEL=DEBUG
-      - DD_LOGS_STDOUT=yes
-      - DD_DOGSTATSD_NON_LOCAL_TRAFFIC=true
-    expose:
-      - "8125/udp"
-      - "8126"
-    volumes:
-      - ../../images/agent/agent.yaml:/etc/datadog-agent/datadog.yaml
-      # For monitoring performance of containers (e.g. CPU, Memory, etc...)
-      # - type: bind
-      #   source: ../../images/agent/agent.yaml
-      #   target: /etc/datadog-agent/datadog.yaml
-      # - type: bind
-      #   source: /var/run/docker.sock
-      #   target: /var/run/docker.sock:ro
-      # - type: bind
-      #   source: /proc/
-      #   target: /host/proc/:ro
-      # - type: bind
-      #   source: /sys/fs/cgroup/
-      #   target: /host/sys/fs/cgroup:ro
-  load-tester:
-    build:
-      context: ../../images
-      dockerfile: wrk/Dockerfile
-    command: -t10 -c10 -d43200s -s /scripts/scenarios/basic/default.lua http://app/basic/default
-    depends_on:
-      - app
-    environment:
-      - HEALTH_CHECK_URL=http://app/health
-      - HEALTH_CHECK_INTERVAL=1
-      - HEALTH_CHECK_MAX_ATTEMPTS=30
-    volumes:
-      - ../../images/wrk/scripts:/scripts
-volumes:
-  bundle:

data/integration/apps/rack/script/build-images

@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-APP_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-APP_DIR=${APP_SCRIPT_DIR%/script}
-cd $APP_DIR
-
-while getopts ":v:" opt; do
-  case $opt in
-    v)
-      APP_RUBY_VERSION=$OPTARG
-      ;;
-    \?)
-      echo "Invalid option: -$OPTARG" >&2
-      exit 1
-      ;;
-    :)
-      echo "Option -$OPTARG requires an argument." >&2
-      exit 1
-      ;;
-  esac
-done
-
-echo "== Building Rack images... =="
-if [ -v APP_RUBY_VERSION ]; then
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-$APP_RUBY_VERSION -t datadog/dd-apm-demo:rb-$APP_RUBY_VERSION-rack .
-else
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.0 -t datadog/dd-apm-demo:rb-2.0-rack .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.1 -t datadog/dd-apm-demo:rb-2.1-rack .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.2 -t datadog/dd-apm-demo:rb-2.2-rack .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.3 -t datadog/dd-apm-demo:rb-2.3-rack .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.4 -t datadog/dd-apm-demo:rb-2.4-rack .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.5 -t datadog/dd-apm-demo:rb-2.5-rack .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.6 -t datadog/dd-apm-demo:rb-2.6-rack .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.7 -t datadog/dd-apm-demo:rb-2.7-rack .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-3.0 -t datadog/dd-apm-demo:rb-3.0-rack .
-fi
-echo "== Done building Rack images. =="

data/integration/apps/rack/script/ci

@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-APP_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-APP_DIR=${APP_SCRIPT_DIR%/script}
-cd $APP_DIR
-
-# Parse options
-while getopts "v:" opt; do
-  case $opt in
-    v)
-      APP_RUBY_VERSION=$OPTARG
-      ;;
-    \?)
-      echo "Invalid option: -$OPTARG" >&2
-      exit 1
-      ;;
-    :)
-      echo "Option -$OPTARG requires an argument." >&2
-      exit 1
-      ;;
-  esac
-done
-
-# Validate options
-if [ -z ${APP_RUBY_VERSION+x} ]; then
-  echo "You must specify a Ruby version with -v. (e.g. 2.7)" >&2
-  exit 1
-fi
-
-# Set configuration
-APP_BASE_IMAGE=${APP_BASE_IMAGE:-datadog/dd-apm-demo:rb-$APP_RUBY_VERSION}
-APP_IMAGE=${APP_IMAGE:-$APP_BASE_IMAGE-rack}
-APP_COMPOSE_FILES="-f docker-compose.ci.yml"
-
-echo "== Running integration tests... =="
-echo " - App: rack"
-echo " - Ruby version: $APP_RUBY_VERSION"
-echo " - Base image: $APP_BASE_IMAGE"
-echo " - App image: $APP_IMAGE"
-echo ""
-
-# Pull/build any missing images
-APP_IMAGE=$APP_IMAGE docker-compose $APP_COMPOSE_FILES build
-
-# Run the test suite
-APP_IMAGE=$APP_IMAGE docker-compose $APP_COMPOSE_FILES run integration-tester
-
-# Cleanup
-APP_IMAGE=$APP_IMAGE docker-compose $APP_COMPOSE_FILES down -t 0 --remove-orphans

data/integration/apps/rack/spec/integration/basic_spec.rb

@@ -1,10 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe 'Basic scenarios' do
-  include_context 'integration test'
-
-  context 'default' do
-    subject { get('basic/default') }
-    it { is_expected.to be_a_kind_of(Net::HTTPOK) }
-  end
-end

data/integration/apps/rack/spec/spec_helper.rb

@@ -1,16 +0,0 @@
-require 'byebug'
-require 'support/integration_helper'
-
-RSpec.configure do |config|
-  config.include IntegrationHelper
-
-  config.expect_with :rspec do |expectations|
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  config.mock_with :rspec do |mocks|
-    mocks.verify_partial_doubles = true
-  end
-
-  config.shared_context_metadata_behavior = :apply_to_host_groups
-end

data/integration/apps/rack/spec/support/integration_helper.rb

@@ -1,22 +0,0 @@
-require 'net/http'
-
-module IntegrationHelper
-  shared_context 'integration test' do
-    before do
-      skip 'Integration tests not enabled.' unless ENV['TEST_INTEGRATION']
-    end
-
-    def hostname
-      ENV['TEST_HOSTNAME']
-    end
-
-    def port
-      ENV['TEST_PORT']
-    end
-
-    def get(path)
-      uri = URI("http://#{hostname}:#{port}/#{path}")
-      Net::HTTP.get_response(uri)
-    end
-  end
-end

data/integration/apps/rails-five/.dockerignore

@@ -1 +0,0 @@
-Gemfile.lock

data/integration/apps/rails-five/.env

@@ -1,3 +0,0 @@
-DD_AGENT_HOST=localhost
-DD_METRIC_AGENT_PORT=8125
-DD_TRACE_AGENT_PORT=8126

data/integration/apps/rails-five/.envrc.sample

@@ -1 +0,0 @@
-export DD_API_KEY=<Your Datadog API key here>

data/integration/apps/rails-five/.gitignore

@@ -1,30 +0,0 @@
-# See https://help.github.com/articles/ignoring-files for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
-
-# Ignore bundler config.
-/.bundle
-
-# Ignore all logfiles and tempfiles.
-/log/*
-/tmp/*
-!/log/.keep
-!/tmp/.keep
-
-# Ignore uploaded files in development
-/storage/*
-!/storage/.keep
-
-.byebug_history
-
-# Ignore master key for decrypting credentials and more.
-/config/master.key
-
-# Ignore local data
-/data
-*.pprof
-
-# Ignore local variables
-.envrc

data/integration/apps/rails-five/Dockerfile

@@ -1,25 +0,0 @@
-# Select base image
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
-
-# Setup directory
-RUN mkdir /app
-WORKDIR /app
-
-# Setup specific version of ddtrace, if specified.
-ARG ddtrace_git
-ENV DD_DEMO_ENV_GEM_GIT_DDTRACE ${ddtrace_git}
-
-ARG ddtrace_ref
-ENV DD_DEMO_ENV_GEM_REF_DDTRACE ${ddtrace_ref}
-
-# Install dependencies
-COPY Gemfile /app/Gemfile
-RUN bundle install
-
-# Add files
-COPY . /app
-
-# Set entrypoint
-ENTRYPOINT ["/bin/bash", "-c"]
-CMD ["bin/setup && bin/run"]

data/integration/apps/rails-five/Dockerfile-ci

@@ -1,11 +0,0 @@
-# Select base image
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
-
-# Add gem
-COPY . /vendor/dd-trace-rb
-
-# Install dependencies
-# Setup specific version of ddtrace, if specified.
-ENV DD_DEMO_ENV_GEM_LOCAL_DDTRACE /vendor/dd-trace-rb
-RUN bundle install

data/integration/apps/rails-five/Gemfile

@@ -1,104 +0,0 @@
-require 'datadog/demo_env'
-
-source 'https://rubygems.org' do
-  # Framework dependent gems
-  # gem 'rails', '5.2.2'
-
-  google_protobuf_versions = [
-    '~> 3.0',
-    '!= 3.7.0.rc.2',
-    '!= 3.7.0.rc.3',
-    '!= 3.7.0',
-    '!= 3.7.1',
-    '!= 3.8.0.rc.1'
-  ]
-
-  # gem 'rack', '2.1.4' # Ruby 2.2 compatibility
-  gem 'actioncable', '5.2.2'
-  gem 'actionmailer', '5.2.2'
-  gem 'actionpack', '5.2.2'
-  gem 'actionview', '5.2.2'
-  gem 'activejob', '5.2.2'
-  gem 'activemodel', '5.2.2'
-  gem 'activerecord', '5.2.2'
-  gem 'railties', '5.2.2'
-
-  gem 'mysql2'
-  gem 'puma'
-  gem 'unicorn'
-
-  # Choose correct specs for 'ddtrace' demo environment
-  gem 'ddtrace', *Datadog::DemoEnv.gem_spec('ddtrace')
-
-  gem 'dogstatsd-ruby'
-  gem 'ffi'
-  gem 'google-protobuf', *google_protobuf_versions # Ruby 2.2 compatibility
-  # gem 'rbtrace'
-  # gem 'ruby-prof'
-
-  # Fixes conflict with profiling (patch overwrite in Thread)
-  # Upgrade this to latest when this patch is merged & released.
-  # https://github.com/rollbar/rollbar-gem/pull/1018
-  gem 'rollbar', git: 'https://github.com/rollbar/rollbar-gem.git', ref: '310a9d1743bb44031480b49e8e0cef79ddc870c3'
-
-  # Gems which give aide to higher performance
-  gem 'hiredis', '~> 0.6', platform: :ruby
-  gem 'multi_json'
-  gem 'oj', '3.3', platform: :ruby
-
-  gem 'active_model_serializers', '0.9.3'
-  gem 'activerecord-import' # Speeds up mass imports
-  gem 'aws-sdk', '< 2.0'
-  gem 'bcrypt-ruby', platform: :ruby
-  gem 'connection_pool'
-  gem 'devise'
-  gem 'faker', require: false # Make up fake data to put in models for load testing
-  gem 'geoip'
-  gem 'hawk-auth'
-  gem 'httparty'
-  gem 'ipaddress'
-  # gem 'i18n', '1.5.1' # Ruby 2.2 compatibility
-  # gem 'newrelic_rpm', platform: :ruby
-  gem 'rabl', platform: :ruby
-  gem 'rack-cors'
-  gem 'rake'
-  gem 'redis'
-  gem 'resque'
-  # gem 'resque-pool' # Incompatible with Redis 4.0+
-  gem 'resque-scheduler'
-  gem 'tzinfo-data', platforms: [:mingw, :mswin, :jruby]
-  gem 'validates_timeliness', '~> 3.0.8' # Date comparisons
-  gem 'versionist'
-  gem 'warden'
-
-  group :development do
-    gem 'annotate'
-    gem 'awesome_print'
-    gem 'bullet'
-  end
-
-  group :test do
-    gem 'ci_reporter_rspec'
-    gem 'database_cleaner'
-    gem 'factory_girl_rails', '4.5.0'
-    gem 'rspec'
-    gem 'rspec-collection_matchers'
-    gem 'rspec-rails'
-    gem 'shoulda-matchers', '4.0.1'
-    gem 'simplecov', require: false # Will install simplecov-html as a dependency
-    gem 'timecop'
-    gem 'webmock'
-  end
-
-  group :test, :development do
-    # gem 'pry-rails', platform: :ruby
-    # gem 'pry-rescue', platform: :ruby
-    # gem 'pry-stack_explorer', platform: :ruby
-    # gem 'pry-byebug', platform: :ruby
-    gem 'byebug', platform: :ruby
-    gem 'mock_redis', '0.19.0'
-    gem 'parallel_tests'
-
-    gem 'listen'
-  end
-end