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
|
@@ -10,6 +10,7 @@ require_relative "gateway/watcher"
|
|
|
10
10
|
require_relative "gateway/request"
|
|
11
11
|
require_relative "patches/render_to_body_patch"
|
|
12
12
|
require_relative "patches/process_action_patch"
|
|
13
|
+
require_relative "patches/live_thread_patch"
|
|
13
14
|
require_relative "../../api_security/endpoint_collection/rails_collector"
|
|
14
15
|
|
|
15
16
|
require_relative "../../../tracing/contrib/rack/middlewares"
|
|
@@ -25,17 +26,15 @@ module Datadog
|
|
|
25
26
|
BEFORE_INITIALIZE_ONLY_ONCE_PER_APP = Hash.new { |h, key| h[key] = Datadog::Core::Utils::OnlyOnce.new }
|
|
26
27
|
AFTER_INITIALIZE_ONLY_ONCE_PER_APP = Hash.new { |h, key| h[key] = Datadog::Core::Utils::OnlyOnce.new }
|
|
27
28
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
def patched?
|
|
29
|
+
def self.patched?
|
|
31
30
|
Patcher.instance_variable_get(:@patched)
|
|
32
31
|
end
|
|
33
32
|
|
|
34
|
-
def target_version
|
|
33
|
+
def self.target_version
|
|
35
34
|
Integration.version
|
|
36
35
|
end
|
|
37
36
|
|
|
38
|
-
def patch
|
|
37
|
+
def self.patch
|
|
39
38
|
Gateway::Watcher.watch
|
|
40
39
|
patch_before_initialize
|
|
41
40
|
patch_after_initialize
|
|
@@ -45,13 +44,13 @@ module Datadog
|
|
|
45
44
|
Patcher.instance_variable_set(:@patched, true)
|
|
46
45
|
end
|
|
47
46
|
|
|
48
|
-
def patch_before_initialize
|
|
47
|
+
def self.patch_before_initialize
|
|
49
48
|
::ActiveSupport.on_load(:before_initialize) do
|
|
50
49
|
Datadog::AppSec::Contrib::Rails::Patcher.before_initialize(self)
|
|
51
50
|
end
|
|
52
51
|
end
|
|
53
52
|
|
|
54
|
-
def before_initialize(app)
|
|
53
|
+
def self.before_initialize(app)
|
|
55
54
|
BEFORE_INITIALIZE_ONLY_ONCE_PER_APP[app].run do
|
|
56
55
|
# Middleware must be added before the application is initialized.
|
|
57
56
|
# Otherwise the middleware stack will be frozen.
|
|
@@ -61,7 +60,7 @@ module Datadog
|
|
|
61
60
|
end
|
|
62
61
|
end
|
|
63
62
|
|
|
64
|
-
def add_middleware(app)
|
|
63
|
+
def self.add_middleware(app)
|
|
65
64
|
# Add trace middleware
|
|
66
65
|
if include_middleware?(Datadog::Tracing::Contrib::Rack::TraceMiddleware, app)
|
|
67
66
|
app.middleware.insert_after(
|
|
@@ -73,7 +72,7 @@ module Datadog
|
|
|
73
72
|
end
|
|
74
73
|
end
|
|
75
74
|
|
|
76
|
-
def include_middleware?(middleware, app)
|
|
75
|
+
def self.include_middleware?(middleware, app)
|
|
77
76
|
found = false
|
|
78
77
|
|
|
79
78
|
# find tracer middleware reference in Rails::Configuration::MiddlewareStackProxy
|
|
@@ -107,17 +106,17 @@ module Datadog
|
|
|
107
106
|
found
|
|
108
107
|
end
|
|
109
108
|
|
|
110
|
-
def inspect_middlewares(app)
|
|
109
|
+
def self.inspect_middlewares(app)
|
|
111
110
|
Datadog.logger.debug { +"Rails middlewares: " << app.middleware.map(&:inspect).inspect }
|
|
112
111
|
end
|
|
113
112
|
|
|
114
|
-
def patch_after_initialize
|
|
113
|
+
def self.patch_after_initialize
|
|
115
114
|
::ActiveSupport.on_load(:after_initialize) do
|
|
116
115
|
Datadog::AppSec::Contrib::Rails::Patcher.after_initialize(self)
|
|
117
116
|
end
|
|
118
117
|
end
|
|
119
118
|
|
|
120
|
-
def after_initialize(app)
|
|
119
|
+
def self.after_initialize(app)
|
|
121
120
|
AFTER_INITIALIZE_ONLY_ONCE_PER_APP[app].run do
|
|
122
121
|
# Finish configuring the tracer after the application is initialized.
|
|
123
122
|
# We need to wait for some things, like application name, middleware stack, etc.
|
|
@@ -126,10 +125,14 @@ module Datadog
|
|
|
126
125
|
end
|
|
127
126
|
end
|
|
128
127
|
|
|
129
|
-
def patch_action_controller
|
|
128
|
+
def self.patch_action_controller
|
|
130
129
|
::ActiveSupport.on_load(:action_controller) do
|
|
131
130
|
GUARD_ACTION_CONTROLLER_ONCE_PER_APP[self].run do
|
|
132
131
|
::ActionController::Base.prepend(Patches::RenderToBodyPatch)
|
|
132
|
+
|
|
133
|
+
if Datadog::AppSec::Contrib::Rails::Patcher.target_version >= Gem::Version.new("5.0")
|
|
134
|
+
::ActionController::Live.prepend(Patches::LiveThreadPatch)
|
|
135
|
+
end
|
|
133
136
|
end
|
|
134
137
|
|
|
135
138
|
# Rails 7.1 adds `after_routes_loaded` hook
|
|
@@ -143,7 +146,7 @@ module Datadog
|
|
|
143
146
|
end
|
|
144
147
|
end
|
|
145
148
|
|
|
146
|
-
def subscribe_to_routes_loaded
|
|
149
|
+
def self.subscribe_to_routes_loaded
|
|
147
150
|
::ActiveSupport.on_load(:after_routes_loaded) do
|
|
148
151
|
Datadog::AppSec::Contrib::Rails::Patcher.report_routes_via_telemetry(::Rails.application.routes.routes)
|
|
149
152
|
rescue => e
|
|
@@ -153,7 +156,7 @@ module Datadog
|
|
|
153
156
|
end
|
|
154
157
|
end
|
|
155
158
|
|
|
156
|
-
def report_routes_via_telemetry(routes)
|
|
159
|
+
def self.report_routes_via_telemetry(routes)
|
|
157
160
|
# We do not support Rails 4.x for Endpoint Collection,
|
|
158
161
|
# mainly because the Route#verb was a Regexp before Rails 5.0
|
|
159
162
|
return if target_version < Gem::Version.new("5.0")
|
|
@@ -169,7 +172,7 @@ module Datadog
|
|
|
169
172
|
AppSec.telemetry&.report(e, description: "failed to report application endpoints")
|
|
170
173
|
end
|
|
171
174
|
|
|
172
|
-
def setup_security
|
|
175
|
+
def self.setup_security
|
|
173
176
|
Datadog::AppSec::Contrib::Rails::Framework.setup
|
|
174
177
|
end
|
|
175
178
|
end
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Datadog
|
|
4
|
+
module AppSec
|
|
5
|
+
module Contrib
|
|
6
|
+
module Rails
|
|
7
|
+
module Patches
|
|
8
|
+
# A patch for `ActionController::Live#new_controller_thread` that keeps
|
|
9
|
+
# the AppSec context usable in the Live thread until that thread is done
|
|
10
|
+
module LiveThreadPatch
|
|
11
|
+
private
|
|
12
|
+
|
|
13
|
+
def new_controller_thread
|
|
14
|
+
context = Datadog::AppSec::Context.active
|
|
15
|
+
return super unless context
|
|
16
|
+
|
|
17
|
+
super do
|
|
18
|
+
context.attach
|
|
19
|
+
|
|
20
|
+
interrupted = context.catch_interrupt { yield }
|
|
21
|
+
|
|
22
|
+
stream = response.stream
|
|
23
|
+
stream.close if interrupted && stream.is_a?(::ActionController::Live::Buffer) && !stream.closed?
|
|
24
|
+
ensure
|
|
25
|
+
context.detach
|
|
26
|
+
end
|
|
27
|
+
end
|
|
28
|
+
end
|
|
29
|
+
end
|
|
30
|
+
end
|
|
31
|
+
end
|
|
32
|
+
end
|
|
33
|
+
end
|
|
@@ -6,17 +6,15 @@ module Datadog
|
|
|
6
6
|
module RestClient
|
|
7
7
|
# Patcher for RestClient gem
|
|
8
8
|
module Patcher
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
def patched?
|
|
9
|
+
def self.patched?
|
|
12
10
|
!!Patcher.instance_variable_get(:@patched)
|
|
13
11
|
end
|
|
14
12
|
|
|
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_ssrf_detection_patch"
|
|
21
19
|
|
|
22
20
|
::RestClient::Request.prepend(RequestSSRFDetectionPatch)
|
|
@@ -100,17 +100,15 @@ module Datadog
|
|
|
100
100
|
|
|
101
101
|
# Patcher for AppSec on Sinatra
|
|
102
102
|
module Patcher
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
def patched?
|
|
103
|
+
def self.patched?
|
|
106
104
|
Patcher.instance_variable_get(:@patched)
|
|
107
105
|
end
|
|
108
106
|
|
|
109
|
-
def target_version
|
|
107
|
+
def self.target_version
|
|
110
108
|
Integration.version
|
|
111
109
|
end
|
|
112
110
|
|
|
113
|
-
def patch
|
|
111
|
+
def self.patch
|
|
114
112
|
Gateway::Watcher.watch
|
|
115
113
|
|
|
116
114
|
::Sinatra::Base.singleton_class.prepend(DefaultMiddlewarePatch)
|
|
@@ -122,7 +120,7 @@ module Datadog
|
|
|
122
120
|
Patcher.instance_variable_set(:@patched, true)
|
|
123
121
|
end
|
|
124
122
|
|
|
125
|
-
def patch_json?
|
|
123
|
+
def self.patch_json?
|
|
126
124
|
!!(defined?(::Sinatra::JSON) && ::Sinatra::Base < ::Sinatra::JSON)
|
|
127
125
|
end
|
|
128
126
|
end
|
|
@@ -32,16 +32,14 @@ module Datadog
|
|
|
32
32
|
content-language
|
|
33
33
|
].freeze
|
|
34
34
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
def tag_request(span, headers)
|
|
35
|
+
def self.tag_request(span, headers)
|
|
38
36
|
REQUEST_HEADERS_TAGS.each do |name|
|
|
39
37
|
value = headers.get(name)
|
|
40
38
|
span.set_tag("http.request.headers.#{name}", value) if value
|
|
41
39
|
end
|
|
42
40
|
end
|
|
43
41
|
|
|
44
|
-
def tag_response(span, headers)
|
|
42
|
+
def self.tag_response(span, headers)
|
|
45
43
|
RESPONSE_HEADERS_TAGS.each do |name|
|
|
46
44
|
value = headers.get(name)
|
|
47
45
|
span.set_tag("http.response.headers.#{name}", value.to_s) if value
|
|
@@ -5,9 +5,7 @@ module Datadog
|
|
|
5
5
|
module Metrics
|
|
6
6
|
# A class responsible for exporting WAF and RASP call metrics
|
|
7
7
|
module Exporter
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
def export_waf_metrics(metrics, span)
|
|
8
|
+
def self.export_waf_metrics(metrics, span)
|
|
11
9
|
return if metrics.evals.zero?
|
|
12
10
|
|
|
13
11
|
span.set_tag("_dd.appsec.waf.timeouts", metrics.timeouts)
|
|
@@ -15,7 +13,7 @@ module Datadog
|
|
|
15
13
|
span.set_tag("_dd.appsec.waf.duration_ext", convert_ns_to_us(metrics.duration_ext_ns))
|
|
16
14
|
end
|
|
17
15
|
|
|
18
|
-
def export_rasp_metrics(metrics, span)
|
|
16
|
+
def self.export_rasp_metrics(metrics, span)
|
|
19
17
|
return if metrics.evals.zero?
|
|
20
18
|
|
|
21
19
|
span.set_tag("_dd.appsec.rasp.rule.eval", metrics.evals)
|
|
@@ -31,7 +29,7 @@ module Datadog
|
|
|
31
29
|
end
|
|
32
30
|
end
|
|
33
31
|
|
|
34
|
-
def export_downstream_response_metrics(metrics, span)
|
|
32
|
+
def self.export_downstream_response_metrics(metrics, span)
|
|
35
33
|
metrics.each_pair do |reason, count|
|
|
36
34
|
next if count.zero?
|
|
37
35
|
|
|
@@ -39,7 +37,7 @@ module Datadog
|
|
|
39
37
|
end
|
|
40
38
|
end
|
|
41
39
|
|
|
42
|
-
private_class_method def convert_ns_to_us(value)
|
|
40
|
+
private_class_method def self.convert_ns_to_us(value)
|
|
43
41
|
value / 1000.0
|
|
44
42
|
end
|
|
45
43
|
end
|
|
@@ -10,9 +10,7 @@ module Datadog
|
|
|
10
10
|
BLOCK_SUCCESS = "success"
|
|
11
11
|
BLOCK_IRRELEVANT = "irrelevant"
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
def report_rasp(type, result, phase: nil)
|
|
13
|
+
def self.report_rasp(type, result, phase: nil)
|
|
16
14
|
return if result.error?
|
|
17
15
|
|
|
18
16
|
tags = {rule_type: type, waf_version: WAF::VERSION::BASE_STRING}
|
|
@@ -5,9 +5,7 @@ module Datadog
|
|
|
5
5
|
module Metrics
|
|
6
6
|
# A class responsible for exporting WAF request metrics via Telemetry.
|
|
7
7
|
module TelemetryExporter
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
def export_waf_request_metrics(metrics, context)
|
|
8
|
+
def self.export_waf_request_metrics(metrics, context)
|
|
11
9
|
AppSec.telemetry.inc(
|
|
12
10
|
Ext::TELEMETRY_METRICS_NAMESPACE, "waf.requests", 1,
|
|
13
11
|
tags: {
|
|
@@ -24,7 +22,7 @@ module Datadog
|
|
|
24
22
|
)
|
|
25
23
|
end
|
|
26
24
|
|
|
27
|
-
def export_api_security_metrics(context)
|
|
25
|
+
def self.export_api_security_metrics(context)
|
|
28
26
|
web_framework = context.state[:web_framework]
|
|
29
27
|
return unless web_framework
|
|
30
28
|
|
|
@@ -27,8 +27,6 @@ module Datadog
|
|
|
27
27
|
# Max bytes one input byte expands to as percent-encoded `%XX`
|
|
28
28
|
MAX_ENCODED_BYTE_SIZE = 3
|
|
29
29
|
|
|
30
|
-
module_function
|
|
31
|
-
|
|
32
30
|
# Escapes literal route text into normalized-route form
|
|
33
31
|
#
|
|
34
32
|
# Example:
|
|
@@ -39,7 +37,7 @@ module Datadog
|
|
|
39
37
|
#
|
|
40
38
|
# NOTE: {URI::Parser#escape} with {DISALLOWED_CHARS} gives the same output,
|
|
41
39
|
# but the generic gsub/sprintf path is slower and allocates more per request
|
|
42
|
-
def escape(text)
|
|
40
|
+
def self.escape(text)
|
|
43
41
|
return text unless text.match?(DISALLOWED_CHARS)
|
|
44
42
|
|
|
45
43
|
buffer = String.new(capacity: text.bytesize * MAX_ENCODED_BYTE_SIZE, encoding: Encoding::UTF_8)
|
|
@@ -17,8 +17,6 @@ module Datadog
|
|
|
17
17
|
RAILS_ROUTE_URI_PATTERN_KEY = "action_dispatch.route_uri_pattern"
|
|
18
18
|
RAILS_PATH_PARAMS_KEY = "action_dispatch.request.path_parameters"
|
|
19
19
|
|
|
20
|
-
module_function
|
|
21
|
-
|
|
22
20
|
# Extracts a normalized route path for a Rack request.
|
|
23
21
|
#
|
|
24
22
|
# Examples:
|
|
@@ -27,7 +25,7 @@ module Datadog
|
|
|
27
25
|
# Sinatra: "GET /download/*.*" => "/download/{param1+param2}"
|
|
28
26
|
# Rails: "/posts/:id(.:format)" + path => "/posts/{id+format}"
|
|
29
27
|
# Pattern: "/users/:id" => "/users/{id}"
|
|
30
|
-
def extract_normalized_route(rack_env, prefix: nil, pattern: nil)
|
|
28
|
+
def self.extract_normalized_route(rack_env, prefix: nil, pattern: nil)
|
|
31
29
|
route_prefix = prefix || rack_env["SCRIPT_NAME"]
|
|
32
30
|
|
|
33
31
|
if rack_env.key?(GRAPE_ROUTE_KEY)
|
|
@@ -48,20 +46,20 @@ module Datadog
|
|
|
48
46
|
nil
|
|
49
47
|
end
|
|
50
48
|
|
|
51
|
-
private_class_method def normalize_rails_route(route, rack_env, route_prefix)
|
|
49
|
+
private_class_method def self.normalize_rails_route(route, rack_env, route_prefix)
|
|
52
50
|
path_params = rack_env.fetch(RAILS_PATH_PARAMS_KEY, {})
|
|
53
51
|
path = path_without_prefix(rack_env["PATH_INFO"].to_s, route_prefix)
|
|
54
52
|
|
|
55
53
|
RailsRoutePattern.new(route).normalize(path_params: path_params, path: path)
|
|
56
54
|
end
|
|
57
55
|
|
|
58
|
-
private_class_method def normalize_route_string(route)
|
|
56
|
+
private_class_method def self.normalize_route_string(route)
|
|
59
57
|
return unless route
|
|
60
58
|
|
|
61
59
|
RoutePattern.new(route).normalize
|
|
62
60
|
end
|
|
63
61
|
|
|
64
|
-
private_class_method def path_without_prefix(path, prefix)
|
|
62
|
+
private_class_method def self.path_without_prefix(path, prefix)
|
|
65
63
|
return path unless prefix
|
|
66
64
|
|
|
67
65
|
prefix = prefix.to_s
|
|
@@ -5,9 +5,7 @@ module Datadog
|
|
|
5
5
|
module Utils
|
|
6
6
|
module HTTP
|
|
7
7
|
module BodyReader
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
def read(body, limit:, rewind_before_read: false)
|
|
8
|
+
def self.read(body, limit:, rewind_before_read: false)
|
|
11
9
|
return body.byteslice(0, limit + 1) if body.is_a?(String)
|
|
12
10
|
return if body.nil? || !body.respond_to?(:read)
|
|
13
11
|
return if rewind_before_read && !body.respond_to?(:rewind)
|
|
@@ -15,7 +13,7 @@ module Datadog
|
|
|
15
13
|
read_stream(body, limit: limit, rewind_before_read: rewind_before_read)
|
|
16
14
|
end
|
|
17
15
|
|
|
18
|
-
def read_stream(body, limit:, rewind_before_read: false)
|
|
16
|
+
def self.read_stream(body, limit:, rewind_before_read: false)
|
|
19
17
|
# @type var rewound: bool
|
|
20
18
|
rewound = false
|
|
21
19
|
|
|
@@ -44,7 +42,7 @@ module Datadog
|
|
|
44
42
|
rewind(body) if rewound
|
|
45
43
|
end
|
|
46
44
|
|
|
47
|
-
private_class_method def rewind(body)
|
|
45
|
+
private_class_method def self.rewind(body)
|
|
48
46
|
return false unless body.respond_to?(:rewind)
|
|
49
47
|
|
|
50
48
|
# NOTE: Steep can't narrow interfaces via `respond_to?` guard-clause
|
|
@@ -8,8 +8,6 @@ module Datadog
|
|
|
8
8
|
module HTTP
|
|
9
9
|
# Module for parsing URL encoded payloads
|
|
10
10
|
module URLEncoded
|
|
11
|
-
module_function
|
|
12
|
-
|
|
13
11
|
# Matches Rack's default query bytesize limit, so parsing our own
|
|
14
12
|
# payloads keeps the same guard against CPU/memory exhaustion.
|
|
15
13
|
DEFAULT_BYTESIZE_LIMIT = 4 * 1024 * 1024
|
|
@@ -27,7 +25,7 @@ module Datadog
|
|
|
27
25
|
# Parsing stops once +limit+ bytes have been read, and the pair being
|
|
28
26
|
# read at that point is discarded. This returns the pairs decoded so
|
|
29
27
|
# far rather than raising or discarding the whole payload.
|
|
30
|
-
def parse(payload, limit: DEFAULT_BYTESIZE_LIMIT)
|
|
28
|
+
def self.parse(payload, limit: DEFAULT_BYTESIZE_LIMIT)
|
|
31
29
|
raise ArgumentError, "limit must not be negative" if limit < 0
|
|
32
30
|
|
|
33
31
|
return {} if payload.nil? || payload.empty? || limit.zero?
|
|
@@ -93,7 +91,7 @@ module Datadog
|
|
|
93
91
|
result
|
|
94
92
|
end
|
|
95
93
|
|
|
96
|
-
private_class_method def add_param(params, key, value)
|
|
94
|
+
private_class_method def self.add_param(params, key, value)
|
|
97
95
|
case existing = params[key]
|
|
98
96
|
when ::Array then existing.push(value)
|
|
99
97
|
when nil then params[key] = value
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
require_relative "refillable_bucket"
|
|
4
|
+
|
|
5
|
+
module Datadog
|
|
6
|
+
module Core
|
|
7
|
+
# Token bucket that permits consumption below zero. The deficit refills over
|
|
8
|
+
# time at +rate+.
|
|
9
|
+
class BorrowingTokenBucket
|
|
10
|
+
include RefillableBucket
|
|
11
|
+
|
|
12
|
+
# Initializes the balance at +max_tokens+, permitting the balance to go
|
|
13
|
+
# below zero thereafter.
|
|
14
|
+
#
|
|
15
|
+
# @param rate [Numeric] refill rate, in tokens per second
|
|
16
|
+
# @param max_tokens [Numeric] ceiling the balance refills toward
|
|
17
|
+
# @raise [ArgumentError] when rate or max_tokens is negative, or when
|
|
18
|
+
# either is not a number
|
|
19
|
+
# @return [void]
|
|
20
|
+
def initialize(rate, max_tokens: rate)
|
|
21
|
+
initialize_bucket(rate, max_tokens)
|
|
22
|
+
|
|
23
|
+
raise ArgumentError, "rate must not be negative: #{rate}" if rate < 0
|
|
24
|
+
raise ArgumentError, "max_tokens must not be negative: #{max_tokens}" if max_tokens < 0
|
|
25
|
+
end
|
|
26
|
+
|
|
27
|
+
# @return [Boolean] whether the balance is currently positive
|
|
28
|
+
def available?
|
|
29
|
+
balance_at(Core::Utils::Time.get_time) > 0
|
|
30
|
+
end
|
|
31
|
+
|
|
32
|
+
# Removes +size+ tokens; the balance goes below zero when +size+
|
|
33
|
+
# exceeds the available tokens.
|
|
34
|
+
#
|
|
35
|
+
# @param size [Numeric] tokens to remove
|
|
36
|
+
# @return [void]
|
|
37
|
+
# @raise [ArgumentError] when size is negative or is not a number
|
|
38
|
+
def consume(size: 1)
|
|
39
|
+
raise ArgumentError, "size must be a number: #{size}" unless size.is_a?(Numeric)
|
|
40
|
+
raise ArgumentError, "size must not be negative: #{size}" if size < 0
|
|
41
|
+
|
|
42
|
+
refill
|
|
43
|
+
@tokens = available_tokens - size
|
|
44
|
+
nil
|
|
45
|
+
end
|
|
46
|
+
|
|
47
|
+
# Removes one token when the balance is positive after a refill, so a
|
|
48
|
+
# check-and-consume reads the clock and runs the refill arithmetic once.
|
|
49
|
+
#
|
|
50
|
+
# @return [Boolean] whether a token was consumed
|
|
51
|
+
def try_consume
|
|
52
|
+
refill
|
|
53
|
+
return false unless available_tokens > 0
|
|
54
|
+
|
|
55
|
+
@tokens = available_tokens - 1
|
|
56
|
+
true
|
|
57
|
+
end
|
|
58
|
+
end
|
|
59
|
+
end
|
|
60
|
+
end
|
data/lib/datadog/core/chunker.rb
CHANGED
|
@@ -4,8 +4,6 @@ module Datadog
|
|
|
4
4
|
module Core
|
|
5
5
|
# Chunks list of elements into batches
|
|
6
6
|
module Chunker
|
|
7
|
-
module_function
|
|
8
|
-
|
|
9
7
|
# Chunks a list into batches of at most +max_chunk_size+ elements each.
|
|
10
8
|
#
|
|
11
9
|
# An exception can occur if a single element is too large. That single
|
|
@@ -15,7 +13,7 @@ module Datadog
|
|
|
15
13
|
# @param list [Enumerable] list of elements
|
|
16
14
|
# @param max_chunk_size [Numeric] maximum acceptable chunk size
|
|
17
15
|
# @return [Enumerable] lazy list of chunks
|
|
18
|
-
def chunk_by_size(list, max_chunk_size)
|
|
16
|
+
def self.chunk_by_size(list, max_chunk_size)
|
|
19
17
|
chunk_agg = 0
|
|
20
18
|
list.slice_before do |elem|
|
|
21
19
|
size = elem.size
|
|
@@ -135,6 +135,18 @@ module Datadog
|
|
|
135
135
|
logger.warn("Failed to initialize Data Streams Monitoring: #{e.class}: #{e.message}")
|
|
136
136
|
nil
|
|
137
137
|
end
|
|
138
|
+
|
|
139
|
+
# Rebuilds the profiler of the current Components instance if it is outdated, under the Components lock.
|
|
140
|
+
# We added this for profiling remote configuration: We don't want to use
|
|
141
|
+
# `Datadog.configure` directly as that rebuilds every component, including
|
|
142
|
+
# the remote config itself.
|
|
143
|
+
def reconfigure_profiler
|
|
144
|
+
Datadog.send(:safely_synchronize) do
|
|
145
|
+
# allow_initialization: false to avoid building the component tree from the remote-config worker thread.
|
|
146
|
+
current = Datadog.send(:components, allow_initialization: false)
|
|
147
|
+
current.rebuild_profiler if current&.profiler_outdated?
|
|
148
|
+
end
|
|
149
|
+
end
|
|
138
150
|
end
|
|
139
151
|
|
|
140
152
|
attr_reader \
|
|
@@ -154,7 +166,8 @@ module Datadog
|
|
|
154
166
|
:ai_guard,
|
|
155
167
|
:agent_info,
|
|
156
168
|
:data_streams,
|
|
157
|
-
:symbol_database
|
|
169
|
+
:symbol_database,
|
|
170
|
+
:profiler_unavailable_reason
|
|
158
171
|
|
|
159
172
|
def initialize(settings)
|
|
160
173
|
@settings = settings
|
|
@@ -197,13 +210,7 @@ module Datadog
|
|
|
197
210
|
Datadog::Tracing::Component.bind_transport_telemetry(@tracer, telemetry)
|
|
198
211
|
@crashtracker = self.class.build_crashtracker(settings, agent_settings, logger: @logger)
|
|
199
212
|
|
|
200
|
-
|
|
201
|
-
settings: settings,
|
|
202
|
-
agent_settings: agent_settings,
|
|
203
|
-
optional_tracer: @tracer,
|
|
204
|
-
logger: @logger,
|
|
205
|
-
)
|
|
206
|
-
@environment_logger_extra.merge!(profiler_logger_extra) if profiler_logger_extra
|
|
213
|
+
build_profiler
|
|
207
214
|
|
|
208
215
|
@runtime_metrics = self.class.build_runtime_metrics_worker(settings, @logger, telemetry)
|
|
209
216
|
@health_metrics = self.class.build_health_metrics(settings, @logger, telemetry)
|
|
@@ -262,6 +269,7 @@ module Datadog
|
|
|
262
269
|
symbol_database&.after_fork!
|
|
263
270
|
data_streams&.restart_flush_thread
|
|
264
271
|
@open_feature_activation.after_fork
|
|
272
|
+
dynamic_instrumentation&.after_fork
|
|
265
273
|
end
|
|
266
274
|
|
|
267
275
|
# Hot-swaps with a new sampler.
|
|
@@ -278,15 +286,7 @@ module Datadog
|
|
|
278
286
|
|
|
279
287
|
@open_feature_activation.startup!
|
|
280
288
|
|
|
281
|
-
|
|
282
|
-
if profiler
|
|
283
|
-
profiler.start
|
|
284
|
-
else
|
|
285
|
-
# Display a warning for users who expected profiling to be enabled
|
|
286
|
-
unsupported_reason = Profiling.unsupported_reason
|
|
287
|
-
logger.warn("Profiling was requested but is not supported, profiling disabled: #{unsupported_reason}")
|
|
288
|
-
end
|
|
289
|
-
end
|
|
289
|
+
profiler&.start
|
|
290
290
|
|
|
291
291
|
if dynamic_instrumentation && old_state
|
|
292
292
|
dynamic_instrumentation.record_rc_enablement_signal_paths(old_state.rc_enablement_signal_paths)
|
|
@@ -426,9 +426,40 @@ module Datadog
|
|
|
426
426
|
@open_feature_activation.component
|
|
427
427
|
end
|
|
428
428
|
|
|
429
|
+
def rebuild_profiler
|
|
430
|
+
@profiler&.shutdown!
|
|
431
|
+
build_profiler
|
|
432
|
+
profiler&.start
|
|
433
|
+
end
|
|
434
|
+
|
|
435
|
+
# Whether the profiling settings changed since the profiler, which copies them, was built.
|
|
436
|
+
def profiler_outdated?
|
|
437
|
+
profiling_settings_values != @profiler_settings_values
|
|
438
|
+
end
|
|
439
|
+
|
|
429
440
|
private
|
|
430
441
|
|
|
431
442
|
attr_reader :open_feature_activation
|
|
443
|
+
|
|
444
|
+
# Values of every profiling setting, including nested groups.
|
|
445
|
+
def profiling_settings_values(settings_object = settings.profiling)
|
|
446
|
+
settings_object.options_hash.transform_values do |value|
|
|
447
|
+
value.is_a?(Base) ? profiling_settings_values(value) : value
|
|
448
|
+
end
|
|
449
|
+
end
|
|
450
|
+
|
|
451
|
+
def build_profiler
|
|
452
|
+
@profiler_settings_values = profiling_settings_values
|
|
453
|
+
@profiler, profiler_logger_extra, @profiler_unavailable_reason = Datadog::Profiling::Component.build_profiler_component(
|
|
454
|
+
settings: settings,
|
|
455
|
+
agent_settings: agent_settings,
|
|
456
|
+
optional_tracer: tracer,
|
|
457
|
+
logger: logger,
|
|
458
|
+
)
|
|
459
|
+
@environment_logger_extra.merge!(profiler_logger_extra) if profiler_logger_extra
|
|
460
|
+
# The tracer can outlive the profiler, e.g. a c.tracing.instance kept across Datadog.configure.
|
|
461
|
+
tracer.reset_profiling_enabled
|
|
462
|
+
end
|
|
432
463
|
end
|
|
433
464
|
end
|
|
434
465
|
end
|
|
@@ -283,7 +283,8 @@ module Datadog
|
|
|
283
283
|
# @public_api
|
|
284
284
|
settings :advanced do
|
|
285
285
|
# Controls the maximum number of frames for each thread sampled. Can be tuned to avoid omitted frames in the
|
|
286
|
-
# produced profiles. Increasing this may increase the overhead of profiling.
|
|
286
|
+
# produced profiles. Increasing this may increase the overhead of profiling. Values outside of 400 to 600 are
|
|
287
|
+
# clamped to that range.
|
|
287
288
|
#
|
|
288
289
|
# @default `DD_PROFILING_MAX_FRAMES` environment variable, otherwise 400
|
|
289
290
|
option :max_frames do |o|
|
|
@@ -74,6 +74,8 @@ module Datadog
|
|
|
74
74
|
"DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS",
|
|
75
75
|
"DD_FEATURE_FLAGS_ENABLED",
|
|
76
76
|
"DD_FEATURE_FLAGS_EVALUATION_TELEMETRY_PER_SUBJECT_OPT_OUT_ENABLED",
|
|
77
|
+
"DD_FEATURE_FLAGS_EXPERIMENTATION_OPT_OUT_MODE",
|
|
78
|
+
"DD_FEATURE_FLAGS_EXPOSURES_DATADOG_LOGGING_ENABLED",
|
|
77
79
|
"DD_FLAGGING_EVALUATION_COUNTS_ENABLED",
|
|
78
80
|
"DD_GIT_COMMIT_SHA",
|
|
79
81
|
"DD_GIT_REPOSITORY_URL",
|
|
@@ -149,12 +149,7 @@ module Datadog
|
|
|
149
149
|
def vm
|
|
150
150
|
# RUBY_ENGINE_VERSION returns the VM version, which
|
|
151
151
|
# will differ from RUBY_VERSION for non-mri VMs.
|
|
152
|
-
|
|
153
|
-
"#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}"
|
|
154
|
-
else
|
|
155
|
-
# Ruby < 2.3 doesn't support RUBY_ENGINE_VERSION
|
|
156
|
-
"#{RUBY_ENGINE}-#{RUBY_VERSION}"
|
|
157
|
-
end
|
|
152
|
+
"#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}"
|
|
158
153
|
end
|
|
159
154
|
|
|
160
155
|
# @return [Boolean, nil] health metrics enabled in configuration
|