ddtrace 0.51.1 → 0.52.0

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

@@ -1,64 +0,0 @@
-version: '3.4'
-services:
-  app:
-    build:
-      context: .
-      args:
-        BASE_IMAGE: datadog/dd-apm-demo:rb-3.0
-    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-rspec
-      - DD_PROFILING_ENABLED=true
-      # Use these to choose what is run
-      - DD_DEMO_ENV_PROCESS=rspec
-      - 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
-    stdin_open: true
-    tty: true
-    volumes:
-      - .:/app
-      - /app/.git
-      - ./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
-volumes:
-  bundle:

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

@@ -1,37 +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 Ruby app 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-rspec .
-else
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.1 -t datadog/dd-apm-demo:rb-2.1-rspec .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.2 -t datadog/dd-apm-demo:rb-2.2-rspec .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.3 -t datadog/dd-apm-demo:rb-2.3-rspec .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.4 -t datadog/dd-apm-demo:rb-2.4-rspec .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.5 -t datadog/dd-apm-demo:rb-2.5-rspec .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.6 -t datadog/dd-apm-demo:rb-2.6-rspec .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-2.7 -t datadog/dd-apm-demo:rb-2.7-rspec .
-  docker build --build-arg BASE_IMAGE=datadog/dd-apm-demo:rb-3.0 -t datadog/dd-apm-demo:rb-3.0-rspec .
-fi
-echo "== Done building Ruby app images. =="

data/integration/apps/rspec/script/ci

@@ -1,53 +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-rspec}
-APP_COMPOSE_FILES="-f docker-compose.ci.yml"
-
-echo "== Running integration tests... =="
-echo " - App: rspec"
-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
-# NOTE: Normally we run "integration-tester" but in this case, the app is the test suite.
-#       Just run the app instead.
-#       It's expected to produce test failures and raise an exit code. Ignore this.
-APP_IMAGE=$APP_IMAGE docker-compose $APP_COMPOSE_FILES run app || true
-
-# Cleanup
-APP_IMAGE=$APP_IMAGE docker-compose $APP_COMPOSE_FILES down -t 0 --remove-orphans

data/integration/apps/rspec/spec/fibonacci_spec.rb

@@ -1,16 +0,0 @@
-require_relative '../app/fibonacci'
-
-# Test some library functions
-RSpec.describe '#fib' do
-  subject(:call_fib) { fib(n) }
-  let(:n) { rand(25..35) }
-
-  it { is_expected.to be_a_kind_of(Integer) }
-
-  context 'given a smaller and larger number' do
-    let(:smaller_fib) { fib(n) }
-    let(:larger_fib) { fib(n+1) }
-
-    it { expect(larger_fib).to be > smaller_fib }
-  end
-end

data/integration/apps/rspec/spec/rspec_spec.rb

@@ -1,58 +0,0 @@
-# Test some RSpec behavior
-# NOTE: This file is expected to always produce some test errors!
-#       So that we can 
-RSpec.describe 'RSpec behavior' do
-  shared_examples_for 'correct behavior' do
-    it 'passes' do
-      expect(1).to be < 2
-    end
-  end
-  
-  shared_examples_for 'incorrect behavior' do
-    it 'fails' do
-      expect(2).to be < 1
-    end
-  end
-
-  it 'passes correct assertions' do
-    expect(1).to be < 2
-  end
-
-  it 'fails incorrect assertions' do
-    expect(2).to be < 1
-  end
-
-  it_behaves_like 'correct behavior'
-  it_behaves_like 'incorrect behavior'
-
-  context 'context' do
-    it_behaves_like 'correct behavior'
-    it_behaves_like 'incorrect behavior'
-  end
-
-  context 'in a' do
-    context 'deeply' do
-      context 'nested' do
-        context 'context' do
-          it 'passes correct assertions' do
-            expect(1).to be < 2
-          end
-
-          it 'fails incorrect assertions' do
-            expect(2).to be < 1
-          end
-        end
-      end
-    end
-  end
-
-  context 'when calling traced code' do
-    it 'wraps the RSpec instrumentation around the traced code' do
-      Datadog.tracer.trace('code_under_test') do |span|
-        time_to_run = rand
-        sleep(rand)
-        span.set_tag('run_time', time_to_run)
-      end
-    end
-  end
-end

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

@@ -1,24 +0,0 @@
-require 'datadog/ci'
-
-# Enable CI tracing
-Datadog.configure do |c|
-  c.ci_mode.enabled = true
-  c.use :rspec
-end
-
-RSpec.configure do |config|
-  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
-  config.filter_run_when_matching :focus
-  config.disable_monkey_patching!
-  config.profile_examples = 10
-  config.order = :random
-  Kernel.srand config.seed
-end

data/integration/apps/ruby/.dockerignore

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

data/integration/apps/ruby/.envrc.sample

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

data/integration/apps/ruby/.gitignore

@@ -1,2 +0,0 @@
-.envrc
-.byebug_history

data/integration/apps/ruby/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/ruby/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/ruby/Gemfile

@@ -1,11 +0,0 @@
-require 'datadog/demo_env'
-
-source 'https://rubygems.org' do
-  gem 'ffi'
-  gem 'google-protobuf'
-
-  # Choose correct specs for 'ddtrace' demo environment
-  gem 'ddtrace', *Datadog::DemoEnv.gem_spec('ddtrace')
-
-  gem 'byebug'
-end

data/integration/apps/ruby/README.md

@@ -1,70 +0,0 @@
-# Ruby: Demo application for Datadog APM
-
-A generic Ruby application with some common use scenarios.
-
-For generating Datadog APM traces and profiles.
-
-## Installation
-
-Install [direnv](https://github.com/direnv/direnv) for applying local settings.
-
-1. `cp .envrc.sample .envrc` and add your Datadog API key.
-2. `direnv allow` to load the env var.
-4. `docker-compose run --rm app bin/setup`
-
-## Running the application
-
-### To monitor performance of Docker containers with Datadog
-
-```sh
-docker run --rm --name dd-agent  -v /var/run/docker.sock:/var/run/docker.sock:ro -v /proc/:/host/proc/:ro -v /sys/fs/cgroup/:/host/sys/fs/cgroup:ro -e API_KEY=$DD_API_KEY datadog/docker-dd-agent:latest
-```
-
-### Starting the application
-
-Run `docker-compose up` to auto-start the application.
-
-Alternatively, you can run it manually with:
-
-```sh
-docker-compose run --rm app bin/run <process>
-```
-
-The `<process>` argument is optional, and will default to `DD_DEMO_ENV_PROCESS` if not provided. See [Processes](#processes) for more details.
-
-##### Processes
-
-Within the container, run `bin/run <process>` where `<process>` is one of the following values:
-
- - `fibonacci`: Fibonacci number generator
- - `irb`: IRB session
-
- Alternatively, set `DD_DEMO_ENV_PROCESS` to run a particular process by default when `bin/run` is run.
-
-##### Features
-
-Set `DD_DEMO_ENV_FEATURES` to a comma-delimited list of any of the following values to activate the feature:
-
- - `tracing`: Tracing instrumentation
- - `profiling`: Profiling (NOTE: Must also set `DD_PROFILING_ENABLED` to match.)
- - `debug`: Enable diagnostic debug mode
- - `analytics`: Enable trace analytics
- - `runtime_metrics`: Enable runtime metrics
- - `pprof_to_file`: Dump profiling pprof to file instead of agent.
-
-e.g. `DD_DEMO_ENV_FEATURES=tracing,profiling`
-
-### Running integration tests
-
-You can run integration tests using the following and substituting for the Ruby major and minor version (e.g. `2.7`)
-
-```sh
-./script/build-images -v <RUBY_VERSION>
-./script/ci -v <RUBY_VERSION>
-```
-
-Or inside a running container:
-
-```sh
-./bin/test
-```

data/integration/apps/ruby/agent.yaml

@@ -1,3 +0,0 @@
-use_dogstatsd: true
-dogstatsd_port: 8125
-dogstatsd_non_local_traffic: true

data/integration/apps/ruby/app/datadog.rb

@@ -1,13 +0,0 @@
-require 'datadog/demo_env'
-require 'ddtrace'
-
-Datadog.configure do |c|
-  c.diagnostics.debug = true if Datadog::DemoEnv.feature?('debug')
-  c.analytics_enabled = true if Datadog::DemoEnv.feature?('analytics')
-  c.runtime_metrics.enabled = true if Datadog::DemoEnv.feature?('runtime_metrics')
-
-  if Datadog::DemoEnv.feature?('pprof_to_file')
-    # Reconfigure transport to write pprof to file
-    c.profiling.exporter.transport = Datadog::DemoEnv.profiler_file_transport
-  end
-end

data/integration/apps/ruby/app/fibonacci.rb

@@ -1,58 +0,0 @@
-require_relative 'datadog'
-
-def fib(n)
-  n <= 1 ? n : fib(n-1) + fib(n-2)
-end
-
-def trace(*options, &block)
-  raise ArgumentError('Must provide trace block') unless block_given?
-
-  if Datadog::DemoEnv.feature?('tracing')
-    Datadog.tracer.trace(*options, &block)
-  else
-    yield
-  end
-end
-
-def generate_fib
-  loop do
-    n = rand(25..35)
-
-    trace('compute.fibonacci') do |span|
-      result = fib(n)
-      span.set_metric('operation.fibonacci.n', n)
-      span.set_metric('operation.fibonacci.result', result)
-      yield(span) if block_given?
-    end
-
-    sleep(0.1)
-  end
-end
-
-if defined?(Ractor)
-  # Ractor version
-  # DEV: Disabled for now because Ractors cannot access ENV.
-  #      This results in a shareable-object violation.
-  #      Enable when we figure out how to make DemoEnv ractor-safe.
-
-  # require 'securerandom'
-  # ractors = []
-
-  # 3.times do |i|
-  #   ractors << Ractor.new do
-  #     ractor_id = SecureRandom.uuid
-  #     generate_fib { |span| span.set_tag('ractor.id', ractor_id) }
-  #   end
-  # end
-
-  # # Wait indefinitely for ractors
-  # loop do
-  #   ractors.collect(&:take)
-  # end
-  
-  # DEV: Use single-threaded version instead for now...
-  generate_fib
-else
-  # Single-threaded version
-  generate_fib
-end