ddtrace 0.41.0 → 0.46.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.circleci/config.yml +223 -126
- data/.circleci/images/primary/Dockerfile-3.0.0 +73 -0
- data/.github/workflows/add-milestone-to-pull-requests.yml +42 -0
- data/.github/workflows/create-next-milestone.yml +20 -0
- data/.rubocop.yml +250 -7
- data/.rubocop_todo.yml +396 -0
- data/.simplecov +3 -0
- data/Appraisals +429 -135
- data/CHANGELOG.md +1158 -354
- data/CONTRIBUTING.md +2 -2
- data/Gemfile +40 -3
- data/README.md +1 -0
- data/Rakefile +236 -29
- data/ddtrace.gemspec +4 -35
- data/docker-compose.yml +30 -0
- data/docs/DevelopmentGuide.md +40 -2
- data/docs/GettingStarted.md +186 -16
- data/integration/README.md +68 -0
- data/integration/apps/rack/.dockerignore +1 -0
- data/integration/apps/rack/.envrc.sample +1 -0
- data/integration/apps/rack/.gitignore +4 -0
- data/integration/apps/rack/.rspec +1 -0
- data/integration/apps/rack/Dockerfile +25 -0
- data/integration/apps/rack/Dockerfile-ci +11 -0
- data/integration/apps/rack/Gemfile +24 -0
- data/integration/apps/rack/README.md +93 -0
- data/integration/apps/rack/app/acme.rb +80 -0
- data/integration/apps/rack/app/datadog.rb +17 -0
- data/integration/apps/rack/bin/run +22 -0
- data/integration/apps/rack/bin/setup +17 -0
- data/integration/apps/rack/bin/test +24 -0
- data/integration/apps/rack/config.ru +6 -0
- data/integration/apps/rack/config/puma.rb +14 -0
- data/integration/apps/rack/config/unicorn.rb +23 -0
- data/integration/apps/rack/docker-compose.ci.yml +62 -0
- data/integration/apps/rack/docker-compose.yml +78 -0
- data/integration/apps/rack/script/build-images +38 -0
- data/integration/apps/rack/script/ci +50 -0
- data/integration/apps/rack/spec/integration/basic_spec.rb +10 -0
- data/integration/apps/rack/spec/spec_helper.rb +16 -0
- data/integration/apps/rack/spec/support/integration_helper.rb +22 -0
- data/integration/apps/rails-five/.dockerignore +1 -0
- data/integration/apps/rails-five/.env +3 -0
- data/integration/apps/rails-five/.envrc.sample +1 -0
- data/integration/apps/rails-five/.gitignore +30 -0
- data/integration/apps/rails-five/Dockerfile +25 -0
- data/integration/apps/rails-five/Dockerfile-ci +11 -0
- data/integration/apps/rails-five/Gemfile +104 -0
- data/integration/apps/rails-five/README.md +94 -0
- data/integration/apps/rails-five/Rakefile +6 -0
- data/integration/apps/rails-five/app/channels/application_cable/channel.rb +4 -0
- data/integration/apps/rails-five/app/channels/application_cable/connection.rb +4 -0
- data/integration/apps/rails-five/app/controllers/application_controller.rb +2 -0
- data/integration/apps/rails-five/app/controllers/basic_controller.rb +36 -0
- data/integration/apps/rails-five/app/controllers/concerns/.keep +0 -0
- data/integration/apps/rails-five/app/controllers/health_controller.rb +9 -0
- data/integration/apps/rails-five/app/controllers/jobs_controller.rb +12 -0
- data/integration/apps/rails-five/app/jobs/application_job.rb +2 -0
- data/integration/apps/rails-five/app/jobs/test_job.rb +12 -0
- data/integration/apps/rails-five/app/mailers/application_mailer.rb +4 -0
- data/integration/apps/rails-five/app/models/application_record.rb +3 -0
- data/integration/apps/rails-five/app/models/concerns/.keep +0 -0
- data/integration/apps/rails-five/app/models/test.rb +2 -0
- data/integration/apps/rails-five/app/views/layouts/mailer.html.erb +13 -0
- data/integration/apps/rails-five/app/views/layouts/mailer.text.erb +1 -0
- data/integration/apps/rails-five/bin/bundle +3 -0
- data/integration/apps/rails-five/bin/rails +9 -0
- data/integration/apps/rails-five/bin/rake +9 -0
- data/integration/apps/rails-five/bin/run +24 -0
- data/integration/apps/rails-five/bin/setup +27 -0
- data/integration/apps/rails-five/bin/spring +17 -0
- data/integration/apps/rails-five/bin/test +21 -0
- data/integration/apps/rails-five/bin/update +28 -0
- data/integration/apps/rails-five/config.ru +5 -0
- data/integration/apps/rails-five/config/application.rb +97 -0
- data/integration/apps/rails-five/config/boot.rb +4 -0
- data/integration/apps/rails-five/config/cable.yml +10 -0
- data/integration/apps/rails-five/config/credentials.yml.enc +1 -0
- data/integration/apps/rails-five/config/database.yml +28 -0
- data/integration/apps/rails-five/config/environment.rb +5 -0
- data/integration/apps/rails-five/config/environments/development.rb +51 -0
- data/integration/apps/rails-five/config/environments/production.rb +82 -0
- data/integration/apps/rails-five/config/environments/test.rb +43 -0
- data/integration/apps/rails-five/config/initializers/datadog.rb +18 -0
- data/integration/apps/rails-five/config/initializers/filter_parameter_logging.rb +4 -0
- data/integration/apps/rails-five/config/initializers/resque.rb +4 -0
- data/integration/apps/rails-five/config/initializers/rollbar.rb +5 -0
- data/integration/apps/rails-five/config/initializers/wrap_parameters.rb +14 -0
- data/integration/apps/rails-five/config/locales/en.yml +33 -0
- data/integration/apps/rails-five/config/puma.rb +24 -0
- data/integration/apps/rails-five/config/routes.rb +11 -0
- data/integration/apps/rails-five/config/spring.rb +6 -0
- data/integration/apps/rails-five/config/unicorn.rb +29 -0
- data/integration/apps/rails-five/db/migrate/20190927215052_create_tests.rb +11 -0
- data/integration/apps/rails-five/db/schema.rb +23 -0
- data/integration/apps/rails-five/db/seeds.rb +7 -0
- data/integration/apps/rails-five/docker-compose.ci.yml +98 -0
- data/integration/apps/rails-five/docker-compose.yml +100 -0
- data/integration/apps/rails-five/lib/tasks/.keep +0 -0
- data/integration/apps/rails-five/log/.keep +0 -0
- data/integration/apps/rails-five/public/robots.txt +1 -0
- data/integration/apps/rails-five/script/build-images +35 -0
- data/integration/apps/rails-five/script/ci +50 -0
- data/integration/apps/rails-five/spec/integration/basic_spec.rb +10 -0
- data/integration/apps/rails-five/spec/spec_helper.rb +16 -0
- data/integration/apps/rails-five/spec/support/integration_helper.rb +22 -0
- data/integration/apps/rails-five/storage/.keep +0 -0
- data/integration/apps/rails-five/tmp/.keep +0 -0
- data/integration/apps/rails-five/vendor/.keep +0 -0
- data/integration/apps/ruby/.dockerignore +1 -0
- data/integration/apps/ruby/.envrc.sample +1 -0
- data/integration/apps/ruby/.gitignore +2 -0
- data/integration/apps/ruby/Dockerfile +25 -0
- data/integration/apps/ruby/Dockerfile-ci +11 -0
- data/integration/apps/ruby/Gemfile +11 -0
- data/integration/apps/ruby/README.md +70 -0
- data/integration/apps/ruby/agent.yaml +3 -0
- data/integration/apps/ruby/app/datadog.rb +13 -0
- data/integration/apps/ruby/app/fibonacci.rb +58 -0
- data/integration/apps/ruby/bin/run +20 -0
- data/integration/apps/ruby/bin/setup +17 -0
- data/integration/apps/ruby/bin/test +21 -0
- data/integration/apps/ruby/docker-compose.ci.yml +51 -0
- data/integration/apps/ruby/docker-compose.yml +63 -0
- data/integration/apps/ruby/script/build-images +38 -0
- data/integration/apps/ruby/script/ci +50 -0
- data/integration/images/agent/Dockerfile +2 -0
- data/integration/images/agent/agent.yaml +3 -0
- data/integration/images/include/datadog/analyzer.rb +71 -0
- data/integration/images/include/datadog/demo_env.rb +101 -0
- data/integration/images/include/http-health-check +33 -0
- data/integration/images/ruby/2.0/Dockerfile +54 -0
- data/integration/images/ruby/2.1/Dockerfile +54 -0
- data/integration/images/ruby/2.2/Dockerfile +54 -0
- data/integration/images/ruby/2.3/Dockerfile +70 -0
- data/integration/images/ruby/2.4/Dockerfile +54 -0
- data/integration/images/ruby/2.5/Dockerfile +54 -0
- data/integration/images/ruby/2.6/Dockerfile +54 -0
- data/integration/images/ruby/2.7/Dockerfile +54 -0
- data/integration/images/ruby/3.0/Dockerfile +54 -0
- data/integration/images/wrk/Dockerfile +33 -0
- data/integration/images/wrk/scripts/entrypoint.sh +17 -0
- data/integration/images/wrk/scripts/scenarios/basic/default.lua +1 -0
- data/integration/images/wrk/scripts/scenarios/basic/fibonacci.lua +1 -0
- data/integration/script/build-images +43 -0
- data/lib/ddtrace.rb +10 -5
- data/lib/ddtrace/analytics.rb +2 -0
- data/lib/ddtrace/auto_instrument.rb +3 -0
- data/lib/ddtrace/auto_instrument_base.rb +6 -0
- data/lib/ddtrace/buffer.rb +230 -134
- data/lib/ddtrace/configuration.rb +21 -5
- data/lib/ddtrace/configuration/base.rb +1 -1
- data/lib/ddtrace/configuration/components.rb +2 -2
- data/lib/ddtrace/configuration/option_definition.rb +1 -3
- data/lib/ddtrace/configuration/options.rb +2 -3
- data/lib/ddtrace/configuration/settings.rb +21 -5
- data/lib/ddtrace/context.rb +23 -6
- data/lib/ddtrace/context_provider.rb +18 -5
- data/lib/ddtrace/contrib/action_cable/event.rb +1 -0
- data/lib/ddtrace/contrib/action_cable/integration.rb +7 -0
- data/lib/ddtrace/contrib/action_pack/action_controller/instrumentation.rb +1 -3
- data/lib/ddtrace/contrib/action_pack/integration.rb +7 -0
- data/lib/ddtrace/contrib/action_view/event.rb +1 -5
- data/lib/ddtrace/contrib/action_view/events/render_partial.rb +1 -0
- data/lib/ddtrace/contrib/action_view/events/render_template.rb +1 -0
- data/lib/ddtrace/contrib/action_view/integration.rb +7 -0
- data/lib/ddtrace/contrib/action_view/utils.rb +1 -1
- data/lib/ddtrace/contrib/active_record/configuration/resolver.rb +17 -5
- data/lib/ddtrace/contrib/active_record/integration.rb +7 -0
- data/lib/ddtrace/contrib/active_record/utils.rb +68 -21
- data/lib/ddtrace/contrib/active_support/cache/instrumentation.rb +104 -3
- data/lib/ddtrace/contrib/active_support/cache/patcher.rb +21 -0
- data/lib/ddtrace/contrib/active_support/ext.rb +3 -0
- data/lib/ddtrace/contrib/active_support/integration.rb +7 -1
- data/lib/ddtrace/contrib/active_support/notifications/event.rb +12 -1
- data/lib/ddtrace/contrib/active_support/notifications/subscriber.rb +1 -0
- data/lib/ddtrace/contrib/active_support/notifications/subscription.rb +9 -5
- data/lib/ddtrace/contrib/auto_instrument.rb +49 -0
- data/lib/ddtrace/contrib/aws/instrumentation.rb +2 -1
- data/lib/ddtrace/contrib/aws/patcher.rb +1 -1
- data/lib/ddtrace/contrib/aws/services.rb +2 -0
- data/lib/ddtrace/contrib/configurable.rb +2 -0
- data/lib/ddtrace/contrib/configuration/resolvers/pattern_resolver.rb +6 -8
- data/lib/ddtrace/contrib/cucumber/configuration/settings.rb +28 -0
- data/lib/ddtrace/contrib/cucumber/ext.rb +17 -0
- data/lib/ddtrace/contrib/cucumber/formatter.rb +98 -0
- data/lib/ddtrace/contrib/cucumber/instrumentation.rb +24 -0
- data/lib/ddtrace/contrib/cucumber/integration.rb +45 -0
- data/lib/ddtrace/contrib/cucumber/patcher.rb +23 -0
- data/lib/ddtrace/contrib/dalli/patcher.rb +0 -38
- data/lib/ddtrace/contrib/delayed_job/configuration/settings.rb +2 -0
- data/lib/ddtrace/contrib/delayed_job/ext.rb +2 -0
- data/lib/ddtrace/contrib/delayed_job/plugin.rb +38 -15
- data/lib/ddtrace/contrib/elasticsearch/quantize.rb +3 -2
- data/lib/ddtrace/contrib/ethon/easy_patch.rb +11 -10
- data/lib/ddtrace/contrib/ethon/ext.rb +1 -0
- data/lib/ddtrace/contrib/excon/middleware.rb +9 -7
- data/lib/ddtrace/contrib/extensions.rb +28 -1
- data/lib/ddtrace/contrib/faraday/middleware.rb +1 -3
- data/lib/ddtrace/contrib/faraday/patcher.rb +0 -36
- data/lib/ddtrace/contrib/grape/configuration/settings.rb +7 -0
- data/lib/ddtrace/contrib/grape/endpoint.rb +47 -21
- data/lib/ddtrace/contrib/grape/ext.rb +1 -0
- data/lib/ddtrace/contrib/grape/patcher.rb +0 -42
- data/lib/ddtrace/contrib/grpc/datadog_interceptor.rb +8 -8
- data/lib/ddtrace/contrib/grpc/datadog_interceptor/client.rb +1 -1
- data/lib/ddtrace/contrib/grpc/datadog_interceptor/server.rb +1 -0
- data/lib/ddtrace/contrib/grpc/patcher.rb +0 -36
- data/lib/ddtrace/contrib/http/circuit_breaker.rb +1 -3
- data/lib/ddtrace/contrib/http/instrumentation.rb +7 -7
- data/lib/ddtrace/contrib/httpclient/configuration/settings.rb +32 -0
- data/lib/ddtrace/contrib/httpclient/ext.rb +17 -0
- data/lib/ddtrace/contrib/httpclient/instrumentation.rb +151 -0
- data/lib/ddtrace/contrib/httpclient/integration.rb +43 -0
- data/lib/ddtrace/contrib/httpclient/patcher.rb +35 -0
- data/lib/ddtrace/contrib/httprb/instrumentation.rb +5 -6
- data/lib/ddtrace/contrib/kafka/event.rb +1 -1
- data/lib/ddtrace/contrib/mongodb/instrumentation.rb +2 -0
- data/lib/ddtrace/contrib/mongodb/subscribers.rb +2 -3
- data/lib/ddtrace/contrib/patchable.rb +18 -7
- data/lib/ddtrace/contrib/patcher.rb +1 -1
- data/lib/ddtrace/contrib/qless/configuration/settings.rb +35 -0
- data/lib/ddtrace/contrib/qless/ext.rb +20 -0
- data/lib/ddtrace/contrib/qless/integration.rb +38 -0
- data/lib/ddtrace/contrib/qless/patcher.rb +35 -0
- data/lib/ddtrace/contrib/qless/qless_job.rb +73 -0
- data/lib/ddtrace/contrib/qless/tracer_cleaner.rb +33 -0
- data/lib/ddtrace/contrib/que/configuration/settings.rb +1 -0
- data/lib/ddtrace/contrib/que/ext.rb +19 -19
- data/lib/ddtrace/contrib/que/tracer.rb +3 -2
- data/lib/ddtrace/contrib/racecar/event.rb +1 -0
- data/lib/ddtrace/contrib/rack/configuration/settings.rb +3 -3
- data/lib/ddtrace/contrib/rack/integration.rb +7 -0
- data/lib/ddtrace/contrib/rack/middlewares.rb +6 -11
- data/lib/ddtrace/contrib/rack/patcher.rb +1 -3
- data/lib/ddtrace/contrib/rack/request_queue.rb +6 -1
- data/lib/ddtrace/contrib/rails/auto_instrument_railtie.rb +10 -0
- data/lib/ddtrace/contrib/rails/patcher.rb +19 -5
- data/lib/ddtrace/contrib/rails/utils.rb +4 -0
- data/lib/ddtrace/contrib/rake/instrumentation.rb +4 -2
- data/lib/ddtrace/contrib/rake/integration.rb +1 -1
- data/lib/ddtrace/contrib/redis/configuration/resolver.rb +3 -1
- data/lib/ddtrace/contrib/redis/configuration/settings.rb +5 -0
- data/lib/ddtrace/contrib/redis/ext.rb +1 -0
- data/lib/ddtrace/contrib/redis/patcher.rb +20 -3
- data/lib/ddtrace/contrib/redis/quantize.rb +28 -0
- data/lib/ddtrace/contrib/redis/tags.rb +5 -1
- data/lib/ddtrace/contrib/redis/vendor/LICENSE +20 -0
- data/lib/ddtrace/contrib/redis/vendor/resolver.rb +6 -7
- data/lib/ddtrace/contrib/registry.rb +2 -2
- data/lib/ddtrace/contrib/resque/configuration/settings.rb +1 -0
- data/lib/ddtrace/contrib/resque/integration.rb +1 -1
- data/lib/ddtrace/contrib/resque/resque_job.rb +3 -1
- data/lib/ddtrace/contrib/rest_client/request_patch.rb +1 -3
- data/lib/ddtrace/contrib/rspec/configuration/settings.rb +28 -0
- data/lib/ddtrace/contrib/rspec/example.rb +75 -0
- data/lib/ddtrace/contrib/rspec/ext.rb +16 -0
- data/lib/ddtrace/contrib/rspec/integration.rb +46 -0
- data/lib/ddtrace/contrib/rspec/patcher.rb +23 -0
- data/lib/ddtrace/contrib/sequel/utils.rb +5 -6
- data/lib/ddtrace/contrib/shoryuken/configuration/settings.rb +1 -0
- data/lib/ddtrace/contrib/shoryuken/tracer.rb +3 -1
- data/lib/ddtrace/contrib/sidekiq/configuration/settings.rb +1 -0
- data/lib/ddtrace/contrib/sidekiq/server_tracer.rb +5 -7
- data/lib/ddtrace/contrib/sidekiq/tracing.rb +0 -1
- data/lib/ddtrace/contrib/sinatra/env.rb +1 -3
- data/lib/ddtrace/contrib/sinatra/headers.rb +1 -3
- data/lib/ddtrace/contrib/sinatra/tracer.rb +1 -3
- data/lib/ddtrace/contrib/sinatra/tracer_middleware.rb +5 -5
- data/lib/ddtrace/contrib/sneakers/configuration/settings.rb +1 -0
- data/lib/ddtrace/contrib/sneakers/ext.rb +11 -11
- data/lib/ddtrace/contrib/sneakers/tracer.rb +16 -21
- data/lib/ddtrace/contrib/status_code_matcher.rb +69 -0
- data/lib/ddtrace/correlation.rb +1 -0
- data/lib/ddtrace/diagnostics/environment_logger.rb +2 -1
- data/lib/ddtrace/distributed_tracing/headers/headers.rb +1 -0
- data/lib/ddtrace/distributed_tracing/headers/helpers.rb +1 -3
- data/lib/ddtrace/ext/app_types.rb +1 -0
- data/lib/ddtrace/ext/ci.rb +297 -0
- data/lib/ddtrace/ext/distributed.rb +8 -2
- data/lib/ddtrace/ext/git.rb +11 -0
- data/lib/ddtrace/ext/http.rb +1 -1
- data/lib/ddtrace/ext/runtime.rb +2 -1
- data/lib/ddtrace/ext/test.rb +24 -0
- data/lib/ddtrace/forced_tracing.rb +2 -0
- data/lib/ddtrace/logger.rb +1 -1
- data/lib/ddtrace/metrics.rb +10 -6
- data/lib/ddtrace/opentracer/distributed_headers.rb +3 -0
- data/lib/ddtrace/opentracer/span.rb +2 -6
- data/lib/ddtrace/opentracer/thread_local_scope.rb +1 -0
- data/lib/ddtrace/patcher.rb +2 -3
- data/lib/ddtrace/pin.rb +3 -52
- data/lib/ddtrace/pipeline/span_filter.rb +1 -1
- data/lib/ddtrace/propagation/grpc_propagator.rb +17 -4
- data/lib/ddtrace/propagation/http_propagator.rb +17 -2
- data/lib/ddtrace/quantization/http.rb +1 -0
- data/lib/ddtrace/runtime/cgroup.rb +1 -1
- data/lib/ddtrace/runtime/container.rb +2 -2
- data/lib/ddtrace/runtime/identity.rb +4 -5
- data/lib/ddtrace/sampler.rb +1 -1
- data/lib/ddtrace/sampling/rate_limiter.rb +65 -16
- data/lib/ddtrace/sampling/rule_sampler.rb +1 -0
- data/lib/ddtrace/span.rb +7 -7
- data/lib/ddtrace/sync_writer.rb +7 -10
- data/lib/ddtrace/tracer.rb +23 -10
- data/lib/ddtrace/transport/http.rb +1 -3
- data/lib/ddtrace/transport/http/adapters/net.rb +9 -4
- data/lib/ddtrace/transport/http/adapters/registry.rb +1 -0
- data/lib/ddtrace/transport/http/adapters/unix_socket.rb +2 -4
- data/lib/ddtrace/transport/http/builder.rb +2 -0
- data/lib/ddtrace/transport/http/traces.rb +2 -3
- data/lib/ddtrace/transport/io.rb +1 -1
- data/lib/ddtrace/transport/traces.rb +3 -0
- data/lib/ddtrace/utils.rb +10 -11
- data/lib/ddtrace/utils/forking.rb +52 -0
- data/lib/ddtrace/utils/time.rb +25 -1
- data/lib/ddtrace/vendor/active_record/MIT-LICENSE +20 -0
- data/lib/ddtrace/version.rb +1 -1
- data/lib/ddtrace/workers.rb +5 -0
- data/lib/ddtrace/workers/async.rb +8 -0
- data/lib/ddtrace/workers/loop.rb +3 -0
- data/lib/ddtrace/workers/polling.rb +1 -0
- data/lib/ddtrace/workers/runtime_metrics.rb +7 -3
- data/lib/ddtrace/workers/trace_writer.rb +9 -10
- data/lib/ddtrace/writer.rb +22 -4
- metadata +168 -358
- data/lib/ddtrace/augmentation.rb +0 -13
- data/lib/ddtrace/augmentation/method_wrapper.rb +0 -20
- data/lib/ddtrace/augmentation/method_wrapping.rb +0 -38
- data/lib/ddtrace/augmentation/shim.rb +0 -102
- data/lib/ddtrace/monkey.rb +0 -58
@@ -0,0 +1,49 @@
|
|
1
|
+
require 'ddtrace'
|
2
|
+
|
3
|
+
module Datadog
|
4
|
+
module Contrib
|
5
|
+
# Extensions for auto instrumentation added to the base library
|
6
|
+
# AutoInstrumentation enables all integration
|
7
|
+
module AutoInstrument
|
8
|
+
def self.extended(base)
|
9
|
+
base.send(:extend, Patch)
|
10
|
+
end
|
11
|
+
|
12
|
+
# Patch adds method for invoking auto_instrumentation
|
13
|
+
module Patch
|
14
|
+
def add_auto_instrument
|
15
|
+
super
|
16
|
+
|
17
|
+
if Datadog::Contrib::Rails::Utils.railtie_supported?
|
18
|
+
require 'ddtrace/contrib/rails/auto_instrument_railtie'
|
19
|
+
else
|
20
|
+
AutoInstrument.patch_all
|
21
|
+
end
|
22
|
+
AutoInstrument.patch_all
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
def self.patch_all
|
27
|
+
integrations = []
|
28
|
+
|
29
|
+
Datadog.registry.each do |integration|
|
30
|
+
# some instrumentations are automatically enabled when the `rails` instrumentation is enabled,
|
31
|
+
# patching them on their own automatically outside of the rails integration context would
|
32
|
+
# cause undesirable service naming, so we exclude them based their auto_instrument? setting.
|
33
|
+
# we also don't want to mix rspec/cucumber integration in as rspec is env we run tests in.
|
34
|
+
next unless integration.klass.auto_instrument?
|
35
|
+
|
36
|
+
integrations << integration.name
|
37
|
+
end
|
38
|
+
|
39
|
+
Datadog.configure do |c|
|
40
|
+
c.reduce_log_verbosity
|
41
|
+
# This will activate auto-instrumentation for Rails
|
42
|
+
integrations.each do |integration_name|
|
43
|
+
c.use integration_name
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
@@ -1,5 +1,6 @@
|
|
1
1
|
require 'ddtrace/contrib/analytics'
|
2
2
|
require 'ddtrace/contrib/aws/ext'
|
3
|
+
require 'ddtrace/ext/http'
|
3
4
|
require 'ddtrace/ext/integration'
|
4
5
|
|
5
6
|
module Datadog
|
@@ -26,7 +27,7 @@ module Datadog
|
|
26
27
|
|
27
28
|
def annotate!(span, context)
|
28
29
|
span.service = configuration[:service_name]
|
29
|
-
span.span_type = Datadog::Ext::
|
30
|
+
span.span_type = Datadog::Ext::HTTP::TYPE_OUTBOUND
|
30
31
|
span.name = Ext::SPAN_COMMAND
|
31
32
|
span.resource = context.safely(:resource)
|
32
33
|
|
@@ -1,5 +1,4 @@
|
|
1
1
|
require 'ddtrace/contrib/patcher'
|
2
|
-
require 'ddtrace/ext/app_types'
|
3
2
|
require 'ddtrace/contrib/aws/ext'
|
4
3
|
|
5
4
|
module Datadog
|
@@ -36,6 +35,7 @@ module Datadog
|
|
36
35
|
|
37
36
|
available_services.each_with_object([]) do |service, constants|
|
38
37
|
next if ::Aws.autoload?(service)
|
38
|
+
|
39
39
|
constants << ::Aws.const_get(service, false).const_get(:Client, false) rescue next
|
40
40
|
end
|
41
41
|
end
|
@@ -52,6 +52,7 @@ module Datadog
|
|
52
52
|
ElasticLoadBalancingV2
|
53
53
|
ElasticTranscoder
|
54
54
|
ElasticsearchService
|
55
|
+
EventBridge
|
55
56
|
Firehose
|
56
57
|
GameLift
|
57
58
|
Glacier
|
@@ -104,6 +105,7 @@ module Datadog
|
|
104
105
|
States
|
105
106
|
StorageGateway
|
106
107
|
Support
|
108
|
+
Textract
|
107
109
|
WAF
|
108
110
|
WAFRegional
|
109
111
|
WorkDocs
|
@@ -28,6 +28,8 @@ module Datadog
|
|
28
28
|
|
29
29
|
# If the key has matching configuration explicitly defined for it,
|
30
30
|
# then return true. Otherwise return false.
|
31
|
+
# Note: a resolver's resolve method should not return a fallback value
|
32
|
+
# See: https://github.com/DataDog/dd-trace-rb/issues/1204
|
31
33
|
def configuration_for?(key)
|
32
34
|
key = resolver.resolve(key) unless key == :default
|
33
35
|
configurations.key?(key)
|
@@ -8,19 +8,17 @@ module Datadog
|
|
8
8
|
# Matches strings against Regexps.
|
9
9
|
class PatternResolver < Datadog::Contrib::Configuration::Resolver
|
10
10
|
def resolve(name)
|
11
|
+
return if patterns.empty?
|
12
|
+
|
11
13
|
# Try to find a matching pattern
|
12
|
-
|
13
|
-
# Rubocop incorrectly thinks assignment is done here...
|
14
|
-
# rubocop:disable Style/ConditionalAssignment
|
14
|
+
patterns.find do |pattern|
|
15
15
|
if pattern.is_a?(Proc)
|
16
|
-
pattern === name
|
16
|
+
(pattern === name)
|
17
17
|
else
|
18
|
-
pattern === name.to_s
|
18
|
+
(pattern === name.to_s) ||
|
19
|
+
(pattern == name) # Only required during configuration time.
|
19
20
|
end
|
20
21
|
end
|
21
|
-
|
22
|
-
# Return match or default
|
23
|
-
matching_pattern || :default
|
24
22
|
end
|
25
23
|
|
26
24
|
def add(pattern)
|
@@ -0,0 +1,28 @@
|
|
1
|
+
require 'ddtrace/contrib/configuration/settings'
|
2
|
+
require 'ddtrace/contrib/cucumber/ext'
|
3
|
+
|
4
|
+
module Datadog
|
5
|
+
module Contrib
|
6
|
+
module Cucumber
|
7
|
+
module Configuration
|
8
|
+
# Custom settings for the Cucumber integration
|
9
|
+
class Settings < Contrib::Configuration::Settings
|
10
|
+
option :enabled do |o|
|
11
|
+
o.default { env_to_bool(Ext::ENV_ENABLED, true) }
|
12
|
+
o.lazy
|
13
|
+
end
|
14
|
+
|
15
|
+
option :service_name do |o|
|
16
|
+
o.default { Datadog.configuration.service || Ext::SERVICE_NAME }
|
17
|
+
o.lazy
|
18
|
+
end
|
19
|
+
|
20
|
+
option :operation_name do |o|
|
21
|
+
o.default { ENV.key?(Ext::ENV_OPERATION_NAME) ? ENV[Ext::ENV_OPERATION_NAME] : Ext::OPERATION_NAME }
|
22
|
+
o.lazy
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
module Datadog
|
2
|
+
module Contrib
|
3
|
+
module Cucumber
|
4
|
+
# Cucumber integration constants
|
5
|
+
module Ext
|
6
|
+
APP = 'cucumber'.freeze
|
7
|
+
ENV_ENABLED = 'DD_TRACE_CUCUMBER_ENABLED'.freeze
|
8
|
+
ENV_OPERATION_NAME = 'DD_TRACE_CUCUMBER_OPERATION_NAME'.freeze
|
9
|
+
FRAMEWORK = 'cucumber'.freeze
|
10
|
+
OPERATION_NAME = 'cucumber.test'.freeze
|
11
|
+
SERVICE_NAME = 'cucumber'.freeze
|
12
|
+
STEP_SPAN_TYPE = 'step'.freeze
|
13
|
+
TEST_TYPE = 'test'.freeze
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
@@ -0,0 +1,98 @@
|
|
1
|
+
require 'ddtrace/ext/app_types'
|
2
|
+
require 'ddtrace/ext/ci'
|
3
|
+
require 'ddtrace/ext/test'
|
4
|
+
require 'ddtrace/contrib/analytics'
|
5
|
+
require 'ddtrace/contrib/cucumber/ext'
|
6
|
+
|
7
|
+
module Datadog
|
8
|
+
module Contrib
|
9
|
+
module Cucumber
|
10
|
+
# Defines collection of instrumented Cucumber events
|
11
|
+
class Formatter
|
12
|
+
attr_reader :config, :current_feature_span, :current_step_span
|
13
|
+
private :config
|
14
|
+
private :current_feature_span, :current_step_span
|
15
|
+
|
16
|
+
def initialize(config)
|
17
|
+
@config = config
|
18
|
+
|
19
|
+
bind_events(config)
|
20
|
+
end
|
21
|
+
|
22
|
+
def bind_events(config)
|
23
|
+
config.on_event :test_case_started, &method(:on_test_case_started)
|
24
|
+
config.on_event :test_case_finished, &method(:on_test_case_finished)
|
25
|
+
config.on_event :test_step_started, &method(:on_test_step_started)
|
26
|
+
config.on_event :test_step_finished, &method(:on_test_step_finished)
|
27
|
+
end
|
28
|
+
|
29
|
+
def on_test_case_started(event)
|
30
|
+
trace_options = {
|
31
|
+
app: Ext::APP,
|
32
|
+
resource: event.test_case.name,
|
33
|
+
service: configuration[:service_name],
|
34
|
+
span_type: Datadog::Ext::AppTypes::TEST,
|
35
|
+
tags: tags.merge(Datadog.configuration.tags)
|
36
|
+
}
|
37
|
+
@current_feature_span = tracer.trace(configuration[:operation_name], trace_options)
|
38
|
+
@current_feature_span.set_tag(Datadog::Ext::Test::TAG_FRAMEWORK, Ext::FRAMEWORK)
|
39
|
+
@current_feature_span.set_tag(Datadog::Ext::Test::TAG_NAME, event.test_case.name)
|
40
|
+
@current_feature_span.set_tag(Datadog::Ext::Test::TAG_SUITE, event.test_case.location.file)
|
41
|
+
@current_feature_span.set_tag(Datadog::Ext::Test::TAG_TYPE, Ext::TEST_TYPE)
|
42
|
+
@current_feature_span.set_tag(Datadog::Ext::Test::TAG_SPAN_KIND, Datadog::Ext::AppTypes::TEST)
|
43
|
+
|
44
|
+
# Measure service stats
|
45
|
+
Contrib::Analytics.set_measured(@current_feature_span)
|
46
|
+
end
|
47
|
+
|
48
|
+
def on_test_case_finished(event)
|
49
|
+
return if @current_feature_span.nil?
|
50
|
+
|
51
|
+
@current_feature_span.status = 1 if event.result.failed?
|
52
|
+
@current_feature_span.set_tag(Datadog::Ext::Test::TAG_STATUS, status_from_result(event.result))
|
53
|
+
@current_feature_span.finish
|
54
|
+
end
|
55
|
+
|
56
|
+
def on_test_step_started(event)
|
57
|
+
trace_options = {
|
58
|
+
resource: event.test_step.to_s,
|
59
|
+
span_type: Ext::STEP_SPAN_TYPE
|
60
|
+
}
|
61
|
+
@current_step_span = tracer.trace(Ext::STEP_SPAN_TYPE, trace_options)
|
62
|
+
end
|
63
|
+
|
64
|
+
def on_test_step_finished(event)
|
65
|
+
return if @current_step_span.nil?
|
66
|
+
|
67
|
+
@current_step_span.set_error event.result.exception unless event.result.passed?
|
68
|
+
@current_step_span.set_tag(Datadog::Ext::Test::TAG_STATUS, status_from_result(event.result))
|
69
|
+
@current_step_span.finish
|
70
|
+
end
|
71
|
+
|
72
|
+
private
|
73
|
+
|
74
|
+
def status_from_result(result)
|
75
|
+
if result.skipped?
|
76
|
+
return Datadog::Ext::Test::Status::SKIP
|
77
|
+
elsif result.ok?
|
78
|
+
return Datadog::Ext::Test::Status::PASS
|
79
|
+
end
|
80
|
+
|
81
|
+
Datadog::Ext::Test::Status::FAIL
|
82
|
+
end
|
83
|
+
|
84
|
+
def configuration
|
85
|
+
Datadog.configuration[:cucumber]
|
86
|
+
end
|
87
|
+
|
88
|
+
def tracer
|
89
|
+
configuration[:tracer]
|
90
|
+
end
|
91
|
+
|
92
|
+
def tags
|
93
|
+
@tags ||= Datadog::Ext::CI.tags(ENV)
|
94
|
+
end
|
95
|
+
end
|
96
|
+
end
|
97
|
+
end
|
98
|
+
end
|
@@ -0,0 +1,24 @@
|
|
1
|
+
require 'ddtrace/contrib/cucumber/formatter'
|
2
|
+
|
3
|
+
module Datadog
|
4
|
+
module Contrib
|
5
|
+
module Cucumber
|
6
|
+
# Instrumentation for Cucumber
|
7
|
+
module Instrumentation
|
8
|
+
def self.included(base)
|
9
|
+
base.send(:prepend, InstanceMethods)
|
10
|
+
end
|
11
|
+
|
12
|
+
# Instance methods for configuration
|
13
|
+
module InstanceMethods
|
14
|
+
attr_reader :datadog_formatter
|
15
|
+
|
16
|
+
def formatters
|
17
|
+
@datadog_formatter ||= Datadog::Contrib::Cucumber::Formatter.new(@configuration)
|
18
|
+
[@datadog_formatter] + super
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
@@ -0,0 +1,45 @@
|
|
1
|
+
require 'ddtrace/contrib/integration'
|
2
|
+
require 'ddtrace/contrib/cucumber/configuration/settings'
|
3
|
+
require 'ddtrace/contrib/cucumber/patcher'
|
4
|
+
require 'ddtrace/contrib/integration'
|
5
|
+
|
6
|
+
module Datadog
|
7
|
+
module Contrib
|
8
|
+
module Cucumber
|
9
|
+
# Description of Cucumber integration
|
10
|
+
class Integration
|
11
|
+
include Contrib::Integration
|
12
|
+
|
13
|
+
MINIMUM_VERSION = Gem::Version.new('3.0.0')
|
14
|
+
|
15
|
+
register_as :cucumber, auto_patch: true
|
16
|
+
|
17
|
+
def self.version
|
18
|
+
Gem.loaded_specs['cucumber'] \
|
19
|
+
&& Gem.loaded_specs['cucumber'].version
|
20
|
+
end
|
21
|
+
|
22
|
+
def self.loaded?
|
23
|
+
!defined?(::Cucumber).nil? && !defined?(::Cucumber::Runtime).nil?
|
24
|
+
end
|
25
|
+
|
26
|
+
def self.compatible?
|
27
|
+
super && version >= MINIMUM_VERSION
|
28
|
+
end
|
29
|
+
|
30
|
+
# test environments should not auto instrument test libraries
|
31
|
+
def auto_instrument?
|
32
|
+
false
|
33
|
+
end
|
34
|
+
|
35
|
+
def default_configuration
|
36
|
+
Configuration::Settings.new
|
37
|
+
end
|
38
|
+
|
39
|
+
def patcher
|
40
|
+
Patcher
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
require 'ddtrace/contrib/patcher'
|
2
|
+
require 'ddtrace/contrib/cucumber/instrumentation'
|
3
|
+
|
4
|
+
module Datadog
|
5
|
+
module Contrib
|
6
|
+
module Cucumber
|
7
|
+
# Patcher enables patching of 'cucumber' module.
|
8
|
+
module Patcher
|
9
|
+
include Contrib::Patcher
|
10
|
+
|
11
|
+
module_function
|
12
|
+
|
13
|
+
def target_version
|
14
|
+
Integration.version
|
15
|
+
end
|
16
|
+
|
17
|
+
def patch
|
18
|
+
::Cucumber::Runtime.send(:include, Instrumentation)
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -17,46 +17,8 @@ module Datadog
|
|
17
17
|
end
|
18
18
|
|
19
19
|
def patch
|
20
|
-
add_pin!
|
21
20
|
::Dalli::Server.send(:include, Instrumentation)
|
22
21
|
end
|
23
|
-
|
24
|
-
# DEPRECATED: Only kept for users still using `Dalli.datadog_pin` to configure.
|
25
|
-
# Replaced by configuration API, i.e. `c.use :dalli`.
|
26
|
-
def add_pin!
|
27
|
-
DeprecatedPin
|
28
|
-
.new(
|
29
|
-
get_option(:service_name),
|
30
|
-
app: Ext::APP,
|
31
|
-
app_type: Datadog::Ext::AppTypes::CACHE,
|
32
|
-
tracer: -> { get_option(:tracer) }
|
33
|
-
).onto(::Dalli)
|
34
|
-
end
|
35
|
-
|
36
|
-
def get_option(option)
|
37
|
-
Datadog.configuration[:dalli].get_option(option)
|
38
|
-
end
|
39
|
-
|
40
|
-
# Implementation of deprecated Pin, which raises warnings when accessed.
|
41
|
-
# To be removed when support for Datadog::Pin with Dalli is removed.
|
42
|
-
class DeprecatedPin < Datadog::Pin
|
43
|
-
include Datadog::DeprecatedPin
|
44
|
-
|
45
|
-
DEPRECATION_WARNING = %(
|
46
|
-
Use of Datadog::Pin with Dalli is DEPRECATED.
|
47
|
-
Upgrade to the configuration API using the migration guide here:
|
48
|
-
https://github.com/DataDog/dd-trace-rb/releases/tag/v0.11.0).freeze
|
49
|
-
|
50
|
-
def service_name=(service_name)
|
51
|
-
Datadog.configuration[:dalli][:service_name] = service_name
|
52
|
-
end
|
53
|
-
|
54
|
-
def log_deprecation_warning(method_name)
|
55
|
-
do_once(method_name) do
|
56
|
-
Datadog.logger.warn("#{method_name}:#{DEPRECATION_WARNING}")
|
57
|
-
end
|
58
|
-
end
|
59
|
-
end
|
60
22
|
end
|
61
23
|
end
|
62
24
|
end
|
@@ -10,7 +10,9 @@ module Datadog
|
|
10
10
|
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_DELAYED_JOB_ANALYTICS_SAMPLE_RATE'.freeze
|
11
11
|
ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_DELAYED_JOB_ANALYTICS_SAMPLE_RATE'.freeze
|
12
12
|
SERVICE_NAME = 'delayed_job'.freeze
|
13
|
+
CLIENT_SERVICE_NAME = 'delayed_job-client'.freeze
|
13
14
|
SPAN_JOB = 'delayed_job'.freeze
|
15
|
+
SPAN_ENQUEUE = 'delayed_job.enqueue'.freeze
|
14
16
|
TAG_ATTEMPTS = 'delayed_job.attempts'.freeze
|
15
17
|
TAG_ID = 'delayed_job.id'.freeze
|
16
18
|
TAG_PRIORITY = 'delayed_job.priority'.freeze
|