datadog 2.48.0 → 2.49.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +47 -1
- data/ext/datadog_profiling_native_extension/collectors_stack.c +1 -1
- data/ext/datadog_profiling_native_extension/collectors_stack.h +4 -2
- data/ext/datadog_profiling_native_extension/extconf.rb +3 -0
- data/ext/datadog_profiling_native_extension/private_vm_api_access.c +13 -21
- data/ext/libdatadog_api/extconf.rb +2 -0
- data/ext/libdatadog_api/feature_flags.c +137 -0
- data/ext/libdatadog_api/process_discovery.c +3 -3
- data/ext/libdatadog_extconf_helpers.rb +1 -1
- data/lib/datadog/ai_guard/contrib/rack/patcher.rb +3 -5
- data/lib/datadog/ai_guard/contrib/rails/patcher.rb +7 -9
- data/lib/datadog/ai_guard/contrib/ruby_llm/patcher.rb +3 -5
- data/lib/datadog/ai_guard/metrics/telemetry.rb +2 -4
- data/lib/datadog/appsec/actions_handler.rb +5 -7
- data/lib/datadog/appsec/api_security/endpoint_collection/grape_route_serializer.rb +1 -3
- data/lib/datadog/appsec/api_security/endpoint_collection/rails_route_serializer.rb +1 -3
- data/lib/datadog/appsec/api_security/endpoint_collection/sinatra_route_serializer.rb +1 -3
- data/lib/datadog/appsec/assets.rb +8 -10
- data/lib/datadog/appsec/configuration.rb +1 -1
- data/lib/datadog/appsec/context.rb +63 -6
- data/lib/datadog/appsec/contrib/active_record/instrumentation.rb +1 -3
- data/lib/datadog/appsec/contrib/active_record/patcher.rb +21 -24
- data/lib/datadog/appsec/contrib/aws_lambda/patcher.rb +3 -5
- data/lib/datadog/appsec/contrib/aws_lambda/waf_addresses.rb +9 -11
- data/lib/datadog/appsec/contrib/devise/configuration.rb +2 -4
- data/lib/datadog/appsec/contrib/devise/patcher.rb +3 -5
- data/lib/datadog/appsec/contrib/excon/patcher.rb +3 -5
- data/lib/datadog/appsec/contrib/faraday/patcher.rb +4 -6
- data/lib/datadog/appsec/contrib/graphql/patcher.rb +3 -5
- data/lib/datadog/appsec/contrib/rack/input_peeker.rb +3 -5
- data/lib/datadog/appsec/contrib/rack/patcher.rb +3 -5
- data/lib/datadog/appsec/contrib/rack/request_body_middleware.rb +5 -4
- data/lib/datadog/appsec/contrib/rack/request_middleware.rb +6 -7
- data/lib/datadog/appsec/contrib/rails/patcher.rb +19 -16
- data/lib/datadog/appsec/contrib/rails/patches/live_thread_patch.rb +33 -0
- data/lib/datadog/appsec/contrib/rest_client/patcher.rb +3 -5
- data/lib/datadog/appsec/contrib/sinatra/patcher.rb +4 -6
- data/lib/datadog/appsec/default_header_tags.rb +2 -4
- data/lib/datadog/appsec/metrics/exporter.rb +4 -6
- data/lib/datadog/appsec/metrics/telemetry.rb +1 -3
- data/lib/datadog/appsec/metrics/telemetry_exporter.rb +2 -4
- data/lib/datadog/appsec/route_normalizer/route_text.rb +1 -3
- data/lib/datadog/appsec/route_normalizer.rb +4 -6
- data/lib/datadog/appsec/utils/http/body_reader.rb +3 -5
- data/lib/datadog/appsec/utils/http/url_encoded.rb +2 -4
- data/lib/datadog/core/borrowing_token_bucket.rb +60 -0
- data/lib/datadog/core/chunker.rb +1 -3
- data/lib/datadog/core/configuration/components.rb +48 -17
- data/lib/datadog/core/configuration/settings.rb +2 -1
- data/lib/datadog/core/configuration/supported_configurations.rb +2 -0
- data/lib/datadog/core/diagnostics/environment_logger.rb +1 -6
- data/lib/datadog/core/encoding.rb +8 -12
- data/lib/datadog/core/environment/cgroup.rb +3 -5
- data/lib/datadog/core/environment/container.rb +9 -11
- data/lib/datadog/core/environment/ext.rb +1 -6
- data/lib/datadog/core/environment/gc.rb +2 -4
- data/lib/datadog/core/environment/identity.rb +13 -15
- data/lib/datadog/core/environment/platform.rb +10 -12
- data/lib/datadog/core/environment/socket.rb +3 -5
- data/lib/datadog/core/environment/thread_count.rb +2 -4
- data/lib/datadog/core/environment/variable_helpers.rb +2 -6
- data/lib/datadog/core/environment/vm_cache.rb +5 -7
- data/lib/datadog/core/environment/yjit.rb +25 -24
- data/lib/datadog/core/logger.rb +5 -2
- data/lib/datadog/core/metrics/client.rb +8 -16
- data/lib/datadog/core/metrics/helpers.rb +3 -0
- data/lib/datadog/core/metrics/metric.rb +3 -1
- data/lib/datadog/core/rate_limiter.rb +9 -31
- data/lib/datadog/core/refillable_bucket.rb +72 -0
- data/lib/datadog/core/remote/client/capabilities.rb +4 -0
- data/lib/datadog/core/remote/client.rb +1 -5
- data/lib/datadog/core/remote/transport/http.rb +2 -4
- data/lib/datadog/core/tag_normalizer.rb +0 -2
- data/lib/datadog/core/telemetry/configuration_value.rb +1 -3
- data/lib/datadog/core/telemetry/transport/http.rb +2 -4
- data/lib/datadog/core/telemetry/worker.rb +30 -24
- data/lib/datadog/core/transport/http.rb +2 -4
- data/lib/datadog/core/utils/at_fork_monkey_patch.rb +2 -2
- data/lib/datadog/core/utils/forking.rb +1 -1
- data/lib/datadog/core/utils/lru_cache.rb +2 -2
- data/lib/datadog/core/utils/network.rb +1 -1
- data/lib/datadog/core/utils/time.rb +2 -2
- data/lib/datadog/core/utils/truncation.rb +1 -3
- data/lib/datadog/core/workers/async.rb +16 -14
- data/lib/datadog/core/workers/runtime_metrics.rb +1 -1
- data/lib/datadog/data_streams/transport/http.rb +1 -3
- data/lib/datadog/di/component.rb +14 -2
- data/lib/datadog/di/context.rb +50 -0
- data/lib/datadog/di/contrib.rb +2 -2
- data/lib/datadog/di/correlation_sampler/trace_budget.rb +75 -0
- data/lib/datadog/di/correlation_sampler/trace_budget_ledger/entry.rb +34 -0
- data/lib/datadog/di/correlation_sampler/trace_budget_ledger.rb +104 -0
- data/lib/datadog/di/correlation_sampler.rb +224 -0
- data/lib/datadog/di/guardrails_telemetry/reason.rb +8 -3
- data/lib/datadog/di/instrumenter.rb +294 -109
- data/lib/datadog/di/probe.rb +13 -2
- data/lib/datadog/di/probe_builder.rb +6 -8
- data/lib/datadog/di/probe_file_loader.rb +2 -2
- data/lib/datadog/di/probe_manager.rb +7 -30
- data/lib/datadog/di/probe_notification_builder.rb +42 -11
- data/lib/datadog/di/probe_notifier_worker.rb +11 -0
- data/lib/datadog/di/snapshot_pruner/node.rb +190 -0
- data/lib/datadog/di/snapshot_pruner/node_queue.rb +104 -0
- data/lib/datadog/di/snapshot_pruner/parser.rb +102 -0
- data/lib/datadog/di/snapshot_pruner.rb +128 -0
- data/lib/datadog/di/transport/input.rb +75 -15
- data/lib/datadog/di/utils.rb +3 -3
- data/lib/datadog/di.rb +29 -0
- data/lib/datadog/error_tracking/filters.rb +6 -8
- data/lib/datadog/open_feature/agentless/parser.rb +2 -4
- data/lib/datadog/open_feature/component.rb +24 -2
- data/lib/datadog/open_feature/configuration.rb +13 -0
- data/lib/datadog/open_feature/evaluation_engine.rb +5 -5
- data/lib/datadog/open_feature/exposure_hook.rb +146 -0
- data/lib/datadog/open_feature/exposures/event.rb +10 -8
- data/lib/datadog/open_feature/exposures/reporter.rb +34 -25
- data/lib/datadog/open_feature/ext.rb +12 -0
- data/lib/datadog/open_feature/flag_evaluation/aggregator.rb +10 -8
- data/lib/datadog/open_feature/flag_evaluation/writer.rb +9 -6
- data/lib/datadog/open_feature/hooks/exposure_logging_hook.rb +58 -0
- data/lib/datadog/open_feature/hooks/flag_eval_evp_hook.rb +4 -2
- data/lib/datadog/open_feature/hooks/flag_eval_metrics_hook.rb +3 -5
- data/lib/datadog/open_feature/hooks/span_enrichment_hook/codec.rb +3 -5
- data/lib/datadog/open_feature/native_evaluator.rb +30 -2
- data/lib/datadog/open_feature/noop_evaluator.rb +3 -1
- data/lib/datadog/open_feature/provider.rb +54 -4
- data/lib/datadog/open_feature/resolution_details.rb +1 -0
- data/lib/datadog/open_feature/split_features.rb +76 -0
- data/lib/datadog/opentelemetry/sdk/propagator.rb +5 -2
- data/lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb +28 -31
- data/lib/datadog/profiling/component.rb +31 -9
- data/lib/datadog/profiling/profiler.rb +6 -0
- data/lib/datadog/profiling/remote.rb +381 -0
- data/lib/datadog/profiling/worker_state.rb +65 -0
- data/lib/datadog/profiling.rb +1 -0
- data/lib/datadog/symbol_database/file_hash.rb +1 -3
- data/lib/datadog/tracing/component.rb +14 -16
- data/lib/datadog/tracing/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/action_cable/events/broadcast.rb +4 -6
- data/lib/datadog/tracing/contrib/action_cable/events/perform_action.rb +4 -6
- data/lib/datadog/tracing/contrib/action_cable/events/transmit.rb +4 -6
- data/lib/datadog/tracing/contrib/action_cable/events.rb +3 -5
- data/lib/datadog/tracing/contrib/action_cable/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/action_mailer/events/deliver.rb +5 -7
- data/lib/datadog/tracing/contrib/action_mailer/events/process.rb +4 -6
- data/lib/datadog/tracing/contrib/action_mailer/events.rb +3 -5
- data/lib/datadog/tracing/contrib/action_mailer/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/action_pack/action_controller/instrumentation.rb +2 -4
- data/lib/datadog/tracing/contrib/action_pack/action_controller/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/action_pack/action_dispatch/instrumentation.rb +2 -4
- data/lib/datadog/tracing/contrib/action_pack/action_dispatch/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/action_pack/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/action_view/events/render_partial.rb +3 -5
- data/lib/datadog/tracing/contrib/action_view/events/render_template.rb +3 -5
- data/lib/datadog/tracing/contrib/action_view/events.rb +3 -5
- data/lib/datadog/tracing/contrib/action_view/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/action_view/utils.rb +1 -3
- data/lib/datadog/tracing/contrib/active_job/events/discard.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/events/enqueue.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/events/enqueue_at.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/events/enqueue_retry.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/events/perform.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/events/retry_stopped.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/events.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/active_model_serializers/events/render.rb +4 -6
- data/lib/datadog/tracing/contrib/active_model_serializers/events/serialize.rb +4 -6
- data/lib/datadog/tracing/contrib/active_model_serializers/events.rb +3 -5
- data/lib/datadog/tracing/contrib/active_model_serializers/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/active_record/events/instantiation.rb +4 -6
- data/lib/datadog/tracing/contrib/active_record/events/sql.rb +3 -5
- data/lib/datadog/tracing/contrib/active_record/events.rb +3 -5
- data/lib/datadog/tracing/contrib/active_record/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/active_support/cache/events/cache.rb +8 -10
- data/lib/datadog/tracing/contrib/active_support/cache/events.rb +3 -5
- data/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb +5 -7
- data/lib/datadog/tracing/contrib/active_support/cache/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/active_support/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/analytics.rb +4 -6
- data/lib/datadog/tracing/contrib/aws/patcher.rb +5 -7
- data/lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb +5 -7
- data/lib/datadog/tracing/contrib/configuration/settings.rb +17 -0
- data/lib/datadog/tracing/contrib/dalli/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/dalli/quantize.rb +1 -3
- data/lib/datadog/tracing/contrib/delayed_job/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/elasticsearch/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/elasticsearch/quantize.rb +6 -8
- data/lib/datadog/tracing/contrib/ethon/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/excon/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/faraday/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/grape/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/graphql/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/graphql/trace_patcher.rb +1 -3
- data/lib/datadog/tracing/contrib/graphql/tracing_patcher.rb +1 -3
- data/lib/datadog/tracing/contrib/graphql/unified_trace_patcher.rb +1 -3
- data/lib/datadog/tracing/contrib/grpc/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/hanami/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/http/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/httpclient/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/httprb/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/kafka/events/connection/request.rb +4 -6
- data/lib/datadog/tracing/contrib/kafka/events/consumer/process_batch.rb +3 -5
- data/lib/datadog/tracing/contrib/kafka/events/consumer/process_message.rb +3 -5
- data/lib/datadog/tracing/contrib/kafka/events/consumer_group/heartbeat.rb +3 -5
- data/lib/datadog/tracing/contrib/kafka/events/consumer_group/join_group.rb +2 -4
- data/lib/datadog/tracing/contrib/kafka/events/consumer_group/leave_group.rb +2 -4
- data/lib/datadog/tracing/contrib/kafka/events/consumer_group/sync_group.rb +2 -4
- data/lib/datadog/tracing/contrib/kafka/events/produce_operation/send_messages.rb +4 -6
- data/lib/datadog/tracing/contrib/kafka/events/producer/deliver_messages.rb +4 -6
- data/lib/datadog/tracing/contrib/kafka/events.rb +3 -5
- data/lib/datadog/tracing/contrib/kafka/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/karafka/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/lograge/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/mongodb/parsers.rb +5 -7
- data/lib/datadog/tracing/contrib/mongodb/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/mysql2/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/opensearch/patcher.rb +1 -3
- data/lib/datadog/tracing/contrib/opensearch/quantize.rb +5 -7
- data/lib/datadog/tracing/contrib/pg/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/presto/patcher.rb +1 -3
- data/lib/datadog/tracing/contrib/que/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/racecar/events/batch.rb +3 -5
- data/lib/datadog/tracing/contrib/racecar/events/consume.rb +3 -5
- data/lib/datadog/tracing/contrib/racecar/events/message.rb +3 -5
- data/lib/datadog/tracing/contrib/racecar/events.rb +3 -5
- data/lib/datadog/tracing/contrib/racecar/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/rack/patcher.rb +13 -19
- data/lib/datadog/tracing/contrib/rack/request_queue.rb +1 -3
- data/lib/datadog/tracing/contrib/rack/route_inference.rb +4 -6
- data/lib/datadog/tracing/contrib/rack/trace_proxy_middleware.rb +4 -6
- data/lib/datadog/tracing/contrib/rails/configuration/settings.rb +4 -0
- data/lib/datadog/tracing/contrib/rails/ext.rb +2 -0
- data/lib/datadog/tracing/contrib/rails/framework.rb +6 -8
- data/lib/datadog/tracing/contrib/rails/log_injection.rb +1 -3
- data/lib/datadog/tracing/contrib/rails/patcher.rb +9 -11
- data/lib/datadog/tracing/contrib/rake/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/redis/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/redis/quantize.rb +7 -9
- data/lib/datadog/tracing/contrib/resque/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/rest_client/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/roda/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/semantic_logger/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/sequel/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/shoryuken/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/sidekiq/patcher.rb +7 -9
- data/lib/datadog/tracing/contrib/sinatra/env.rb +3 -5
- data/lib/datadog/tracing/contrib/sinatra/patcher.rb +5 -7
- data/lib/datadog/tracing/contrib/sneakers/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/stripe/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/stripe/request.rb +4 -6
- data/lib/datadog/tracing/contrib/sucker_punch/exception_handler.rb +1 -3
- data/lib/datadog/tracing/contrib/sucker_punch/instrumentation.rb +1 -3
- data/lib/datadog/tracing/contrib/sucker_punch/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/support.rb +1 -3
- data/lib/datadog/tracing/contrib/trilogy/configuration/settings.rb +4 -0
- data/lib/datadog/tracing/contrib/trilogy/instrumentation.rb +2 -1
- data/lib/datadog/tracing/contrib/trilogy/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/utils/database.rb +1 -3
- data/lib/datadog/tracing/contrib/utils/quantization/hash_formatter.rb +8 -10
- data/lib/datadog/tracing/contrib/utils/quantization/http.rb +11 -13
- data/lib/datadog/tracing/contrib/waterdrop/patcher.rb +3 -5
- data/lib/datadog/tracing/correlation.rb +3 -5
- data/lib/datadog/tracing/distributed/propagation.rb +2 -2
- data/lib/datadog/tracing/distributed/propagation_policy.rb +1 -3
- data/lib/datadog/tracing/distributed/trace_state/datadog.rb +5 -5
- data/lib/datadog/tracing/distributed/trace_state/open_telemetry.rb +2 -2
- data/lib/datadog/tracing/metadata/ext.rb +3 -9
- data/lib/datadog/tracing/remote.rb +1 -1
- data/lib/datadog/tracing/trace_operation.rb +11 -3
- data/lib/datadog/tracing/tracer.rb +9 -1
- data/lib/datadog/tracing/transport/http.rb +1 -3
- data/lib/datadog/tracing/transport/io.rb +2 -4
- data/lib/datadog/tracing/transport/traces.rb +1 -3
- data/lib/datadog/tracing/utils.rb +4 -6
- data/lib/datadog/version.rb +1 -1
- metadata +22 -6
|
@@ -14,17 +14,15 @@ module Datadog
|
|
|
14
14
|
|
|
15
15
|
EVENT_NAME = "process_message.racecar"
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
def event_name
|
|
17
|
+
def self.event_name
|
|
20
18
|
self::EVENT_NAME
|
|
21
19
|
end
|
|
22
20
|
|
|
23
|
-
def span_name
|
|
21
|
+
def self.span_name
|
|
24
22
|
Ext::SPAN_MESSAGE
|
|
25
23
|
end
|
|
26
24
|
|
|
27
|
-
def span_options
|
|
25
|
+
def self.span_options
|
|
28
26
|
super.merge(
|
|
29
27
|
tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_MESSAGE,
|
|
30
28
|
Tracing::Metadata::Ext::TAG_KIND => Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER},
|
|
@@ -16,17 +16,15 @@ module Datadog
|
|
|
16
16
|
Events::Message,
|
|
17
17
|
].freeze
|
|
18
18
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
def all
|
|
19
|
+
def self.all
|
|
22
20
|
self::ALL
|
|
23
21
|
end
|
|
24
22
|
|
|
25
|
-
def subscriptions
|
|
23
|
+
def self.subscriptions
|
|
26
24
|
all.collect(&:subscriptions).collect(&:to_a).flatten
|
|
27
25
|
end
|
|
28
26
|
|
|
29
|
-
def subscribe!
|
|
27
|
+
def self.subscribe!
|
|
30
28
|
all.each(&:subscribe!)
|
|
31
29
|
end
|
|
32
30
|
end
|
|
@@ -12,13 +12,11 @@ module Datadog
|
|
|
12
12
|
module Patcher
|
|
13
13
|
include Contrib::Patcher
|
|
14
14
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
def target_version
|
|
15
|
+
def self.target_version
|
|
18
16
|
Integration.version
|
|
19
17
|
end
|
|
20
18
|
|
|
21
|
-
def patch
|
|
19
|
+
def self.patch
|
|
22
20
|
# Subscribe to Racecar events
|
|
23
21
|
Events.subscribe!
|
|
24
22
|
end
|
|
@@ -8,13 +8,11 @@ module Datadog
|
|
|
8
8
|
module MiddlewarePatcher
|
|
9
9
|
include Contrib::Patcher
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
def target_version
|
|
11
|
+
def self.target_version
|
|
14
12
|
Integration.version
|
|
15
13
|
end
|
|
16
14
|
|
|
17
|
-
def patch
|
|
15
|
+
def self.patch
|
|
18
16
|
# Patch middleware
|
|
19
17
|
require_relative "middlewares"
|
|
20
18
|
end
|
|
@@ -24,17 +22,15 @@ module Datadog
|
|
|
24
22
|
module MiddlewareNamePatcher
|
|
25
23
|
include Contrib::Patcher
|
|
26
24
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
def target_version
|
|
25
|
+
def self.target_version
|
|
30
26
|
Integration.version
|
|
31
27
|
end
|
|
32
28
|
|
|
33
|
-
def patch
|
|
29
|
+
def self.patch
|
|
34
30
|
patch_middleware_names
|
|
35
31
|
end
|
|
36
32
|
|
|
37
|
-
def patch_middleware_names
|
|
33
|
+
def self.patch_middleware_names
|
|
38
34
|
retain_middleware_name(get_option(:application))
|
|
39
35
|
rescue => e
|
|
40
36
|
# We can safely ignore these exceptions since they happen only in the
|
|
@@ -44,7 +40,7 @@ module Datadog
|
|
|
44
40
|
Datadog.logger.debug("Error patching middleware stack: #{e.class}: #{e.message}")
|
|
45
41
|
end
|
|
46
42
|
|
|
47
|
-
def retain_middleware_name(middleware)
|
|
43
|
+
def self.retain_middleware_name(middleware)
|
|
48
44
|
return unless middleware&.respond_to?(:call)
|
|
49
45
|
|
|
50
46
|
middleware.singleton_class.class_eval do
|
|
@@ -61,7 +57,7 @@ module Datadog
|
|
|
61
57
|
retain_middleware_name(following)
|
|
62
58
|
end
|
|
63
59
|
|
|
64
|
-
def get_option(option)
|
|
60
|
+
def self.get_option(option)
|
|
65
61
|
Datadog.configuration.tracing[:rack].get_option(option)
|
|
66
62
|
end
|
|
67
63
|
end
|
|
@@ -73,17 +69,15 @@ module Datadog
|
|
|
73
69
|
MiddlewareNamePatcher,
|
|
74
70
|
].freeze
|
|
75
71
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
def patched?
|
|
72
|
+
def self.patched?
|
|
79
73
|
PATCHERS.all?(&:patched?)
|
|
80
74
|
end
|
|
81
75
|
|
|
82
|
-
def target_version
|
|
76
|
+
def self.target_version
|
|
83
77
|
Integration.version
|
|
84
78
|
end
|
|
85
79
|
|
|
86
|
-
def patch
|
|
80
|
+
def self.patch
|
|
87
81
|
MiddlewarePatcher.patch unless MiddlewarePatcher.patched?
|
|
88
82
|
|
|
89
83
|
# Patch middleware names
|
|
@@ -101,15 +95,15 @@ module Datadog
|
|
|
101
95
|
end
|
|
102
96
|
end
|
|
103
97
|
|
|
104
|
-
def get_option(option)
|
|
98
|
+
def self.get_option(option)
|
|
105
99
|
Datadog.configuration.tracing[:rack].get_option(option)
|
|
106
100
|
end
|
|
107
101
|
|
|
108
|
-
def patch_successful
|
|
102
|
+
def self.patch_successful
|
|
109
103
|
MiddlewarePatcher.patch_successful || MiddlewareNamePatcher.patch_successful
|
|
110
104
|
end
|
|
111
105
|
|
|
112
|
-
def patch_error_result
|
|
106
|
+
def self.patch_error_result
|
|
113
107
|
MiddlewarePatcher.patch_error_result || MiddlewareNamePatcher.patch_error_result
|
|
114
108
|
end
|
|
115
109
|
end
|
|
@@ -15,9 +15,7 @@ module Datadog
|
|
|
15
15
|
QUEUE_START = "HTTP_X_QUEUE_START"
|
|
16
16
|
MINIMUM_ACCEPTABLE_TIME_VALUE = 1_000_000_000
|
|
17
17
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
def get_request_start(env, now = Core::Utils::Time.now.utc)
|
|
18
|
+
def self.get_request_start(env, now = Core::Utils::Time.now.utc)
|
|
21
19
|
header = env[REQUEST_START] || env[QUEUE_START]
|
|
22
20
|
return unless header
|
|
23
21
|
|
|
@@ -19,14 +19,12 @@ module Datadog
|
|
|
19
19
|
|
|
20
20
|
DATADOG_INFERRED_ROUTE_ENV_KEY = "datadog.inferred_route"
|
|
21
21
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
def read_or_infer(request_env)
|
|
22
|
+
def self.read_or_infer(request_env)
|
|
25
23
|
request_env[DATADOG_INFERRED_ROUTE_ENV_KEY] ||=
|
|
26
24
|
infer(request_env["SCRIPT_NAME"].to_s + request_env["PATH_INFO"].to_s)
|
|
27
25
|
end
|
|
28
26
|
|
|
29
|
-
def infer(path)
|
|
27
|
+
def self.infer(path)
|
|
30
28
|
count = 0
|
|
31
29
|
result = []
|
|
32
30
|
|
|
@@ -51,11 +49,11 @@ module Datadog
|
|
|
51
49
|
end
|
|
52
50
|
|
|
53
51
|
if RubyVersion.is?(">= 2.6")
|
|
54
|
-
def split(path, pattern = nil, &block)
|
|
52
|
+
def self.split(path, pattern = nil, &block)
|
|
55
53
|
path.split(pattern, &block)
|
|
56
54
|
end
|
|
57
55
|
else
|
|
58
|
-
def split(path, pattern = nil, &block)
|
|
56
|
+
def self.split(path, pattern = nil, &block)
|
|
59
57
|
path.split(pattern).each(&block)
|
|
60
58
|
path
|
|
61
59
|
end
|
|
@@ -11,9 +11,7 @@ module Datadog
|
|
|
11
11
|
module Rack
|
|
12
12
|
# Module to create virtual proxy span
|
|
13
13
|
module TraceProxyMiddleware
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
def call(env, configuration, &block)
|
|
14
|
+
def self.call(env, configuration, &block)
|
|
17
15
|
if configuration[:inferred_proxy_enabled] &&
|
|
18
16
|
(proxy_type = env[Ext::HEADER_X_DD_PROXY]) && !proxy_type.empty?
|
|
19
17
|
return call_with_inferred_proxy(env, proxy_type, &block)
|
|
@@ -62,7 +60,7 @@ module Datadog
|
|
|
62
60
|
# that wraps the actual request processing.
|
|
63
61
|
#
|
|
64
62
|
# rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
|
65
|
-
def call_with_inferred_proxy(env, proxy_type)
|
|
63
|
+
def self.call_with_inferred_proxy(env, proxy_type)
|
|
66
64
|
span_name = Ext::PROXY_SPAN_NAMES[proxy_type]
|
|
67
65
|
return yield unless span_name
|
|
68
66
|
|
|
@@ -118,7 +116,7 @@ module Datadog
|
|
|
118
116
|
# Sets cloud provider metadata and constructs the resource ARN.
|
|
119
117
|
#
|
|
120
118
|
# rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
|
121
|
-
def set_optional_tags(span, env:, proxy_type:)
|
|
119
|
+
def self.set_optional_tags(span, env:, proxy_type:)
|
|
122
120
|
api_id = env[Ext::HEADER_X_DD_PROXY_API_ID]
|
|
123
121
|
region = env[Ext::HEADER_X_DD_PROXY_REGION]
|
|
124
122
|
|
|
@@ -146,7 +144,7 @@ module Datadog
|
|
|
146
144
|
|
|
147
145
|
# Propagates response-level and security tags from the request span to
|
|
148
146
|
# the inferred parent.
|
|
149
|
-
def propagate_request_span_tags(span, env:)
|
|
147
|
+
def self.propagate_request_span_tags(span, env:)
|
|
150
148
|
rack_span = env[Ext::RACK_ENV_REQUEST_SPAN]
|
|
151
149
|
return unless rack_span
|
|
152
150
|
|
|
@@ -60,6 +60,10 @@ module Datadog
|
|
|
60
60
|
o.type :bool
|
|
61
61
|
o.default false
|
|
62
62
|
end
|
|
63
|
+
option :web_service_name do |o|
|
|
64
|
+
o.type :string
|
|
65
|
+
o.default Ext::DEFAULT_PEER_WEBSERVER_SERVICE_NAME
|
|
66
|
+
end
|
|
63
67
|
|
|
64
68
|
option :middleware, default: true, type: :bool
|
|
65
69
|
option :middleware_names, default: false, type: :bool
|
|
@@ -16,6 +16,8 @@ module Datadog
|
|
|
16
16
|
# Note: Alias (previous name DISABLE_DATADOG_RAILS) defined in supported-configurations.json
|
|
17
17
|
ENV_DISABLE = "DD_DISABLE_DATADOG_RAILS"
|
|
18
18
|
|
|
19
|
+
DEFAULT_PEER_WEBSERVER_SERVICE_NAME = "web-server"
|
|
20
|
+
|
|
19
21
|
SPAN_RUNNER_FILE = "rails.runner.file"
|
|
20
22
|
SPAN_RUNNER_INLINE = "rails.runner.inline"
|
|
21
23
|
SPAN_RUNNER_STDIN = "rails.runner.stdin"
|
|
@@ -21,6 +21,9 @@ module Datadog
|
|
|
21
21
|
# - handle configuration entries which are specific to Datadog tracing
|
|
22
22
|
# - instrument parts of the framework when needed
|
|
23
23
|
module Framework
|
|
24
|
+
# Rails integration options applied to the Rack integration.
|
|
25
|
+
RACK_OPTION_NAMES = [:service_name, :middleware_names, :distributed_tracing, :request_queuing, :web_service_name].freeze
|
|
26
|
+
|
|
24
27
|
# After the Rails application finishes initializing, we configure the Rails
|
|
25
28
|
# integration and all its sub-components with the application information
|
|
26
29
|
# available.
|
|
@@ -58,14 +61,9 @@ module Datadog
|
|
|
58
61
|
end
|
|
59
62
|
|
|
60
63
|
def self.activate_rack!(datadog_config, rails_config)
|
|
61
|
-
datadog_config.tracing.instrument(
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
service_name: rails_config[:service_name],
|
|
65
|
-
middleware_names: rails_config[:middleware_names],
|
|
66
|
-
distributed_tracing: rails_config[:distributed_tracing],
|
|
67
|
-
request_queuing: rails_config[:request_queuing],
|
|
68
|
-
)
|
|
64
|
+
datadog_config.tracing.instrument(:rack, application: ::Rails.application) do |rack_config|
|
|
65
|
+
rack_config.copy_configured_options(rails_config, RACK_OPTION_NAMES)
|
|
66
|
+
end
|
|
69
67
|
end
|
|
70
68
|
|
|
71
69
|
def self.activate_active_support!(datadog_config, rails_config)
|
|
@@ -7,10 +7,8 @@ module Datadog
|
|
|
7
7
|
module Rails
|
|
8
8
|
# Rails log injection helper methods
|
|
9
9
|
module LogInjection
|
|
10
|
-
module_function
|
|
11
|
-
|
|
12
10
|
# Use `app.config.log_tags` to inject propagation tags into the default Rails logger.
|
|
13
|
-
def configure_log_tags(app_config)
|
|
11
|
+
def self.configure_log_tags(app_config)
|
|
14
12
|
# When using SemanticLogger, app_config.log_tags could be a Hash and should not be modified here
|
|
15
13
|
return unless app_config.log_tags.nil? || app_config.log_tags.respond_to?(:<<)
|
|
16
14
|
|
|
@@ -19,25 +19,23 @@ module Datadog
|
|
|
19
19
|
BEFORE_INITIALIZE_ONLY_ONCE_PER_APP = Hash.new { |h, key| h[key] = Core::Utils::OnlyOnce.new }
|
|
20
20
|
AFTER_INITIALIZE_ONLY_ONCE_PER_APP = Hash.new { |h, key| h[key] = Core::Utils::OnlyOnce.new }
|
|
21
21
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
def target_version
|
|
22
|
+
def self.target_version
|
|
25
23
|
Integration.version
|
|
26
24
|
end
|
|
27
25
|
|
|
28
|
-
def patch
|
|
26
|
+
def self.patch
|
|
29
27
|
patch_before_initialize
|
|
30
28
|
patch_after_initialize
|
|
31
29
|
patch_rails_runner
|
|
32
30
|
end
|
|
33
31
|
|
|
34
|
-
def patch_before_initialize
|
|
32
|
+
def self.patch_before_initialize
|
|
35
33
|
::ActiveSupport.on_load(:before_initialize) do
|
|
36
34
|
Contrib::Rails::Patcher.before_initialize(self)
|
|
37
35
|
end
|
|
38
36
|
end
|
|
39
37
|
|
|
40
|
-
def before_initialize(app)
|
|
38
|
+
def self.before_initialize(app)
|
|
41
39
|
BEFORE_INITIALIZE_ONLY_ONCE_PER_APP[app].run do
|
|
42
40
|
# Middleware must be added before the application is initialized.
|
|
43
41
|
# Otherwise the middleware stack will be frozen.
|
|
@@ -47,7 +45,7 @@ module Datadog
|
|
|
47
45
|
end
|
|
48
46
|
end
|
|
49
47
|
|
|
50
|
-
def add_middleware(app)
|
|
48
|
+
def self.add_middleware(app)
|
|
51
49
|
# Add trace middleware at the top of the middleware stack,
|
|
52
50
|
# to ensure we capture the complete execution time.
|
|
53
51
|
app.middleware.insert_before(0, Contrib::Rack::TraceMiddleware)
|
|
@@ -64,13 +62,13 @@ module Datadog
|
|
|
64
62
|
app.middleware.insert_after(::ActionDispatch::DebugExceptions, Contrib::Rails::ExceptionMiddleware)
|
|
65
63
|
end
|
|
66
64
|
|
|
67
|
-
def patch_after_initialize
|
|
65
|
+
def self.patch_after_initialize
|
|
68
66
|
::ActiveSupport.on_load(:after_initialize) do
|
|
69
67
|
Contrib::Rails::Patcher.after_initialize(self)
|
|
70
68
|
end
|
|
71
69
|
end
|
|
72
70
|
|
|
73
|
-
def after_initialize(app)
|
|
71
|
+
def self.after_initialize(app)
|
|
74
72
|
AFTER_INITIALIZE_ONLY_ONCE_PER_APP[app].run do
|
|
75
73
|
# Finish configuring the tracer after the application is initialized.
|
|
76
74
|
# We need to wait for some things, like application name, middleware stack, etc.
|
|
@@ -79,12 +77,12 @@ module Datadog
|
|
|
79
77
|
end
|
|
80
78
|
|
|
81
79
|
# Configure Rails tracing with settings
|
|
82
|
-
def setup_tracer
|
|
80
|
+
def self.setup_tracer
|
|
83
81
|
Contrib::Rails::Framework.setup
|
|
84
82
|
end
|
|
85
83
|
|
|
86
84
|
# Instruments the `bin/rails runner` command.
|
|
87
|
-
def patch_rails_runner
|
|
85
|
+
def self.patch_rails_runner
|
|
88
86
|
# The `RunnerCommand` class is only available in Rails 5.1 and later.
|
|
89
87
|
if defined?(::Rails::Command::RunnerCommand) && Integration.version >= Gem::Version.new("5.1")
|
|
90
88
|
::Rails::Command::RunnerCommand.prepend(Runner)
|
|
@@ -12,18 +12,16 @@ module Datadog
|
|
|
12
12
|
module Patcher
|
|
13
13
|
include Contrib::Patcher
|
|
14
14
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
def target_version
|
|
15
|
+
def self.target_version
|
|
18
16
|
Integration.version
|
|
19
17
|
end
|
|
20
18
|
|
|
21
|
-
def patch
|
|
19
|
+
def self.patch
|
|
22
20
|
# Add instrumentation patch to Rake task
|
|
23
21
|
::Rake::Task.include(Instrumentation)
|
|
24
22
|
end
|
|
25
23
|
|
|
26
|
-
def get_option(option)
|
|
24
|
+
def self.get_option(option)
|
|
27
25
|
Datadog.configuration.tracing[:rake].get_option(option)
|
|
28
26
|
end
|
|
29
27
|
end
|
|
@@ -57,16 +57,14 @@ module Datadog
|
|
|
57
57
|
end
|
|
58
58
|
end
|
|
59
59
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
def default_tags
|
|
60
|
+
def self.default_tags
|
|
63
61
|
[].tap do |tags|
|
|
64
62
|
tags << "target_redis_version:#{Integration.redis_version}" if Integration.redis_version
|
|
65
63
|
tags << "target_redis_client_version:#{Integration.redis_client_version}" if Integration.redis_client_version
|
|
66
64
|
end
|
|
67
65
|
end
|
|
68
66
|
|
|
69
|
-
def patch
|
|
67
|
+
def self.patch
|
|
70
68
|
# Redis 5+ extracts RedisClient to its own gem and provide instrumentation interface
|
|
71
69
|
if Integration.redis_client_compatible?
|
|
72
70
|
require_relative "trace_middleware"
|
|
@@ -31,9 +31,7 @@ module Datadog
|
|
|
31
31
|
],
|
|
32
32
|
).freeze
|
|
33
33
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
def format_arg(arg)
|
|
34
|
+
def self.format_arg(arg)
|
|
37
35
|
str = Core::Utils.utf8_encode(arg, binary: true, placeholder: PLACEHOLDER)
|
|
38
36
|
Core::Utils.truncate(str, VALUE_MAX_LEN, TOO_LONG_MARK)
|
|
39
37
|
rescue => e
|
|
@@ -41,7 +39,7 @@ module Datadog
|
|
|
41
39
|
PLACEHOLDER
|
|
42
40
|
end
|
|
43
41
|
|
|
44
|
-
def format_command_args(command_args)
|
|
42
|
+
def self.format_command_args(command_args)
|
|
45
43
|
command_args = resolve_command_args(command_args)
|
|
46
44
|
return "AUTH ?" if auth_command?(command_args) || hello_auth_command?(command_args)
|
|
47
45
|
|
|
@@ -49,7 +47,7 @@ module Datadog
|
|
|
49
47
|
Core::Utils.truncate("#{verb.upcase} #{args.join(" ")}", CMD_MAX_LEN, TOO_LONG_MARK)
|
|
50
48
|
end
|
|
51
49
|
|
|
52
|
-
def get_verb(command_args)
|
|
50
|
+
def self.get_verb(command_args)
|
|
53
51
|
return unless command_args.is_a?(Array)
|
|
54
52
|
|
|
55
53
|
return get_verb(command_args.first) if command_args.first.is_a?(Array)
|
|
@@ -62,7 +60,7 @@ module Datadog
|
|
|
62
60
|
"#{verb} #{command_args[1]}"
|
|
63
61
|
end
|
|
64
62
|
|
|
65
|
-
def auth_command?(command_args)
|
|
63
|
+
def self.auth_command?(command_args)
|
|
66
64
|
return false unless command_args.is_a?(Array) && !command_args.empty?
|
|
67
65
|
|
|
68
66
|
verb = command_args.first.to_s
|
|
@@ -73,7 +71,7 @@ module Datadog
|
|
|
73
71
|
# credentials the same way a standalone `AUTH` command does and must be redacted
|
|
74
72
|
# (and kept visible as its own span) rather than treated as a silent connection
|
|
75
73
|
# bootstrap command.
|
|
76
|
-
def hello_auth_command?(command_args)
|
|
74
|
+
def self.hello_auth_command?(command_args)
|
|
77
75
|
return false unless command_args.is_a?(Array) && !command_args.empty?
|
|
78
76
|
|
|
79
77
|
# `redis-client` always emits this as `["HELLO", "3", "AUTH", username, password]` — check
|
|
@@ -87,7 +85,7 @@ module Datadog
|
|
|
87
85
|
# `CLIENT SETNAME`) that `redis-client` sends as part of its per-connection handshake,
|
|
88
86
|
# so they can be excluded from pipeline resource naming. A `HELLO` carrying `AUTH`
|
|
89
87
|
# credentials is excluded from this so authentication remains visible as its own span.
|
|
90
|
-
def connection_setup_command?(command_args)
|
|
88
|
+
def self.connection_setup_command?(command_args)
|
|
91
89
|
command_args = resolve_command_args(command_args)
|
|
92
90
|
return false unless command_args.is_a?(Array) && !command_args.empty?
|
|
93
91
|
return false if hello_auth_command?(command_args)
|
|
@@ -100,7 +98,7 @@ module Datadog
|
|
|
100
98
|
|
|
101
99
|
# Unwraps command array when Redis is called with the following syntax:
|
|
102
100
|
# redis.call([:cmd, 'arg1', ...])
|
|
103
|
-
def resolve_command_args(command_args)
|
|
101
|
+
def self.resolve_command_args(command_args)
|
|
104
102
|
return command_args.first if command_args.is_a?(Array) && command_args.first.is_a?(Array)
|
|
105
103
|
|
|
106
104
|
command_args
|
|
@@ -11,13 +11,11 @@ module Datadog
|
|
|
11
11
|
module Patcher
|
|
12
12
|
include Contrib::Patcher
|
|
13
13
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
def target_version
|
|
14
|
+
def self.target_version
|
|
17
15
|
Integration.version
|
|
18
16
|
end
|
|
19
17
|
|
|
20
|
-
def patch
|
|
18
|
+
def self.patch
|
|
21
19
|
require_relative "resque_job"
|
|
22
20
|
|
|
23
21
|
::Resque::Job.prepend(Resque::Job)
|
|
@@ -10,13 +10,11 @@ module Datadog
|
|
|
10
10
|
module Patcher
|
|
11
11
|
include Contrib::Patcher
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
def target_version
|
|
13
|
+
def self.target_version
|
|
16
14
|
Integration.version
|
|
17
15
|
end
|
|
18
16
|
|
|
19
|
-
def patch
|
|
17
|
+
def self.patch
|
|
20
18
|
require_relative "request_patch"
|
|
21
19
|
|
|
22
20
|
::RestClient::Request.include(RequestPatch)
|
|
@@ -14,13 +14,11 @@ module Datadog
|
|
|
14
14
|
module Patcher
|
|
15
15
|
include Contrib::Patcher
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
def target_version
|
|
17
|
+
def self.target_version
|
|
20
18
|
Integration.version
|
|
21
19
|
end
|
|
22
20
|
|
|
23
|
-
def patch
|
|
21
|
+
def self.patch
|
|
24
22
|
::Roda.prepend(Instrumentation)
|
|
25
23
|
end
|
|
26
24
|
end
|
|
@@ -12,14 +12,12 @@ module Datadog
|
|
|
12
12
|
module Patcher
|
|
13
13
|
include Contrib::Patcher
|
|
14
14
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
def target_version
|
|
15
|
+
def self.target_version
|
|
18
16
|
Integration.version
|
|
19
17
|
end
|
|
20
18
|
|
|
21
19
|
# patch applies our patch
|
|
22
|
-
def patch
|
|
20
|
+
def self.patch
|
|
23
21
|
::SemanticLogger::Logger.include(Instrumentation)
|
|
24
22
|
end
|
|
25
23
|
end
|
|
@@ -12,22 +12,20 @@ module Datadog
|
|
|
12
12
|
module Patcher
|
|
13
13
|
include Contrib::Patcher
|
|
14
14
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
def target_version
|
|
15
|
+
def self.target_version
|
|
18
16
|
Integration.version
|
|
19
17
|
end
|
|
20
18
|
|
|
21
|
-
def patch
|
|
19
|
+
def self.patch
|
|
22
20
|
patch_sequel_database
|
|
23
21
|
patch_sequel_dataset
|
|
24
22
|
end
|
|
25
23
|
|
|
26
|
-
def patch_sequel_database
|
|
24
|
+
def self.patch_sequel_database
|
|
27
25
|
::Sequel::Database.include(Database)
|
|
28
26
|
end
|
|
29
27
|
|
|
30
|
-
def patch_sequel_dataset
|
|
28
|
+
def self.patch_sequel_dataset
|
|
31
29
|
::Sequel::Dataset.include(Dataset)
|
|
32
30
|
end
|
|
33
31
|
end
|
|
@@ -10,13 +10,11 @@ module Datadog
|
|
|
10
10
|
module Patcher
|
|
11
11
|
include Contrib::Patcher
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
def target_version
|
|
13
|
+
def self.target_version
|
|
16
14
|
Integration.version
|
|
17
15
|
end
|
|
18
16
|
|
|
19
|
-
def patch
|
|
17
|
+
def self.patch
|
|
20
18
|
::Shoryuken.server_middleware do |chain|
|
|
21
19
|
chain.add Shoryuken::Tracer
|
|
22
20
|
end
|
|
@@ -10,13 +10,11 @@ module Datadog
|
|
|
10
10
|
module Patcher
|
|
11
11
|
include Contrib::Patcher
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
def target_version
|
|
13
|
+
def self.target_version
|
|
16
14
|
Integration.version
|
|
17
15
|
end
|
|
18
16
|
|
|
19
|
-
def patch
|
|
17
|
+
def self.patch
|
|
20
18
|
require_relative "client_tracer"
|
|
21
19
|
require_relative "server_tracer"
|
|
22
20
|
|
|
@@ -41,14 +39,14 @@ module Datadog
|
|
|
41
39
|
end
|
|
42
40
|
end
|
|
43
41
|
|
|
44
|
-
def patch_server_internals
|
|
42
|
+
def self.patch_server_internals
|
|
45
43
|
patch_server_heartbeat
|
|
46
44
|
patch_server_job_fetch
|
|
47
45
|
patch_server_scheduled_push
|
|
48
46
|
patch_redis_info
|
|
49
47
|
end
|
|
50
48
|
|
|
51
|
-
def patch_server_heartbeat
|
|
49
|
+
def self.patch_server_heartbeat
|
|
52
50
|
require_relative "server_internal_tracer/stop"
|
|
53
51
|
require_relative "server_internal_tracer/heartbeat"
|
|
54
52
|
|
|
@@ -62,19 +60,19 @@ module Datadog
|
|
|
62
60
|
::Sidekiq::Launcher.prepend(ServerInternalTracer::Beat) if ::Sidekiq::Launcher.private_method_defined? :beat
|
|
63
61
|
end
|
|
64
62
|
|
|
65
|
-
def patch_server_job_fetch
|
|
63
|
+
def self.patch_server_job_fetch
|
|
66
64
|
require_relative "server_internal_tracer/job_fetch"
|
|
67
65
|
|
|
68
66
|
::Sidekiq::Processor.prepend(ServerInternalTracer::JobFetch)
|
|
69
67
|
end
|
|
70
68
|
|
|
71
|
-
def patch_server_scheduled_push
|
|
69
|
+
def self.patch_server_scheduled_push
|
|
72
70
|
require_relative "server_internal_tracer/scheduled_poller"
|
|
73
71
|
|
|
74
72
|
::Sidekiq::Scheduled::Poller.prepend(ServerInternalTracer::ScheduledPoller)
|
|
75
73
|
end
|
|
76
74
|
|
|
77
|
-
def patch_redis_info
|
|
75
|
+
def self.patch_redis_info
|
|
78
76
|
require_relative "server_internal_tracer/redis_info"
|
|
79
77
|
|
|
80
78
|
if Integration.supports_capsules?
|
|
@@ -11,17 +11,15 @@ module Datadog
|
|
|
11
11
|
module Sinatra
|
|
12
12
|
# Gets and sets trace information from a Rack Env
|
|
13
13
|
module Env
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
def datadog_span(env)
|
|
14
|
+
def self.datadog_span(env)
|
|
17
15
|
env[Ext::RACK_ENV_SINATRA_REQUEST_SPAN]
|
|
18
16
|
end
|
|
19
17
|
|
|
20
|
-
def set_datadog_span(env, span)
|
|
18
|
+
def self.set_datadog_span(env, span)
|
|
21
19
|
env[Ext::RACK_ENV_SINATRA_REQUEST_SPAN] = span
|
|
22
20
|
end
|
|
23
21
|
|
|
24
|
-
def route_path(env, use_script_names: Datadog.configuration.tracing[:sinatra][:resource_script_names])
|
|
22
|
+
def self.route_path(env, use_script_names: Datadog.configuration.tracing[:sinatra][:resource_script_names])
|
|
25
23
|
return unless env["sinatra.route"]
|
|
26
24
|
|
|
27
25
|
_, path = env["sinatra.route"].split(" ", 2)
|