ddtrace 1.19.0 → 1.21.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +93 -2
- data/LICENSE-3rdparty.csv +1 -1
- data/bin/ddprofrb +15 -0
- data/bin/ddtracerb +3 -1
- data/ext/{ddtrace_profiling_loader/ddtrace_profiling_loader.c → datadog_profiling_loader/datadog_profiling_loader.c} +2 -2
- data/ext/{ddtrace_profiling_loader → datadog_profiling_loader}/extconf.rb +3 -3
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_cpu_and_wall_time_worker.c +237 -65
- data/ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.c +422 -0
- data/ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.h +101 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_thread_context.c +92 -2
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/extconf.rb +5 -2
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/helpers.h +4 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/http_transport.c +10 -14
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/native_extension_helpers.rb +4 -4
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/private_vm_api_access.c +14 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/private_vm_api_access.h +4 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/profiling.c +17 -1
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/ruby_helpers.c +10 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/ruby_helpers.h +2 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/time_helpers.h +2 -0
- data/lib/datadog/appsec/contrib/rack/request_middleware.rb +2 -1
- data/lib/datadog/core/configuration/components.rb +5 -5
- data/lib/datadog/core/configuration/option.rb +1 -1
- data/lib/datadog/core/configuration/settings.rb +107 -46
- data/lib/datadog/core/diagnostics/environment_logger.rb +4 -3
- data/lib/datadog/core/environment/class_count.rb +6 -6
- data/lib/datadog/core/environment/git.rb +25 -0
- data/lib/datadog/core/environment/identity.rb +18 -48
- data/lib/datadog/core/git/ext.rb +2 -23
- data/lib/datadog/core/remote/component.rb +25 -12
- data/lib/datadog/core/remote/ext.rb +1 -0
- data/lib/datadog/core/remote/negotiation.rb +2 -2
- data/lib/datadog/core/remote/tie/tracing.rb +39 -0
- data/lib/datadog/core/remote/tie.rb +27 -0
- data/lib/datadog/core/remote/worker.rb +7 -4
- data/lib/datadog/core/transport/ext.rb +2 -0
- data/lib/datadog/core/utils/url.rb +25 -0
- data/lib/datadog/opentelemetry/sdk/propagator.rb +3 -2
- data/lib/datadog/opentelemetry.rb +3 -0
- data/lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb +6 -2
- data/lib/datadog/profiling/collectors/info.rb +101 -0
- data/lib/datadog/profiling/component.rb +14 -30
- data/lib/datadog/profiling/exporter.rb +19 -5
- data/lib/datadog/profiling/ext.rb +2 -0
- data/lib/datadog/profiling/flush.rb +6 -3
- data/lib/datadog/profiling/http_transport.rb +5 -1
- data/lib/datadog/profiling/load_native_extension.rb +5 -5
- data/lib/datadog/profiling/native_extension.rb +1 -1
- data/lib/datadog/profiling/tag_builder.rb +5 -0
- data/lib/datadog/profiling/tasks/exec.rb +3 -3
- data/lib/datadog/profiling/tasks/help.rb +3 -3
- data/lib/datadog/profiling.rb +2 -2
- data/lib/datadog/tracing/configuration/ext.rb +0 -1
- data/lib/datadog/tracing/configuration/settings.rb +2 -1
- data/lib/datadog/tracing/contrib/action_cable/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/action_cable/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/action_mailer/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/action_mailer/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/action_pack/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/action_pack/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/action_view/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/action_view/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/active_job/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/active_job/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/active_model_serializers/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/active_model_serializers/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/active_record/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/active_record/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/active_support/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/active_support/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/analytics.rb +0 -1
- data/lib/datadog/tracing/contrib/aws/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/aws/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/concurrent_ruby/async_patch.rb +20 -0
- data/lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb +11 -1
- data/lib/datadog/tracing/contrib/dalli/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/dalli/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/delayed_job/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/delayed_job/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/elasticsearch/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/elasticsearch/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/ethon/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/ethon/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/excon/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/excon/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/extensions.rb +6 -2
- data/lib/datadog/tracing/contrib/faraday/configuration/settings.rb +7 -0
- data/lib/datadog/tracing/contrib/faraday/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/faraday/middleware.rb +1 -1
- data/lib/datadog/tracing/contrib/grape/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/grape/endpoint.rb +5 -0
- data/lib/datadog/tracing/contrib/grape/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/graphql/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/graphql/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/grpc/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/grpc/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/http/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/http/distributed/fetcher.rb +2 -2
- data/lib/datadog/tracing/contrib/http/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/httpclient/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/httpclient/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/httprb/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/httprb/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/kafka/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/kafka/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/mongodb/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/mongodb/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/mysql2/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/mysql2/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/opensearch/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/opensearch/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/pg/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/pg/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/pg/instrumentation.rb +11 -4
- data/lib/datadog/tracing/contrib/presto/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/presto/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/qless/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/qless/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/que/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/que/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/racecar/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/racecar/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/rack/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/rack/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/rack/middlewares.rb +37 -6
- data/lib/datadog/tracing/contrib/rails/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/rails/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/rails/patcher.rb +16 -0
- data/lib/datadog/tracing/contrib/rake/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/rake/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/redis/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/redis/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/redis/instrumentation.rb +2 -2
- data/lib/datadog/tracing/contrib/redis/patcher.rb +34 -21
- data/lib/datadog/tracing/contrib/resque/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/resque/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/rest_client/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/rest_client/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/roda/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/roda/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/sequel/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/sequel/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/shoryuken/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/shoryuken/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/sidekiq/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/sidekiq/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/sinatra/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/sinatra/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/sinatra/tracer.rb +6 -3
- data/lib/datadog/tracing/contrib/sneakers/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/sneakers/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/stripe/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/stripe/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/sucker_punch/configuration/settings.rb +1 -0
- data/lib/datadog/tracing/contrib/sucker_punch/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/trilogy/configuration/settings.rb +58 -0
- data/lib/datadog/tracing/contrib/trilogy/ext.rb +27 -0
- data/lib/datadog/tracing/contrib/trilogy/instrumentation.rb +94 -0
- data/lib/datadog/tracing/contrib/trilogy/integration.rb +43 -0
- data/lib/datadog/tracing/contrib/trilogy/patcher.rb +31 -0
- data/lib/datadog/tracing/contrib.rb +1 -0
- data/lib/datadog/tracing/metadata/ext.rb +2 -0
- data/lib/datadog/tracing/trace_operation.rb +1 -2
- data/lib/datadog/tracing/transport/http.rb +1 -0
- data/lib/datadog/tracing/transport/trace_formatter.rb +31 -0
- data/lib/datadog/tracing.rb +8 -2
- data/lib/ddtrace/version.rb +1 -1
- metadata +62 -50
- data/ext/ddtrace_profiling_native_extension/pid_controller.c +0 -57
- data/ext/ddtrace_profiling_native_extension/pid_controller.h +0 -45
- data/lib/datadog/profiling/diagnostics/environment_logger.rb +0 -39
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/NativeExtensionDesign.md +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/clock_id.h +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/clock_id_from_pthread.c +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/clock_id_noop.c +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_dynamic_sampling_rate.c +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_dynamic_sampling_rate.h +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_gc_profiling_helper.c +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_gc_profiling_helper.h +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_idle_sampling_helper.c +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_idle_sampling_helper.h +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_stack.c +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_stack.h +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_thread_context.h +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/heap_recorder.c +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/heap_recorder.h +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/libdatadog_helpers.c +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/libdatadog_helpers.h +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/setup_signal_handler.c +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/setup_signal_handler.h +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/stack_recorder.c +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/stack_recorder.h +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/time_helpers.c +0 -0
@@ -2,6 +2,7 @@ require 'date'
|
|
2
2
|
|
3
3
|
require_relative '../../../core/environment/variable_helpers'
|
4
4
|
require_relative '../../../core/backport'
|
5
|
+
require_relative '../../../core/remote/tie/tracing'
|
5
6
|
require_relative '../../client_ip'
|
6
7
|
require_relative '../../metadata/ext'
|
7
8
|
require_relative '../../propagation/http'
|
@@ -65,13 +66,17 @@ module Datadog
|
|
65
66
|
end
|
66
67
|
end
|
67
68
|
|
69
|
+
# rubocop:disable Metrics/CyclomaticComplexity
|
70
|
+
# rubocop:disable Metrics/PerceivedComplexity
|
71
|
+
# rubocop:disable Metrics/MethodLength
|
72
|
+
# rubocop:disable Metrics/AbcSize
|
68
73
|
def call(env)
|
69
74
|
# Find out if this is rack within rack
|
70
75
|
previous_request_span = env[Ext::RACK_ENV_REQUEST_SPAN]
|
71
76
|
|
72
77
|
return @app.call(env) if previous_request_span
|
73
78
|
|
74
|
-
|
79
|
+
boot = Datadog::Core::Remote::Tie.boot
|
75
80
|
|
76
81
|
# Extract distributed tracing context before creating any spans,
|
77
82
|
# so that all spans will be added to the distributed trace.
|
@@ -91,15 +96,45 @@ module Datadog
|
|
91
96
|
# we must ensure that the span `resource` is set later
|
92
97
|
request_span = Tracing.trace(Ext::SPAN_REQUEST, **trace_options)
|
93
98
|
request_span.resource = nil
|
94
|
-
|
99
|
+
|
100
|
+
# When tracing and distributed tracing are both disabled, `.active_trace` will be `nil`,
|
101
|
+
# Return a null object to continue operation
|
102
|
+
request_trace = Tracing.active_trace || TraceOperation.new
|
103
|
+
|
95
104
|
env[Ext::RACK_ENV_REQUEST_SPAN] = request_span
|
96
105
|
|
106
|
+
Datadog::Core::Remote::Tie::Tracing.tag(boot, request_span)
|
107
|
+
|
97
108
|
# Copy the original env, before the rest of the stack executes.
|
98
109
|
# Values may change; we want values before that happens.
|
99
110
|
original_env = env.dup
|
100
111
|
|
101
112
|
# call the rest of the stack
|
102
113
|
status, headers, response = @app.call(env)
|
114
|
+
|
115
|
+
if status != 404 && (last_route = request_trace.get_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE))
|
116
|
+
last_script_name = request_trace.get_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH)
|
117
|
+
|
118
|
+
# If the last_script_name is empty but the env['SCRIPT_NAME'] is NOT empty
|
119
|
+
# then the current rack request was not routed and must be accounted for
|
120
|
+
# which only happens in pure nested rack requests i.e /rack/rack/hello/world
|
121
|
+
#
|
122
|
+
# To account for the unaccounted nested rack requests of /rack/hello/world,
|
123
|
+
# we use 'PATH_INFO knowing that rack cannot have named parameters
|
124
|
+
if last_script_name == '' && env['SCRIPT_NAME'] != ''
|
125
|
+
last_script_name = last_route
|
126
|
+
last_route = env['PATH_INFO']
|
127
|
+
end
|
128
|
+
|
129
|
+
# Clear the route and route path tags from the request trace to avoid possibility of misplacement
|
130
|
+
request_trace.clear_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE)
|
131
|
+
request_trace.clear_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH)
|
132
|
+
|
133
|
+
# Ensure tags are placed in rack.request span as desired
|
134
|
+
request_span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE, last_script_name + last_route)
|
135
|
+
request_span.clear_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH)
|
136
|
+
end
|
137
|
+
|
103
138
|
[status, headers, response]
|
104
139
|
|
105
140
|
# rubocop:disable Lint/RescueException
|
@@ -135,10 +170,6 @@ module Datadog
|
|
135
170
|
end
|
136
171
|
# rubocop:enable Lint/RescueException
|
137
172
|
|
138
|
-
# rubocop:disable Metrics/AbcSize
|
139
|
-
# rubocop:disable Metrics/CyclomaticComplexity
|
140
|
-
# rubocop:disable Metrics/PerceivedComplexity
|
141
|
-
# rubocop:disable Metrics/MethodLength
|
142
173
|
def set_request_tags!(trace, request_span, env, status, headers, response, original_env)
|
143
174
|
request_header_collection = Header::RequestHeaderCollection.new(env)
|
144
175
|
|
@@ -9,6 +9,7 @@ module Datadog
|
|
9
9
|
module Ext
|
10
10
|
APP = 'rails'
|
11
11
|
ENV_ENABLED = 'DD_TRACE_RAILS_ENABLED'
|
12
|
+
# @!visibility private
|
12
13
|
ENV_ANALYTICS_ENABLED = 'DD_TRACE_RAILS_ANALYTICS_ENABLED'
|
13
14
|
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RAILS_ANALYTICS_SAMPLE_RATE'
|
14
15
|
ENV_DISABLE = 'DISABLE_DATADOG_RAILS'
|
@@ -5,11 +5,24 @@ require_relative 'log_injection'
|
|
5
5
|
require_relative 'middlewares'
|
6
6
|
require_relative 'utils'
|
7
7
|
require_relative '../semantic_logger/patcher'
|
8
|
+
require_relative 'ext'
|
8
9
|
|
9
10
|
module Datadog
|
10
11
|
module Tracing
|
11
12
|
module Contrib
|
12
13
|
module Rails
|
14
|
+
# Patcher to trace rails routing done by JourneyRouter
|
15
|
+
module JourneyRouterPatch
|
16
|
+
def find_routes(*args)
|
17
|
+
result = super
|
18
|
+
integration_route = result.first[2].path.spec.to_s.gsub(/\(\.:format\)/, '') if result.any?
|
19
|
+
request_trace = Tracing.active_trace || TraceOperation.new
|
20
|
+
request_trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE, integration_route)
|
21
|
+
request_trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH, args.first.env['SCRIPT_NAME'])
|
22
|
+
result
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
13
26
|
# Patcher enables patching of 'rails' module.
|
14
27
|
module Patcher
|
15
28
|
include Contrib::Patcher
|
@@ -41,6 +54,9 @@ module Datadog
|
|
41
54
|
# Sometimes we don't want to activate middleware e.g. OpenTracing, etc.
|
42
55
|
add_middleware(app) if Datadog.configuration.tracing[:rails][:middleware]
|
43
56
|
|
57
|
+
# ActionDispatch::Journey is not available or incompatible in Rails < 4.2.
|
58
|
+
ActionDispatch::Journey::Router.prepend(JourneyRouterPatch) if Integration.version >= Gem::Version.new('4.2')
|
59
|
+
|
44
60
|
Rails::LogInjection.configure_log_tags(app.config)
|
45
61
|
end
|
46
62
|
end
|
@@ -8,6 +8,7 @@ module Datadog
|
|
8
8
|
# @public_api Changing resource names, tag names, or environment variables creates breaking changes.
|
9
9
|
module Ext
|
10
10
|
ENV_ENABLED = 'DD_TRACE_RAKE_ENABLED'
|
11
|
+
# @!visibility private
|
11
12
|
ENV_ANALYTICS_ENABLED = 'DD_TRACE_RAKE_ANALYTICS_ENABLED'
|
12
13
|
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RAKE_ANALYTICS_SAMPLE_RATE'
|
13
14
|
SERVICE_NAME = 'rake'
|
@@ -10,6 +10,7 @@ module Datadog
|
|
10
10
|
ENV_ENABLED = 'DD_TRACE_REDIS_ENABLED'
|
11
11
|
ENV_SERVICE_NAME = 'DD_TRACE_REDIS_SERVICE_NAME'
|
12
12
|
ENV_PEER_SERVICE = 'DD_TRACE_REDIS_PEER_SERVICE'
|
13
|
+
# @!visibility private
|
13
14
|
ENV_ANALYTICS_ENABLED = 'DD_TRACE_REDIS_ANALYTICS_ENABLED'
|
14
15
|
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_REDIS_ANALYTICS_SAMPLE_RATE'
|
15
16
|
ENV_COMMAND_ARGS = 'DD_REDIS_COMMAND_ARGS'
|
@@ -28,7 +28,7 @@ module Datadog
|
|
28
28
|
private
|
29
29
|
|
30
30
|
def command_args?
|
31
|
-
pinned = Datadog.configuration_for(
|
31
|
+
pinned = Datadog.configuration_for(self, :command_args)
|
32
32
|
|
33
33
|
return pinned unless pinned.nil?
|
34
34
|
|
@@ -36,7 +36,7 @@ module Datadog
|
|
36
36
|
end
|
37
37
|
|
38
38
|
def service_name
|
39
|
-
Datadog.configuration_for(
|
39
|
+
Datadog.configuration_for(self, :service_name) ||
|
40
40
|
datadog_configuration[:service_name]
|
41
41
|
end
|
42
42
|
|
@@ -10,38 +10,48 @@ module Datadog
|
|
10
10
|
module Patcher
|
11
11
|
include Contrib::Patcher
|
12
12
|
|
13
|
-
# Patch for redis instance
|
14
|
-
module
|
13
|
+
# Patch for redis instance (with redis < 5)
|
14
|
+
module DatadogPinPatch
|
15
15
|
def self.included(base)
|
16
16
|
base.prepend(InstanceMethods)
|
17
17
|
end
|
18
18
|
|
19
19
|
# Instance method patch for redis instance
|
20
20
|
module InstanceMethods
|
21
|
-
|
22
|
-
|
23
|
-
|
21
|
+
def datadog_pin=(pin)
|
22
|
+
pin.onto(datadog_target)
|
23
|
+
end
|
24
|
+
|
25
|
+
def datadog_target
|
26
|
+
# For `redis-rb` 4.x
|
27
|
+
return _client if respond_to?(:_client)
|
28
|
+
# For `redis-rb` 3.x
|
29
|
+
return client if respond_to?(:client)
|
30
|
+
|
31
|
+
Datadog.logger.warn 'Fail to apply configuration on redis client instance with ' \
|
32
|
+
'`Datadog.configure_onto(redis)`.'
|
33
|
+
|
34
|
+
# Null object instead of raising error
|
35
|
+
self
|
24
36
|
end
|
25
37
|
end
|
26
38
|
end
|
27
39
|
|
28
|
-
# Patch for redis
|
29
|
-
module
|
40
|
+
# Patch for redis instance (with redis >= 5)
|
41
|
+
module NotSupportedNoticePatch
|
30
42
|
def self.included(base)
|
31
43
|
base.prepend(InstanceMethods)
|
32
44
|
end
|
33
45
|
|
34
|
-
# Instance method patch for redis
|
46
|
+
# Instance method patch for redis instance
|
35
47
|
module InstanceMethods
|
36
|
-
def
|
37
|
-
|
38
|
-
|
39
|
-
|
48
|
+
def datadog_pin=(_pin)
|
49
|
+
Datadog.logger.warn \
|
50
|
+
'`Datadog.configure_onto(redis)` is not supported on Redis 5+. To instrument '\
|
51
|
+
"a redis instance with custom configuration, please initialize it with:\n"\
|
52
|
+
" `Redis.new(..., custom: { datadog: { service_name: 'my-service' } })`.\n\n" \
|
53
|
+
'See: https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md#redis'
|
40
54
|
end
|
41
|
-
|
42
|
-
private
|
43
|
-
|
44
|
-
attr_reader :redis_instance
|
45
55
|
end
|
46
56
|
end
|
47
57
|
|
@@ -62,12 +72,15 @@ module Datadog
|
|
62
72
|
::RedisClient.register(TraceMiddleware)
|
63
73
|
end
|
64
74
|
|
65
|
-
if Integration.redis_compatible?
|
66
|
-
|
75
|
+
if Integration.redis_compatible?
|
76
|
+
if Integration.redis_version < Gem::Version.new('5.0.0')
|
77
|
+
require_relative 'instrumentation'
|
67
78
|
|
68
|
-
|
69
|
-
|
70
|
-
|
79
|
+
::Redis.include(DatadogPinPatch)
|
80
|
+
::Redis::Client.include(Instrumentation)
|
81
|
+
else # warn about non-supported configure_onto usage
|
82
|
+
::Redis.include(NotSupportedNoticePatch)
|
83
|
+
end
|
71
84
|
end
|
72
85
|
end
|
73
86
|
end
|
@@ -8,6 +8,7 @@ module Datadog
|
|
8
8
|
# @public_api Changing resource names, tag names, or environment variables creates breaking changes.
|
9
9
|
module Ext
|
10
10
|
ENV_ENABLED = 'DD_TRACE_RESQUE_ENABLED'
|
11
|
+
# @!visibility private
|
11
12
|
ENV_ANALYTICS_ENABLED = 'DD_TRACE_RESQUE_ANALYTICS_ENABLED'
|
12
13
|
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RESQUE_ANALYTICS_SAMPLE_RATE'
|
13
14
|
SERVICE_NAME = 'resque'
|
@@ -10,6 +10,7 @@ module Datadog
|
|
10
10
|
ENV_ENABLED = 'DD_TRACE_REST_CLIENT_ENABLED'
|
11
11
|
ENV_SERVICE_NAME = 'DD_TRACE_REST_CLIENT_SERVICE_NAME'
|
12
12
|
ENV_PEER_SERVICE = 'DD_TRACE_REST_CLIENT_PEER_SERVICE'
|
13
|
+
# @!visibility private
|
13
14
|
ENV_ANALYTICS_ENABLED = 'DD_TRACE_REST_CLIENT_ANALYTICS_ENABLED'
|
14
15
|
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_REST_CLIENT_ANALYTICS_SAMPLE_RATE'
|
15
16
|
DEFAULT_PEER_SERVICE_NAME = 'rest_client'
|
@@ -8,6 +8,7 @@ module Datadog
|
|
8
8
|
# @public_api Changing resource names, tag names, or environment variables creates breaking changes.
|
9
9
|
module Ext
|
10
10
|
ENV_ENABLED = 'DD_TRACE_SEQUEL_ENABLED'
|
11
|
+
# @!visibility private
|
11
12
|
ENV_ANALYTICS_ENABLED = 'DD_TRACE_SEQUEL_ANALYTICS_ENABLED'
|
12
13
|
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SEQUEL_ANALYTICS_SAMPLE_RATE'
|
13
14
|
SPAN_QUERY = 'sequel.query'
|
@@ -8,6 +8,7 @@ module Datadog
|
|
8
8
|
# @public_api Changing resource names, tag names, or environment variables creates breaking changes.
|
9
9
|
module Ext
|
10
10
|
ENV_ENABLED = 'DD_TRACE_SHORYUKEN_ENABLED'
|
11
|
+
# @!visibility private
|
11
12
|
ENV_ANALYTICS_ENABLED = 'DD_TRACE_SHORYUKEN_ANALYTICS_ENABLED'
|
12
13
|
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SHORYUKEN_ANALYTICS_SAMPLE_RATE'
|
13
14
|
SERVICE_NAME = 'shoryuken'
|
@@ -9,6 +9,7 @@ module Datadog
|
|
9
9
|
module Ext
|
10
10
|
CLIENT_SERVICE_NAME = 'sidekiq-client'
|
11
11
|
ENV_ENABLED = 'DD_TRACE_SIDEKIQ_ENABLED'
|
12
|
+
# @!visibility private
|
12
13
|
ENV_ANALYTICS_ENABLED = 'DD_TRACE_SIDEKIQ_ANALYTICS_ENABLED'
|
13
14
|
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SIDEKIQ_ANALYTICS_SAMPLE_RATE'
|
14
15
|
ENV_TAG_JOB_ARGS = 'DD_SIDEKIQ_TAG_JOB_ARGS'
|
@@ -8,6 +8,7 @@ module Datadog
|
|
8
8
|
# @public_api Changing resource names, tag names, or environment variables creates breaking changes.
|
9
9
|
module Ext
|
10
10
|
ENV_ENABLED = 'DD_TRACE_SINATRA_ENABLED'
|
11
|
+
# @!visibility private
|
11
12
|
ENV_ANALYTICS_ENABLED = 'DD_TRACE_SINATRA_ANALYTICS_ENABLED'
|
12
13
|
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SINATRA_ANALYTICS_SAMPLE_RATE'
|
13
14
|
RACK_ENV_SINATRA_REQUEST_SPAN = 'datadog.sinatra_request_span'
|
@@ -47,16 +47,16 @@ module Datadog
|
|
47
47
|
configuration = Datadog.configuration.tracing[:sinatra]
|
48
48
|
return super unless Tracing.enabled?
|
49
49
|
|
50
|
-
|
50
|
+
integration_route = Sinatra::Env.route_path(env)
|
51
51
|
|
52
52
|
Tracing.trace(
|
53
53
|
Ext::SPAN_ROUTE,
|
54
54
|
service: configuration[:service_name],
|
55
55
|
span_type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
|
56
|
-
resource: "#{request.request_method} #{
|
56
|
+
resource: "#{request.request_method} #{integration_route}",
|
57
57
|
) do |span, trace|
|
58
58
|
span.set_tag(Ext::TAG_APP_NAME, settings.name || settings.superclass.name)
|
59
|
-
span.set_tag(Ext::TAG_ROUTE_PATH,
|
59
|
+
span.set_tag(Ext::TAG_ROUTE_PATH, integration_route)
|
60
60
|
|
61
61
|
if request.script_name && !request.script_name.empty?
|
62
62
|
span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name)
|
@@ -73,6 +73,9 @@ module Datadog
|
|
73
73
|
|
74
74
|
Contrib::Analytics.set_measured(span)
|
75
75
|
|
76
|
+
_, path = env['sinatra.route'].split(' ', 2)
|
77
|
+
trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE, path)
|
78
|
+
trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH, env['SCRIPT_NAME'])
|
76
79
|
super
|
77
80
|
end
|
78
81
|
end
|
@@ -8,6 +8,7 @@ module Datadog
|
|
8
8
|
# @public_api Changing resource names, tag names, or environment variables creates breaking changes.
|
9
9
|
module Ext
|
10
10
|
ENV_ENABLED = 'DD_TRACE_SNEAKERS_ENABLED'
|
11
|
+
# @!visibility private
|
11
12
|
ENV_ANALYTICS_ENABLED = 'DD_TRACE_SNEAKERS_ANALYTICS_ENABLED'
|
12
13
|
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SNEAKERS_ANALYTICS_SAMPLE_RATE'
|
13
14
|
SERVICE_NAME = 'sneakers'
|
@@ -8,6 +8,7 @@ module Datadog
|
|
8
8
|
# @public_api Changing resource names, tag names, or environment variables creates breaking changes.
|
9
9
|
module Ext
|
10
10
|
ENV_ENABLED = 'DD_TRACE_STRIPE_ENABLED'
|
11
|
+
# @!visibility private
|
11
12
|
ENV_ANALYTICS_ENABLED = 'DD_TRACE_STRIPE_ANALYTICS_ENABLED'
|
12
13
|
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_STRIPE_ANALYTICS_SAMPLE_RATE'
|
13
14
|
SPAN_REQUEST = 'stripe.request'
|
@@ -8,6 +8,7 @@ module Datadog
|
|
8
8
|
# @public_api Changing resource names, tag names, or environment variables creates breaking changes.
|
9
9
|
module Ext
|
10
10
|
ENV_ENABLED = 'DD_TRACE_SUCKER_PUNCH_ENABLED'
|
11
|
+
# @!visibility private
|
11
12
|
ENV_ANALYTICS_ENABLED = 'DD_TRACE_SUCKER_PUNCH_ANALYTICS_ENABLED'
|
12
13
|
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SUCKER_PUNCH_ANALYTICS_SAMPLE_RATE'
|
13
14
|
SERVICE_NAME = 'sucker_punch'
|
@@ -0,0 +1,58 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative '../../configuration/settings'
|
4
|
+
require_relative '../ext'
|
5
|
+
|
6
|
+
require_relative '../../propagation/sql_comment'
|
7
|
+
|
8
|
+
module Datadog
|
9
|
+
module Tracing
|
10
|
+
module Contrib
|
11
|
+
module Trilogy
|
12
|
+
module Configuration
|
13
|
+
# Custom settings for the Trilogy integration
|
14
|
+
# @public_api
|
15
|
+
class Settings < Contrib::Configuration::Settings
|
16
|
+
option :enabled do |o|
|
17
|
+
o.type :bool
|
18
|
+
o.env Ext::ENV_ENABLED
|
19
|
+
o.default true
|
20
|
+
end
|
21
|
+
|
22
|
+
option :analytics_enabled do |o|
|
23
|
+
o.type :bool
|
24
|
+
o.env Ext::ENV_ANALYTICS_ENABLED
|
25
|
+
o.default false
|
26
|
+
end
|
27
|
+
|
28
|
+
option :analytics_sample_rate do |o|
|
29
|
+
o.type :float
|
30
|
+
o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
|
31
|
+
o.default 1.0
|
32
|
+
end
|
33
|
+
|
34
|
+
option :service_name do |o|
|
35
|
+
o.default do
|
36
|
+
Contrib::SpanAttributeSchema.fetch_service_name(
|
37
|
+
Ext::ENV_SERVICE_NAME,
|
38
|
+
Ext::DEFAULT_PEER_SERVICE_NAME
|
39
|
+
)
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
option :comment_propagation do |o|
|
44
|
+
o.type :string
|
45
|
+
o.env Contrib::Propagation::SqlComment::Ext::ENV_DBM_PROPAGATION_MODE
|
46
|
+
o.default Contrib::Propagation::SqlComment::Ext::DISABLED
|
47
|
+
end
|
48
|
+
|
49
|
+
option :peer_service do |o|
|
50
|
+
o.type :string, nilable: true
|
51
|
+
o.env Ext::ENV_PEER_SERVICE
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
@@ -0,0 +1,27 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Datadog
|
4
|
+
module Tracing
|
5
|
+
module Contrib
|
6
|
+
module Trilogy
|
7
|
+
# Trilogy integration constants
|
8
|
+
# @public_api Changing resource names, tag names, or environment variables creates breaking changes.
|
9
|
+
module Ext
|
10
|
+
ENV_ENABLED = 'DD_TRACE_TRILOGY_ENABLED'
|
11
|
+
ENV_SERVICE_NAME = 'DD_TRACE_TRILOGY_SERVICE_NAME'
|
12
|
+
ENV_PEER_SERVICE = 'DD_TRACE_TRILOGY_PEER_SERVICE'
|
13
|
+
|
14
|
+
ENV_ANALYTICS_ENABLED = 'DD_TRACE_TRILOGY_ANALYTICS_ENABLED'
|
15
|
+
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_TRILOGY_ANALYTICS_SAMPLE_RATE'
|
16
|
+
DEFAULT_PEER_SERVICE_NAME = 'trilogy'
|
17
|
+
SPAN_QUERY = 'trilogy.query'
|
18
|
+
TAG_DB_NAME = 'trilogy.db.name'
|
19
|
+
TAG_COMPONENT = 'trilogy'
|
20
|
+
TAG_OPERATION_QUERY = 'query'
|
21
|
+
TAG_SYSTEM = 'mysql'
|
22
|
+
PEER_SERVICE_SOURCES = (Array[Ext::TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|