datadog 2.36.0 → 2.40.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 +119 -1
- data/bin/ddprofrb +4 -4
- data/ext/datadog_profiling_native_extension/clock_id_from_mach.c +5 -12
- data/ext/datadog_profiling_native_extension/collectors_cpu_and_wall_time_worker.c +105 -18
- data/ext/datadog_profiling_native_extension/collectors_idle_sampling_helper.c +17 -3
- data/ext/datadog_profiling_native_extension/collectors_stack.c +228 -162
- data/ext/datadog_profiling_native_extension/collectors_stack.h +16 -3
- data/ext/datadog_profiling_native_extension/collectors_thread_context.c +357 -217
- data/ext/datadog_profiling_native_extension/collectors_thread_context.h +3 -0
- data/ext/datadog_profiling_native_extension/crashtracking_runtime_stacks.c +5 -4
- data/ext/datadog_profiling_native_extension/datadog_ruby_common.c +19 -11
- data/ext/datadog_profiling_native_extension/datadog_ruby_common.h +7 -0
- data/ext/datadog_profiling_native_extension/extconf.rb +24 -11
- data/ext/datadog_profiling_native_extension/private_vm_api_access.c +261 -62
- data/ext/datadog_profiling_native_extension/private_vm_api_access.h +17 -9
- data/ext/datadog_profiling_native_extension/ruby_helpers.c +7 -0
- data/ext/datadog_profiling_native_extension/setup_signal_handler.c +2 -0
- data/ext/datadog_profiling_native_extension/time_helpers.h +12 -7
- data/ext/libdatadog_api/datadog_ruby_common.c +19 -11
- data/ext/libdatadog_api/datadog_ruby_common.h +7 -0
- data/ext/libdatadog_api/di.c +76 -0
- data/ext/libdatadog_api/extconf.rb +29 -23
- data/ext/libdatadog_api/feature_flags.c +26 -0
- data/ext/libdatadog_api/init.c +4 -0
- data/ext/libdatadog_api/trace_exporter.c +974 -0
- data/ext/libdatadog_api/trace_exporter.h +5 -0
- data/ext/libdatadog_extconf_helpers.rb +9 -9
- data/lib/datadog/ai_guard/api_client.rb +8 -6
- data/lib/datadog/ai_guard/component.rb +10 -10
- data/lib/datadog/ai_guard/evaluation.rb +1 -0
- data/lib/datadog/ai_guard/ext.rb +2 -0
- data/lib/datadog/appsec/actions_handler/serializable_backtrace.rb +16 -16
- data/lib/datadog/appsec/actions_handler.rb +6 -6
- data/lib/datadog/appsec/anonymizer.rb +1 -1
- data/lib/datadog/appsec/api_security/endpoint_collection/grape_route_serializer.rb +1 -1
- data/lib/datadog/appsec/api_security/endpoint_collection/rails_collector.rb +6 -6
- data/lib/datadog/appsec/api_security/endpoint_collection/sinatra_route_serializer.rb +1 -1
- data/lib/datadog/appsec/api_security/route_extractor.rb +18 -15
- data/lib/datadog/appsec/api_security/sampler.rb +5 -5
- data/lib/datadog/appsec/api_security.rb +1 -1
- data/lib/datadog/appsec/assets.rb +7 -7
- data/lib/datadog/appsec/autoload.rb +3 -3
- data/lib/datadog/appsec/component.rb +15 -15
- data/lib/datadog/appsec/compressed_json.rb +6 -6
- data/lib/datadog/appsec/configuration.rb +73 -58
- data/lib/datadog/appsec/context.rb +9 -7
- data/lib/datadog/appsec/contrib/active_record/instrumentation.rb +6 -6
- data/lib/datadog/appsec/contrib/active_record/integration.rb +4 -4
- data/lib/datadog/appsec/contrib/active_record/patcher.rb +4 -4
- data/lib/datadog/appsec/contrib/aws_lambda/gateway/watcher.rb +7 -7
- data/lib/datadog/appsec/contrib/aws_lambda/integration.rb +2 -2
- data/lib/datadog/appsec/contrib/aws_lambda/patcher.rb +2 -2
- data/lib/datadog/appsec/contrib/aws_lambda/waf_addresses.rb +36 -34
- data/lib/datadog/appsec/contrib/devise/data_extractor.rb +3 -3
- data/lib/datadog/appsec/contrib/devise/ext.rb +20 -20
- data/lib/datadog/appsec/contrib/devise/integration.rb +4 -4
- data/lib/datadog/appsec/contrib/devise/patcher.rb +8 -8
- data/lib/datadog/appsec/contrib/devise/patches/signin_tracking_patch.rb +12 -12
- data/lib/datadog/appsec/contrib/devise/patches/signup_tracking_patch.rb +8 -8
- data/lib/datadog/appsec/contrib/devise/tracking_middleware.rb +24 -9
- data/lib/datadog/appsec/contrib/excon/integration.rb +4 -4
- data/lib/datadog/appsec/contrib/excon/patcher.rb +1 -1
- data/lib/datadog/appsec/contrib/excon/ssrf_detection_middleware.rb +76 -21
- data/lib/datadog/appsec/contrib/faraday/integration.rb +4 -4
- data/lib/datadog/appsec/contrib/faraday/patcher.rb +4 -4
- data/lib/datadog/appsec/contrib/faraday/ssrf_detection_middleware.rb +72 -18
- data/lib/datadog/appsec/contrib/graphql/appsec_trace.rb +4 -4
- data/lib/datadog/appsec/contrib/graphql/gateway/multiplex.rb +3 -3
- data/lib/datadog/appsec/contrib/graphql/gateway/watcher.rb +7 -7
- data/lib/datadog/appsec/contrib/graphql/integration.rb +9 -9
- data/lib/datadog/appsec/contrib/graphql/patcher.rb +3 -3
- data/lib/datadog/appsec/contrib/rack/buffered_input.rb +1 -1
- data/lib/datadog/appsec/contrib/rack/ext.rb +29 -29
- data/lib/datadog/appsec/contrib/rack/gateway/request.rb +18 -17
- data/lib/datadog/appsec/contrib/rack/gateway/response.rb +1 -1
- data/lib/datadog/appsec/contrib/rack/gateway/watcher.rb +25 -21
- data/lib/datadog/appsec/contrib/rack/input_peeker.rb +9 -22
- data/lib/datadog/appsec/contrib/rack/integration.rb +6 -6
- data/lib/datadog/appsec/contrib/rack/patcher.rb +3 -3
- data/lib/datadog/appsec/contrib/rack/request_body_middleware.rb +11 -8
- data/lib/datadog/appsec/contrib/rack/request_middleware.rb +45 -24
- data/lib/datadog/appsec/contrib/rack/response_body.rb +1 -1
- data/lib/datadog/appsec/contrib/rails/gateway/request.rb +14 -8
- data/lib/datadog/appsec/contrib/rails/gateway/watcher.rb +10 -10
- data/lib/datadog/appsec/contrib/rails/integration.rb +5 -5
- data/lib/datadog/appsec/contrib/rails/patcher.rb +17 -17
- data/lib/datadog/appsec/contrib/rails/patches/process_action_patch.rb +2 -2
- data/lib/datadog/appsec/contrib/rails/patches/render_to_body_patch.rb +3 -3
- data/lib/datadog/appsec/contrib/rails/request.rb +3 -3
- data/lib/datadog/appsec/contrib/rails/request_middleware.rb +2 -1
- data/lib/datadog/appsec/contrib/rest_client/integration.rb +5 -5
- data/lib/datadog/appsec/contrib/rest_client/patcher.rb +1 -1
- data/lib/datadog/appsec/contrib/rest_client/request_ssrf_detection_patch.rb +74 -21
- data/lib/datadog/appsec/contrib/sinatra/gateway/request.rb +1 -1
- data/lib/datadog/appsec/contrib/sinatra/gateway/route_params.rb +1 -1
- data/lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb +16 -12
- data/lib/datadog/appsec/contrib/sinatra/integration.rb +5 -5
- data/lib/datadog/appsec/contrib/sinatra/patcher.rb +11 -11
- data/lib/datadog/appsec/contrib/sinatra/patches/json_patch.rb +3 -3
- data/lib/datadog/appsec/contrib/sinatra/request_middleware.rb +2 -1
- data/lib/datadog/appsec/counter_sampler.rb +1 -1
- data/lib/datadog/appsec/event.rb +14 -14
- data/lib/datadog/appsec/ext.rb +11 -10
- data/lib/datadog/appsec/extensions.rb +2 -2
- data/lib/datadog/appsec/instrumentation/gateway.rb +1 -1
- data/lib/datadog/appsec/metrics/collector.rb +18 -1
- data/lib/datadog/appsec/metrics/exporter.rb +17 -11
- data/lib/datadog/appsec/metrics/telemetry.rb +7 -7
- data/lib/datadog/appsec/metrics/telemetry_exporter.rb +4 -4
- data/lib/datadog/appsec/metrics.rb +4 -4
- data/lib/datadog/appsec/monitor/gateway/watcher.rb +16 -12
- data/lib/datadog/appsec/monitor.rb +1 -1
- data/lib/datadog/appsec/processor/rule_loader.rb +26 -26
- data/lib/datadog/appsec/rate_limiter.rb +1 -1
- data/lib/datadog/appsec/remote.rb +15 -9
- data/lib/datadog/appsec/response.rb +21 -21
- data/lib/datadog/appsec/route_normalizer/rails_route_pattern.rb +176 -0
- data/lib/datadog/appsec/route_normalizer/route_pattern.rb +378 -0
- data/lib/datadog/appsec/route_normalizer/route_text.rb +57 -0
- data/lib/datadog/appsec/route_normalizer.rb +80 -0
- data/lib/datadog/appsec/security_engine/engine.rb +37 -37
- data/lib/datadog/appsec/security_engine/runner.rb +2 -2
- data/lib/datadog/appsec/security_event.rb +2 -2
- data/lib/datadog/appsec/utils/http/body.rb +11 -8
- data/lib/datadog/appsec/utils/http/body_reader.rb +61 -0
- data/lib/datadog/appsec/utils/http/media_range.rb +15 -15
- data/lib/datadog/appsec/utils/http/media_type.rb +4 -4
- data/lib/datadog/appsec/utils/http/url_encoded.rb +80 -25
- data/lib/datadog/appsec.rb +16 -16
- data/lib/datadog/auto_instrument.rb +2 -2
- data/lib/datadog/core/buffer/cruby.rb +1 -1
- data/lib/datadog/core/buffer/thread_safe.rb +1 -1
- data/lib/datadog/core/configuration/agent_settings.rb +1 -1
- data/lib/datadog/core/configuration/agent_settings_resolver.rb +15 -15
- data/lib/datadog/core/configuration/agentless_settings_resolver.rb +2 -2
- data/lib/datadog/core/configuration/base.rb +2 -2
- data/lib/datadog/core/configuration/components.rb +115 -31
- data/lib/datadog/core/configuration/components_state.rb +6 -1
- data/lib/datadog/core/configuration/config_helper.rb +3 -3
- data/lib/datadog/core/configuration/deprecations.rb +6 -6
- data/lib/datadog/core/configuration/ext.rb +11 -11
- data/lib/datadog/core/configuration/option.rb +16 -16
- data/lib/datadog/core/configuration/option_definition.rb +4 -4
- data/lib/datadog/core/configuration/options.rb +1 -1
- data/lib/datadog/core/configuration/settings.rb +93 -104
- data/lib/datadog/core/configuration/stable_config.rb +1 -1
- data/lib/datadog/core/configuration/supported_configurations.rb +8 -1
- data/lib/datadog/core/configuration.rb +8 -8
- data/lib/datadog/core/contrib/rails/railtie.rb +3 -3
- data/lib/datadog/core/crashtracking/component.rb +9 -9
- data/lib/datadog/core/crashtracking/tag_builder.rb +5 -5
- data/lib/datadog/core/deprecations.rb +1 -1
- data/lib/datadog/core/diagnostics/environment_logger.rb +6 -6
- data/lib/datadog/core/diagnostics/health.rb +2 -2
- data/lib/datadog/core/encoding.rb +4 -4
- data/lib/datadog/core/environment/agent_info.rb +2 -2
- data/lib/datadog/core/environment/cgroup.rb +4 -4
- data/lib/datadog/core/environment/container.rb +9 -9
- data/lib/datadog/core/environment/execution.rb +3 -3
- data/lib/datadog/core/environment/ext.rb +18 -18
- data/lib/datadog/core/environment/gc.rb +1 -1
- data/lib/datadog/core/environment/git.rb +2 -2
- data/lib/datadog/core/environment/identity.rb +10 -10
- data/lib/datadog/core/environment/platform.rb +8 -8
- data/lib/datadog/core/environment/process.rb +3 -3
- data/lib/datadog/core/environment/socket.rb +2 -2
- data/lib/datadog/core/environment/variable_helpers.rb +1 -1
- data/lib/datadog/core/environment/vm_cache.rb +1 -1
- data/lib/datadog/core/environment/yjit.rb +2 -2
- data/lib/datadog/core/error.rb +5 -5
- data/lib/datadog/core/evp.rb +11 -0
- data/lib/datadog/core/extensions.rb +1 -1
- data/lib/datadog/core/feature_flags.rb +2 -2
- data/lib/datadog/core/git/ext.rb +4 -4
- data/lib/datadog/core/knuth_sampler.rb +3 -1
- data/lib/datadog/core/logger.rb +3 -3
- data/lib/datadog/core/logging/ext.rb +1 -1
- data/lib/datadog/core/metrics/client.rb +21 -21
- data/lib/datadog/core/metrics/ext.rb +5 -5
- data/lib/datadog/core/metrics/logging.rb +2 -2
- data/lib/datadog/core/metrics/options.rb +3 -3
- data/lib/datadog/core/pin.rb +1 -1
- data/lib/datadog/core/process_discovery.rb +8 -8
- data/lib/datadog/core/rate_limiter.rb +1 -1
- data/lib/datadog/core/remote/client/capabilities.rb +62 -19
- data/lib/datadog/core/remote/client.rb +16 -16
- data/lib/datadog/core/remote/component.rb +20 -12
- data/lib/datadog/core/remote/configuration/content.rb +3 -3
- data/lib/datadog/core/remote/configuration/digest.rb +1 -1
- data/lib/datadog/core/remote/configuration/path.rb +9 -9
- data/lib/datadog/core/remote/configuration/repository.rb +2 -2
- data/lib/datadog/core/remote/configuration/target.rb +9 -9
- data/lib/datadog/core/remote/configuration.rb +4 -4
- data/lib/datadog/core/remote/ext.rb +3 -3
- data/lib/datadog/core/remote/negotiation.rb +1 -1
- data/lib/datadog/core/remote/tie/tracing.rb +7 -7
- data/lib/datadog/core/remote/transport/config.rb +4 -4
- data/lib/datadog/core/remote/transport/http/config.rb +7 -7
- data/lib/datadog/core/remote/transport/http/negotiation.rb +4 -4
- data/lib/datadog/core/remote/transport/http.rb +10 -10
- data/lib/datadog/core/remote/transport/negotiation.rb +3 -3
- data/lib/datadog/core/remote/worker.rb +5 -5
- data/lib/datadog/core/runtime/ext.rb +22 -22
- data/lib/datadog/core/runtime/metrics.rb +9 -9
- data/lib/datadog/core/tag_builder.rb +18 -18
- data/lib/datadog/core/tag_normalizer.rb +7 -7
- data/lib/datadog/core/telemetry/component.rb +13 -13
- data/lib/datadog/core/telemetry/emitter.rb +4 -4
- data/lib/datadog/core/telemetry/event/app_client_configuration_change.rb +5 -5
- data/lib/datadog/core/telemetry/event/app_closing.rb +2 -2
- data/lib/datadog/core/telemetry/event/app_dependencies_loaded.rb +2 -2
- data/lib/datadog/core/telemetry/event/app_endpoints_loaded.rb +2 -2
- data/lib/datadog/core/telemetry/event/app_extended_heartbeat.rb +2 -2
- data/lib/datadog/core/telemetry/event/app_heartbeat.rb +2 -2
- data/lib/datadog/core/telemetry/event/app_integrations_change.rb +2 -2
- data/lib/datadog/core/telemetry/event/app_started.rb +41 -34
- data/lib/datadog/core/telemetry/event/base.rb +1 -1
- data/lib/datadog/core/telemetry/event/distributions.rb +2 -2
- data/lib/datadog/core/telemetry/event/generate_metrics.rb +2 -2
- data/lib/datadog/core/telemetry/event/log.rb +4 -4
- data/lib/datadog/core/telemetry/event/message_batch.rb +1 -1
- data/lib/datadog/core/telemetry/event/synth_app_client_configuration_change.rb +3 -3
- data/lib/datadog/core/telemetry/event.rb +16 -16
- data/lib/datadog/core/telemetry/ext.rb +11 -11
- data/lib/datadog/core/telemetry/logger.rb +1 -1
- data/lib/datadog/core/telemetry/logging.rb +5 -5
- data/lib/datadog/core/telemetry/metric.rb +7 -7
- data/lib/datadog/core/telemetry/metrics_collection.rb +2 -2
- data/lib/datadog/core/telemetry/metrics_manager.rb +1 -1
- data/lib/datadog/core/telemetry/request.rb +4 -4
- data/lib/datadog/core/telemetry/transport/http/telemetry.rb +14 -14
- data/lib/datadog/core/telemetry/transport/http.rb +7 -7
- data/lib/datadog/core/telemetry/transport/telemetry.rb +3 -3
- data/lib/datadog/core/telemetry/worker.rb +6 -6
- data/lib/datadog/core/transport/ext.rb +14 -14
- data/lib/datadog/core/transport/http/adapters/net.rb +4 -4
- data/lib/datadog/core/transport/http/adapters/test.rb +1 -1
- data/lib/datadog/core/transport/http/adapters/unix_socket.rb +4 -4
- data/lib/datadog/core/transport/http/api/endpoint.rb +1 -1
- data/lib/datadog/core/transport/http/api/map.rb +1 -1
- data/lib/datadog/core/transport/http/builder.rb +6 -6
- data/lib/datadog/core/transport/http/client.rb +2 -2
- data/lib/datadog/core/transport/http/response.rb +1 -1
- data/lib/datadog/core/transport/http.rb +8 -8
- data/lib/datadog/core/transport/transport.rb +1 -1
- data/lib/datadog/core/utils/at_fork_monkey_patch.rb +83 -15
- data/lib/datadog/core/utils/base64_codec.rb +3 -3
- data/lib/datadog/core/utils/duration.rb +1 -1
- data/lib/datadog/core/utils/forking.rb +2 -2
- data/lib/datadog/core/utils/lru_cache.rb +3 -3
- data/lib/datadog/core/utils/network.rb +11 -11
- data/lib/datadog/core/utils/only_once_successful.rb +1 -1
- data/lib/datadog/core/utils/safe_dup.rb +2 -1
- data/lib/datadog/core/utils/sequence.rb +3 -6
- data/lib/datadog/core/utils/spawn_monkey_patch.rb +2 -2
- data/lib/datadog/core/utils/time.rb +18 -52
- data/lib/datadog/core/utils/url.rb +1 -1
- data/lib/datadog/core/utils.rb +4 -4
- data/lib/datadog/core/workers/async.rb +1 -1
- data/lib/datadog/core/workers/polling.rb +2 -2
- data/lib/datadog/core/workers/runtime_metrics.rb +4 -4
- data/lib/datadog/core.rb +4 -4
- data/lib/datadog/data_streams/configuration.rb +3 -3
- data/lib/datadog/data_streams/ext.rb +1 -1
- data/lib/datadog/data_streams/extensions.rb +2 -2
- data/lib/datadog/data_streams/pathway_context.rb +5 -5
- data/lib/datadog/data_streams/processor.rb +52 -52
- data/lib/datadog/data_streams/transport/http/stats.rb +5 -5
- data/lib/datadog/data_streams/transport/http.rb +5 -5
- data/lib/datadog/data_streams/transport/stats.rb +7 -7
- data/lib/datadog/data_streams.rb +5 -5
- data/lib/datadog/di/base.rb +6 -4
- data/lib/datadog/di/boot.rb +25 -22
- data/lib/datadog/di/capture_expression.rb +21 -0
- data/lib/datadog/di/capture_expression_evaluator.rb +71 -0
- data/lib/datadog/di/capture_limits.rb +41 -0
- data/lib/datadog/di/code_tracker.rb +10 -7
- data/lib/datadog/di/component.rb +122 -40
- data/lib/datadog/di/configuration.rb +7 -1
- data/lib/datadog/di/context.rb +9 -3
- data/lib/datadog/di/contrib/railtie.rb +1 -1
- data/lib/datadog/di/contrib.rb +5 -5
- data/lib/datadog/di/el/compiler.rb +91 -38
- data/lib/datadog/di/el/evaluator.rb +82 -2
- data/lib/datadog/di/el/expression.rb +10 -2
- data/lib/datadog/di/el.rb +3 -3
- data/lib/datadog/di/error.rb +10 -0
- data/lib/datadog/di/fatal_exceptions.rb +26 -0
- data/lib/datadog/di/instrumenter.rb +426 -169
- data/lib/datadog/di/logger.rb +1 -1
- data/lib/datadog/di/preload.rb +1 -1
- data/lib/datadog/di/probe.rb +61 -2
- data/lib/datadog/di/probe_builder.rb +96 -14
- data/lib/datadog/di/probe_file_loader/railtie.rb +1 -1
- data/lib/datadog/di/probe_file_loader.rb +12 -7
- data/lib/datadog/di/probe_manager.rb +67 -9
- data/lib/datadog/di/probe_notification_builder.rb +66 -22
- data/lib/datadog/di/probe_notifier_worker.rb +57 -37
- data/lib/datadog/di/probe_repository.rb +1 -1
- data/lib/datadog/di/redactor.rb +16 -1
- data/lib/datadog/di/remote.rb +178 -17
- data/lib/datadog/di/serializer.rb +47 -28
- data/lib/datadog/di/transport/diagnostics.rb +5 -5
- data/lib/datadog/di/transport/http/diagnostics.rb +3 -3
- data/lib/datadog/di/transport/http/input.rb +2 -2
- data/lib/datadog/di/transport/http.rb +10 -10
- data/lib/datadog/di/transport/input.rb +16 -12
- data/lib/datadog/di/utils.rb +4 -4
- data/lib/datadog/di.rb +66 -3
- data/lib/datadog/error_tracking/collector.rb +2 -2
- data/lib/datadog/error_tracking/component.rb +12 -12
- data/lib/datadog/error_tracking/configuration.rb +2 -2
- data/lib/datadog/error_tracking/ext.rb +7 -7
- data/lib/datadog/error_tracking/extensions.rb +2 -2
- data/lib/datadog/error_tracking/filters.rb +4 -4
- data/lib/datadog/error_tracking.rb +6 -6
- data/lib/datadog/kit/appsec/events/v2.rb +90 -32
- data/lib/datadog/kit/appsec/events.rb +25 -25
- data/lib/datadog/kit/enable_core_dumps.rb +2 -2
- data/lib/datadog/kit/identity.rb +18 -18
- data/lib/datadog/kit/tracing/method_tracer.rb +7 -7
- data/lib/datadog/kit.rb +1 -1
- data/lib/datadog/open_feature/component.rb +53 -21
- data/lib/datadog/open_feature/configuration.rb +22 -1
- data/lib/datadog/open_feature/evaluation_engine.rb +7 -7
- data/lib/datadog/open_feature/exposures/buffer.rb +1 -1
- data/lib/datadog/open_feature/exposures/deduplicator.rb +1 -1
- data/lib/datadog/open_feature/exposures/event.rb +2 -2
- data/lib/datadog/open_feature/exposures/reporter.rb +3 -3
- data/lib/datadog/open_feature/exposures/worker.rb +6 -6
- data/lib/datadog/open_feature/ext.rb +13 -6
- data/lib/datadog/open_feature/flag_evaluation/aggregator.rb +286 -0
- data/lib/datadog/open_feature/flag_evaluation/writer.rb +433 -0
- data/lib/datadog/open_feature/hooks/flag_eval_evp_hook.rb +102 -0
- data/lib/datadog/open_feature/hooks/{flag_eval_hook.rb → flag_eval_metrics_hook.rb} +4 -2
- data/lib/datadog/open_feature/hooks/span_enrichment_hook/codec.rb +58 -0
- data/lib/datadog/open_feature/hooks/span_enrichment_hook/span_enrichment_state.rb +96 -0
- data/lib/datadog/open_feature/hooks/span_enrichment_hook/span_enrichment_state_store.rb +49 -0
- data/lib/datadog/open_feature/hooks/span_enrichment_hook.rb +184 -0
- data/lib/datadog/open_feature/metrics/flag_eval_metrics.rb +24 -24
- data/lib/datadog/open_feature/native_evaluator.rb +23 -1
- data/lib/datadog/open_feature/noop_evaluator.rb +3 -3
- data/lib/datadog/open_feature/provider.rb +97 -30
- data/lib/datadog/open_feature/remote.rb +2 -2
- data/lib/datadog/open_feature/resolution_details.rb +4 -2
- data/lib/datadog/open_feature/transport.rb +65 -11
- data/lib/datadog/open_feature.rb +2 -2
- data/lib/datadog/opentelemetry/api/baggage.rb +3 -3
- data/lib/datadog/opentelemetry/api/context.rb +4 -4
- data/lib/datadog/opentelemetry/configuration/settings.rb +41 -41
- data/lib/datadog/opentelemetry/ext.rb +1 -1
- data/lib/datadog/opentelemetry/logs.rb +5 -5
- data/lib/datadog/opentelemetry/metrics.rb +7 -7
- data/lib/datadog/opentelemetry/sdk/configurator.rb +8 -8
- data/lib/datadog/opentelemetry/sdk/id_generator.rb +2 -2
- data/lib/datadog/opentelemetry/sdk/logs_exporter.rb +10 -17
- data/lib/datadog/opentelemetry/sdk/metrics_exporter.rb +8 -15
- data/lib/datadog/opentelemetry/sdk/propagator.rb +7 -7
- data/lib/datadog/opentelemetry/sdk/span_processor.rb +15 -15
- data/lib/datadog/opentelemetry/sdk/trace/span.rb +32 -32
- data/lib/datadog/opentelemetry/sdk.rb +19 -0
- data/lib/datadog/opentelemetry/signal_configuration.rb +11 -11
- data/lib/datadog/opentelemetry/trace.rb +1 -1
- data/lib/datadog/opentelemetry.rb +8 -8
- data/lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb +6 -1
- data/lib/datadog/profiling/collectors/idle_sampling_helper.rb +5 -3
- data/lib/datadog/profiling/collectors/thread_context.rb +15 -14
- data/lib/datadog/profiling/component.rb +18 -0
- data/lib/datadog/profiling/exporter.rb +1 -1
- data/lib/datadog/profiling/http_transport.rb +1 -1
- data/lib/datadog/profiling/sequence_tracker.rb +1 -1
- data/lib/datadog/profiling/tag_builder.rb +19 -19
- data/lib/datadog/profiling.rb +31 -27
- data/lib/datadog/single_step_instrument.rb +1 -1
- data/lib/datadog/symbol_database/component.rb +177 -60
- data/lib/datadog/symbol_database/configuration.rb +15 -7
- data/lib/datadog/symbol_database/extensions.rb +19 -0
- data/lib/datadog/symbol_database/extractor.rb +167 -130
- data/lib/datadog/symbol_database/file_hash.rb +5 -3
- data/lib/datadog/symbol_database/logger.rb +1 -1
- data/lib/datadog/symbol_database/remote.rb +28 -8
- data/lib/datadog/symbol_database/scope.rb +2 -2
- data/lib/datadog/symbol_database/scope_batcher.rb +8 -4
- data/lib/datadog/symbol_database/service_version.rb +4 -4
- data/lib/datadog/symbol_database/symbol.rb +1 -1
- data/lib/datadog/symbol_database/transport/http/endpoint.rb +1 -1
- data/lib/datadog/symbol_database/transport/http.rb +6 -6
- data/lib/datadog/symbol_database/transport.rb +4 -4
- data/lib/datadog/symbol_database/uploader.rb +28 -21
- data/lib/datadog/symbol_database.rb +22 -0
- data/lib/datadog/tracing/analytics.rb +1 -1
- data/lib/datadog/tracing/buffer.rb +5 -5
- data/lib/datadog/tracing/client_ip.rb +4 -4
- data/lib/datadog/tracing/component.rb +28 -7
- data/lib/datadog/tracing/configuration/dynamic.rb +8 -8
- data/lib/datadog/tracing/configuration/ext.rb +43 -42
- data/lib/datadog/tracing/configuration/http.rb +2 -2
- data/lib/datadog/tracing/configuration/settings.rb +32 -16
- data/lib/datadog/tracing/context.rb +1 -1
- data/lib/datadog/tracing/context_provider.rb +2 -2
- data/lib/datadog/tracing/contrib/action_cable/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/action_cable/event.rb +4 -4
- data/lib/datadog/tracing/contrib/action_cable/events/broadcast.rb +5 -5
- data/lib/datadog/tracing/contrib/action_cable/events/perform_action.rb +4 -4
- data/lib/datadog/tracing/contrib/action_cable/events/transmit.rb +5 -5
- data/lib/datadog/tracing/contrib/action_cable/events.rb +4 -4
- data/lib/datadog/tracing/contrib/action_cable/ext.rb +18 -18
- data/lib/datadog/tracing/contrib/action_cable/instrumentation.rb +4 -4
- data/lib/datadog/tracing/contrib/action_cable/integration.rb +7 -7
- data/lib/datadog/tracing/contrib/action_cable/patcher.rb +4 -4
- data/lib/datadog/tracing/contrib/action_mailer/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/action_mailer/event.rb +3 -3
- data/lib/datadog/tracing/contrib/action_mailer/events/deliver.rb +8 -8
- data/lib/datadog/tracing/contrib/action_mailer/events/process.rb +4 -4
- data/lib/datadog/tracing/contrib/action_mailer/events.rb +2 -2
- data/lib/datadog/tracing/contrib/action_mailer/ext.rb +18 -18
- data/lib/datadog/tracing/contrib/action_mailer/integration.rb +7 -7
- data/lib/datadog/tracing/contrib/action_mailer/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/action_pack/action_controller/instrumentation.rb +8 -8
- data/lib/datadog/tracing/contrib/action_pack/action_controller/patcher.rb +2 -2
- data/lib/datadog/tracing/contrib/action_pack/action_dispatch/instrumentation.rb +4 -4
- data/lib/datadog/tracing/contrib/action_pack/action_dispatch/patcher.rb +4 -4
- data/lib/datadog/tracing/contrib/action_pack/configuration/settings.rb +3 -3
- data/lib/datadog/tracing/contrib/action_pack/ext.rb +10 -10
- data/lib/datadog/tracing/contrib/action_pack/integration.rb +7 -7
- data/lib/datadog/tracing/contrib/action_pack/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/action_pack/utils.rb +1 -1
- data/lib/datadog/tracing/contrib/action_view/configuration/settings.rb +3 -3
- data/lib/datadog/tracing/contrib/action_view/event.rb +1 -1
- data/lib/datadog/tracing/contrib/action_view/events/render_partial.rb +6 -6
- data/lib/datadog/tracing/contrib/action_view/events/render_template.rb +6 -6
- data/lib/datadog/tracing/contrib/action_view/events.rb +2 -2
- data/lib/datadog/tracing/contrib/action_view/ext.rb +10 -10
- data/lib/datadog/tracing/contrib/action_view/integration.rb +11 -11
- data/lib/datadog/tracing/contrib/action_view/patcher.rb +5 -5
- data/lib/datadog/tracing/contrib/action_view/utils.rb +2 -2
- data/lib/datadog/tracing/contrib/active_job/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/active_job/data_streams.rb +62 -0
- data/lib/datadog/tracing/contrib/active_job/event.rb +3 -3
- data/lib/datadog/tracing/contrib/active_job/events/discard.rb +5 -5
- data/lib/datadog/tracing/contrib/active_job/events/enqueue.rb +5 -5
- data/lib/datadog/tracing/contrib/active_job/events/enqueue_at.rb +5 -5
- data/lib/datadog/tracing/contrib/active_job/events/enqueue_retry.rb +5 -5
- data/lib/datadog/tracing/contrib/active_job/events/perform.rb +5 -5
- data/lib/datadog/tracing/contrib/active_job/events/retry_stopped.rb +5 -5
- data/lib/datadog/tracing/contrib/active_job/events.rb +6 -6
- data/lib/datadog/tracing/contrib/active_job/ext.rb +23 -23
- data/lib/datadog/tracing/contrib/active_job/integration.rb +7 -7
- data/lib/datadog/tracing/contrib/active_job/patcher.rb +17 -5
- data/lib/datadog/tracing/contrib/active_model_serializers/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/active_model_serializers/event.rb +4 -4
- data/lib/datadog/tracing/contrib/active_model_serializers/events/render.rb +6 -6
- data/lib/datadog/tracing/contrib/active_model_serializers/events/serialize.rb +7 -8
- data/lib/datadog/tracing/contrib/active_model_serializers/events.rb +2 -2
- data/lib/datadog/tracing/contrib/active_model_serializers/ext.rb +10 -10
- data/lib/datadog/tracing/contrib/active_model_serializers/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/active_model_serializers/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/active_record/configuration/makara_resolver.rb +1 -1
- data/lib/datadog/tracing/contrib/active_record/configuration/resolver.rb +6 -6
- data/lib/datadog/tracing/contrib/active_record/configuration/settings.rb +4 -4
- data/lib/datadog/tracing/contrib/active_record/event.rb +1 -1
- data/lib/datadog/tracing/contrib/active_record/events/instantiation.rb +8 -8
- data/lib/datadog/tracing/contrib/active_record/events/sql.rb +9 -9
- data/lib/datadog/tracing/contrib/active_record/events.rb +2 -2
- data/lib/datadog/tracing/contrib/active_record/ext.rb +15 -15
- data/lib/datadog/tracing/contrib/active_record/integration.rb +11 -11
- data/lib/datadog/tracing/contrib/active_record/patcher.rb +2 -2
- data/lib/datadog/tracing/contrib/active_record/utils.rb +3 -3
- data/lib/datadog/tracing/contrib/active_support/cache/event.rb +1 -1
- data/lib/datadog/tracing/contrib/active_support/cache/events/cache.rb +11 -11
- data/lib/datadog/tracing/contrib/active_support/cache/events.rb +1 -1
- data/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb +4 -4
- data/lib/datadog/tracing/contrib/active_support/cache/patcher.rb +5 -5
- data/lib/datadog/tracing/contrib/active_support/cache/redis.rb +4 -4
- data/lib/datadog/tracing/contrib/active_support/configuration/settings.rb +3 -3
- data/lib/datadog/tracing/contrib/active_support/ext.rb +16 -16
- data/lib/datadog/tracing/contrib/active_support/integration.rb +8 -8
- data/lib/datadog/tracing/contrib/active_support/notifications/event.rb +1 -1
- data/lib/datadog/tracing/contrib/active_support/notifications/subscriber.rb +2 -2
- data/lib/datadog/tracing/contrib/active_support/notifications/subscription.rb +1 -1
- data/lib/datadog/tracing/contrib/active_support/patcher.rb +2 -2
- data/lib/datadog/tracing/contrib/analytics.rb +1 -1
- data/lib/datadog/tracing/contrib/auto_instrument.rb +4 -4
- data/lib/datadog/tracing/contrib/aws/configuration/settings.rb +3 -3
- data/lib/datadog/tracing/contrib/aws/ext.rb +25 -25
- data/lib/datadog/tracing/contrib/aws/instrumentation.rb +5 -5
- data/lib/datadog/tracing/contrib/aws/integration.rb +9 -9
- data/lib/datadog/tracing/contrib/aws/parsed_context.rb +1 -1
- data/lib/datadog/tracing/contrib/aws/patcher.rb +5 -5
- data/lib/datadog/tracing/contrib/aws/service/dynamodb.rb +2 -2
- data/lib/datadog/tracing/contrib/aws/service/eventbridge.rb +2 -2
- data/lib/datadog/tracing/contrib/aws/service/kinesis.rb +4 -4
- data/lib/datadog/tracing/contrib/aws/service/s3.rb +2 -2
- data/lib/datadog/tracing/contrib/aws/service/sns.rb +3 -3
- data/lib/datadog/tracing/contrib/aws/service/sqs.rb +3 -3
- data/lib/datadog/tracing/contrib/aws/service/states.rb +5 -5
- data/lib/datadog/tracing/contrib/aws/services.rb +14 -14
- data/lib/datadog/tracing/contrib/concurrent_ruby/async_patch.rb +1 -1
- data/lib/datadog/tracing/contrib/concurrent_ruby/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb +1 -1
- data/lib/datadog/tracing/contrib/concurrent_ruby/ext.rb +2 -2
- data/lib/datadog/tracing/contrib/concurrent_ruby/future_patch.rb +1 -1
- data/lib/datadog/tracing/contrib/concurrent_ruby/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb +4 -4
- data/lib/datadog/tracing/contrib/concurrent_ruby/promises_future_patch.rb +1 -1
- data/lib/datadog/tracing/contrib/configurable.rb +2 -2
- data/lib/datadog/tracing/contrib/configuration/resolvers/pattern_resolver.rb +1 -1
- data/lib/datadog/tracing/contrib/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/dalli/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/dalli/ext.rb +13 -13
- data/lib/datadog/tracing/contrib/dalli/instrumentation.rb +5 -5
- data/lib/datadog/tracing/contrib/dalli/integration.rb +7 -7
- data/lib/datadog/tracing/contrib/dalli/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/dalli/quantize.rb +2 -2
- data/lib/datadog/tracing/contrib/delayed_job/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/delayed_job/ext.rb +14 -14
- data/lib/datadog/tracing/contrib/delayed_job/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/delayed_job/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/delayed_job/plugin.rb +5 -5
- data/lib/datadog/tracing/contrib/elasticsearch/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/elasticsearch/ext.rb +15 -15
- data/lib/datadog/tracing/contrib/elasticsearch/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/elasticsearch/patcher.rb +10 -10
- data/lib/datadog/tracing/contrib/elasticsearch/quantize.rb +2 -2
- data/lib/datadog/tracing/contrib/ethon/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/ethon/easy_patch.rb +8 -8
- data/lib/datadog/tracing/contrib/ethon/ext.rb +13 -13
- data/lib/datadog/tracing/contrib/ethon/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/ethon/multi_patch.rb +3 -3
- data/lib/datadog/tracing/contrib/ethon/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/excon/configuration/settings.rb +5 -5
- data/lib/datadog/tracing/contrib/excon/ext.rb +11 -11
- data/lib/datadog/tracing/contrib/excon/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/excon/middleware.rb +8 -8
- data/lib/datadog/tracing/contrib/excon/patcher.rb +2 -2
- data/lib/datadog/tracing/contrib/ext.rb +15 -15
- data/lib/datadog/tracing/contrib/extensions.rb +2 -2
- data/lib/datadog/tracing/contrib/faraday/configuration/settings.rb +4 -4
- data/lib/datadog/tracing/contrib/faraday/ext.rb +11 -11
- data/lib/datadog/tracing/contrib/faraday/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/faraday/middleware.rb +8 -8
- data/lib/datadog/tracing/contrib/faraday/patcher.rb +6 -6
- data/lib/datadog/tracing/contrib/grape/configuration/settings.rb +4 -4
- data/lib/datadog/tracing/contrib/grape/endpoint.rb +20 -20
- data/lib/datadog/tracing/contrib/grape/ext.rb +15 -15
- data/lib/datadog/tracing/contrib/grape/instrumentation.rb +3 -3
- data/lib/datadog/tracing/contrib/grape/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/grape/patcher.rb +5 -5
- data/lib/datadog/tracing/contrib/graphql/configuration/error_extension_env_parser.rb +1 -1
- data/lib/datadog/tracing/contrib/graphql/configuration/settings.rb +3 -3
- data/lib/datadog/tracing/contrib/graphql/ext.rb +9 -9
- data/lib/datadog/tracing/contrib/graphql/integration.rb +9 -9
- data/lib/datadog/tracing/contrib/graphql/patcher.rb +7 -7
- data/lib/datadog/tracing/contrib/graphql/unified_trace.rb +37 -37
- data/lib/datadog/tracing/contrib/graphql/unified_trace_patcher.rb +2 -2
- data/lib/datadog/tracing/contrib/grpc/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb +7 -7
- data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb +7 -7
- data/lib/datadog/tracing/contrib/grpc/datadog_interceptor.rb +6 -6
- data/lib/datadog/tracing/contrib/grpc/distributed/fetcher.rb +1 -1
- data/lib/datadog/tracing/contrib/grpc/distributed/propagation.rb +8 -8
- data/lib/datadog/tracing/contrib/grpc/ext.rb +14 -14
- data/lib/datadog/tracing/contrib/grpc/formatting.rb +7 -7
- data/lib/datadog/tracing/contrib/grpc/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/grpc/intercept_with_datadog.rb +1 -1
- data/lib/datadog/tracing/contrib/grpc/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/grpc.rb +6 -6
- data/lib/datadog/tracing/contrib/hanami/action_tracer.rb +3 -3
- data/lib/datadog/tracing/contrib/hanami/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/hanami/ext.rb +8 -8
- data/lib/datadog/tracing/contrib/hanami/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/hanami/patcher.rb +5 -5
- data/lib/datadog/tracing/contrib/hanami/renderer_policy_tracing.rb +3 -3
- data/lib/datadog/tracing/contrib/hanami/router_tracing.rb +5 -4
- data/lib/datadog/tracing/contrib/http/circuit_breaker.rb +1 -1
- data/lib/datadog/tracing/contrib/http/configuration/settings.rb +4 -4
- data/lib/datadog/tracing/contrib/http/distributed/fetcher.rb +3 -3
- data/lib/datadog/tracing/contrib/http/distributed/propagation.rb +8 -8
- data/lib/datadog/tracing/contrib/http/ext.rb +11 -11
- data/lib/datadog/tracing/contrib/http/instrumentation.rb +6 -6
- data/lib/datadog/tracing/contrib/http/integration.rb +7 -7
- data/lib/datadog/tracing/contrib/http/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/http.rb +6 -6
- data/lib/datadog/tracing/contrib/httpclient/configuration/settings.rb +4 -4
- data/lib/datadog/tracing/contrib/httpclient/ext.rb +11 -11
- data/lib/datadog/tracing/contrib/httpclient/instrumentation.rb +5 -5
- data/lib/datadog/tracing/contrib/httpclient/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/httpclient/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/httprb/configuration/settings.rb +4 -4
- data/lib/datadog/tracing/contrib/httprb/ext.rb +11 -11
- data/lib/datadog/tracing/contrib/httprb/instrumentation.rb +6 -6
- data/lib/datadog/tracing/contrib/httprb/integration.rb +7 -7
- data/lib/datadog/tracing/contrib/httprb/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/integration.rb +3 -3
- data/lib/datadog/tracing/contrib/kafka/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/kafka/event.rb +3 -3
- data/lib/datadog/tracing/contrib/kafka/events/connection/request.rb +7 -3
- data/lib/datadog/tracing/contrib/kafka/events/consumer/process_batch.rb +4 -4
- data/lib/datadog/tracing/contrib/kafka/events/consumer/process_message.rb +4 -4
- data/lib/datadog/tracing/contrib/kafka/events/consumer_group/heartbeat.rb +5 -5
- data/lib/datadog/tracing/contrib/kafka/events/consumer_group/join_group.rb +5 -5
- data/lib/datadog/tracing/contrib/kafka/events/consumer_group/leave_group.rb +5 -5
- data/lib/datadog/tracing/contrib/kafka/events/consumer_group/sync_group.rb +5 -5
- data/lib/datadog/tracing/contrib/kafka/events/produce_operation/send_messages.rb +10 -5
- data/lib/datadog/tracing/contrib/kafka/events/producer/deliver_messages.rb +10 -5
- data/lib/datadog/tracing/contrib/kafka/events.rb +9 -9
- data/lib/datadog/tracing/contrib/kafka/ext.rb +40 -40
- data/lib/datadog/tracing/contrib/kafka/instrumentation/consumer.rb +2 -2
- data/lib/datadog/tracing/contrib/kafka/instrumentation/producer.rb +4 -4
- data/lib/datadog/tracing/contrib/kafka/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/kafka/patcher.rb +5 -5
- data/lib/datadog/tracing/contrib/karafka/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/karafka/distributed/propagation.rb +8 -8
- data/lib/datadog/tracing/contrib/karafka/ext.rb +13 -13
- data/lib/datadog/tracing/contrib/karafka/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/karafka/monitor.rb +14 -14
- data/lib/datadog/tracing/contrib/karafka/patcher.rb +8 -8
- data/lib/datadog/tracing/contrib/karafka.rb +6 -6
- data/lib/datadog/tracing/contrib/lograge/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/lograge/ext.rb +1 -1
- data/lib/datadog/tracing/contrib/lograge/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/lograge/patcher.rb +9 -9
- data/lib/datadog/tracing/contrib/mongodb/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/mongodb/ext.rb +18 -18
- data/lib/datadog/tracing/contrib/mongodb/instrumentation.rb +3 -3
- data/lib/datadog/tracing/contrib/mongodb/integration.rb +7 -7
- data/lib/datadog/tracing/contrib/mongodb/parsers.rb +5 -5
- data/lib/datadog/tracing/contrib/mongodb/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/mongodb/subscribers.rb +13 -13
- data/lib/datadog/tracing/contrib/mysql2/configuration/settings.rb +3 -3
- data/lib/datadog/tracing/contrib/mysql2/ext.rb +11 -11
- data/lib/datadog/tracing/contrib/mysql2/instrumentation.rb +6 -6
- data/lib/datadog/tracing/contrib/mysql2/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/mysql2/patcher.rb +2 -2
- data/lib/datadog/tracing/contrib/opensearch/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/opensearch/ext.rb +22 -22
- data/lib/datadog/tracing/contrib/opensearch/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/opensearch/patcher.rb +13 -13
- data/lib/datadog/tracing/contrib/opensearch/quantize.rb +3 -3
- data/lib/datadog/tracing/contrib/patcher.rb +2 -2
- data/lib/datadog/tracing/contrib/pg/configuration/settings.rb +3 -3
- data/lib/datadog/tracing/contrib/pg/ext.rb +19 -19
- data/lib/datadog/tracing/contrib/pg/instrumentation.rb +18 -18
- data/lib/datadog/tracing/contrib/pg/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/pg/patcher.rb +2 -2
- data/lib/datadog/tracing/contrib/presto/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/presto/ext.rb +21 -21
- data/lib/datadog/tracing/contrib/presto/instrumentation.rb +2 -2
- data/lib/datadog/tracing/contrib/presto/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/presto/patcher.rb +4 -4
- data/lib/datadog/tracing/contrib/propagation/sql_comment/comment.rb +2 -2
- data/lib/datadog/tracing/contrib/propagation/sql_comment/ext.rb +17 -17
- data/lib/datadog/tracing/contrib/propagation/sql_comment/mode.rb +1 -1
- data/lib/datadog/tracing/contrib/propagation/sql_comment.rb +5 -5
- data/lib/datadog/tracing/contrib/que/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/que/ext.rb +19 -19
- data/lib/datadog/tracing/contrib/que/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/que/patcher.rb +1 -1
- data/lib/datadog/tracing/contrib/que/tracer.rb +1 -1
- data/lib/datadog/tracing/contrib/racecar/configuration/settings.rb +3 -3
- data/lib/datadog/tracing/contrib/racecar/event.rb +4 -4
- data/lib/datadog/tracing/contrib/racecar/events/batch.rb +3 -3
- data/lib/datadog/tracing/contrib/racecar/events/consume.rb +3 -3
- data/lib/datadog/tracing/contrib/racecar/events/message.rb +3 -3
- data/lib/datadog/tracing/contrib/racecar/events.rb +3 -3
- data/lib/datadog/tracing/contrib/racecar/ext.rb +18 -18
- data/lib/datadog/tracing/contrib/racecar/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/racecar/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/rack/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/rack/ext.rb +33 -33
- data/lib/datadog/tracing/contrib/rack/header_collection.rb +3 -3
- data/lib/datadog/tracing/contrib/rack/header_tagging.rb +4 -4
- data/lib/datadog/tracing/contrib/rack/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/rack/middlewares.rb +24 -24
- data/lib/datadog/tracing/contrib/rack/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/rack/request_queue.rb +3 -3
- data/lib/datadog/tracing/contrib/rack/route_inference.rb +11 -11
- data/lib/datadog/tracing/contrib/rack/trace_proxy_middleware.rb +15 -15
- data/lib/datadog/tracing/contrib/rails/auto_instrument_railtie.rb +1 -1
- data/lib/datadog/tracing/contrib/rails/configuration/settings.rb +3 -3
- data/lib/datadog/tracing/contrib/rails/ext.rb +15 -15
- data/lib/datadog/tracing/contrib/rails/framework.rb +11 -11
- data/lib/datadog/tracing/contrib/rails/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/rails/middlewares.rb +1 -1
- data/lib/datadog/tracing/contrib/rails/patcher.rb +8 -8
- data/lib/datadog/tracing/contrib/rails/railtie.rb +4 -4
- data/lib/datadog/tracing/contrib/rails/runner.rb +1 -1
- data/lib/datadog/tracing/contrib/rake/configuration/settings.rb +3 -3
- data/lib/datadog/tracing/contrib/rake/ext.rb +12 -12
- data/lib/datadog/tracing/contrib/rake/instrumentation.rb +4 -4
- data/lib/datadog/tracing/contrib/rake/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/rake/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/redis/configuration/resolver.rb +2 -2
- data/lib/datadog/tracing/contrib/redis/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/redis/ext.rb +16 -16
- data/lib/datadog/tracing/contrib/redis/instrumentation.rb +6 -6
- data/lib/datadog/tracing/contrib/redis/integration.rb +7 -7
- data/lib/datadog/tracing/contrib/redis/patcher.rb +10 -10
- data/lib/datadog/tracing/contrib/redis/quantize.rb +4 -4
- data/lib/datadog/tracing/contrib/redis/tags.rb +5 -5
- data/lib/datadog/tracing/contrib/redis/trace_middleware.rb +5 -5
- data/lib/datadog/tracing/contrib/resque/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/resque/ext.rb +7 -7
- data/lib/datadog/tracing/contrib/resque/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/resque/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/resque/resque_job.rb +5 -5
- data/lib/datadog/tracing/contrib/rest_client/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/rest_client/ext.rb +10 -10
- data/lib/datadog/tracing/contrib/rest_client/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/rest_client/patcher.rb +2 -2
- data/lib/datadog/tracing/contrib/rest_client/request_patch.rb +5 -5
- data/lib/datadog/tracing/contrib/roda/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/roda/ext.rb +6 -6
- data/lib/datadog/tracing/contrib/roda/instrumentation.rb +4 -4
- data/lib/datadog/tracing/contrib/roda/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/roda/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/semantic_logger/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/semantic_logger/ext.rb +1 -1
- data/lib/datadog/tracing/contrib/semantic_logger/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/semantic_logger/patcher.rb +2 -2
- data/lib/datadog/tracing/contrib/sequel/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/sequel/database.rb +6 -10
- data/lib/datadog/tracing/contrib/sequel/dataset.rb +5 -5
- data/lib/datadog/tracing/contrib/sequel/ext.rb +12 -8
- data/lib/datadog/tracing/contrib/sequel/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/sequel/patcher.rb +3 -3
- data/lib/datadog/tracing/contrib/sequel/utils.rb +115 -10
- data/lib/datadog/tracing/contrib/shoryuken/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/shoryuken/ext.rb +12 -12
- data/lib/datadog/tracing/contrib/shoryuken/integration.rb +6 -6
- data/lib/datadog/tracing/contrib/shoryuken/patcher.rb +1 -1
- data/lib/datadog/tracing/contrib/shoryuken/tracer.rb +2 -2
- data/lib/datadog/tracing/contrib/sidekiq/client_tracer.rb +8 -8
- data/lib/datadog/tracing/contrib/sidekiq/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/sidekiq/distributed/propagation.rb +9 -9
- data/lib/datadog/tracing/contrib/sidekiq/ext.rb +30 -30
- data/lib/datadog/tracing/contrib/sidekiq/integration.rb +7 -7
- data/lib/datadog/tracing/contrib/sidekiq/patcher.rb +8 -8
- data/lib/datadog/tracing/contrib/sidekiq/server_tracer.rb +14 -14
- data/lib/datadog/tracing/contrib/sidekiq/utils.rb +9 -9
- data/lib/datadog/tracing/contrib/sidekiq.rb +6 -6
- data/lib/datadog/tracing/contrib/sinatra/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/sinatra/env.rb +6 -6
- data/lib/datadog/tracing/contrib/sinatra/ext.rb +17 -17
- data/lib/datadog/tracing/contrib/sinatra/framework.rb +2 -2
- data/lib/datadog/tracing/contrib/sinatra/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/sinatra/patcher.rb +5 -5
- data/lib/datadog/tracing/contrib/sinatra/tracer.rb +10 -10
- data/lib/datadog/tracing/contrib/sinatra/tracer_middleware.rb +8 -8
- data/lib/datadog/tracing/contrib/sneakers/configuration/settings.rb +1 -1
- data/lib/datadog/tracing/contrib/sneakers/ext.rb +12 -12
- data/lib/datadog/tracing/contrib/sneakers/integration.rb +7 -7
- data/lib/datadog/tracing/contrib/sneakers/patcher.rb +2 -2
- data/lib/datadog/tracing/contrib/sneakers/tracer.rb +3 -3
- data/lib/datadog/tracing/contrib/span_attribute_schema.rb +2 -2
- data/lib/datadog/tracing/contrib/status_range_env_parser.rb +2 -2
- data/lib/datadog/tracing/contrib/status_range_matcher.rb +1 -1
- data/lib/datadog/tracing/contrib/stripe/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/stripe/ext.rb +12 -12
- data/lib/datadog/tracing/contrib/stripe/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/stripe/patcher.rb +2 -2
- data/lib/datadog/tracing/contrib/stripe/request.rb +3 -3
- data/lib/datadog/tracing/contrib/sucker_punch/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/sucker_punch/exception_handler.rb +1 -1
- data/lib/datadog/tracing/contrib/sucker_punch/ext.rb +13 -13
- data/lib/datadog/tracing/contrib/sucker_punch/instrumentation.rb +4 -4
- data/lib/datadog/tracing/contrib/sucker_punch/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/sucker_punch/patcher.rb +4 -4
- data/lib/datadog/tracing/contrib/trilogy/configuration/settings.rb +3 -3
- data/lib/datadog/tracing/contrib/trilogy/ext.rb +11 -11
- data/lib/datadog/tracing/contrib/trilogy/instrumentation.rb +6 -6
- data/lib/datadog/tracing/contrib/trilogy/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/trilogy/patcher.rb +2 -2
- data/lib/datadog/tracing/contrib/utils/database.rb +5 -5
- data/lib/datadog/tracing/contrib/utils/quantization/hash_formatter.rb +1 -1
- data/lib/datadog/tracing/contrib/utils/quantization/http.rb +10 -10
- data/lib/datadog/tracing/contrib/waterdrop/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/waterdrop/distributed/propagation.rb +8 -8
- data/lib/datadog/tracing/contrib/waterdrop/ext.rb +4 -4
- data/lib/datadog/tracing/contrib/waterdrop/integration.rb +5 -5
- data/lib/datadog/tracing/contrib/waterdrop/middleware.rb +2 -2
- data/lib/datadog/tracing/contrib/waterdrop/patcher.rb +7 -7
- data/lib/datadog/tracing/contrib/waterdrop/producer.rb +3 -3
- data/lib/datadog/tracing/contrib/waterdrop.rb +6 -6
- data/lib/datadog/tracing/contrib.rb +54 -54
- data/lib/datadog/tracing/correlation.rb +10 -10
- data/lib/datadog/tracing/diagnostics/environment_logger.rb +9 -9
- data/lib/datadog/tracing/diagnostics/ext.rb +19 -19
- data/lib/datadog/tracing/diagnostics/health.rb +1 -1
- data/lib/datadog/tracing/distributed/b3_multi.rb +8 -8
- data/lib/datadog/tracing/distributed/b3_single.rb +4 -4
- data/lib/datadog/tracing/distributed/baggage.rb +28 -27
- data/lib/datadog/tracing/distributed/datadog.rb +21 -21
- data/lib/datadog/tracing/distributed/datadog_tags_codec.rb +3 -3
- data/lib/datadog/tracing/distributed/fetcher.rb +1 -1
- data/lib/datadog/tracing/distributed/helpers.rb +3 -3
- data/lib/datadog/tracing/distributed/propagation.rb +12 -12
- data/lib/datadog/tracing/distributed/propagation_policy.rb +5 -0
- data/lib/datadog/tracing/distributed/trace_context.rb +33 -33
- data/lib/datadog/tracing/event.rb +1 -1
- data/lib/datadog/tracing/ext.rb +9 -0
- data/lib/datadog/tracing/metadata/analytics.rb +2 -2
- data/lib/datadog/tracing/metadata/errors.rb +4 -4
- data/lib/datadog/tracing/metadata/ext.rb +69 -69
- data/lib/datadog/tracing/metadata/metastruct.rb +1 -1
- data/lib/datadog/tracing/metadata/metastruct_tagging.rb +1 -1
- data/lib/datadog/tracing/metadata/tagging.rb +2 -2
- data/lib/datadog/tracing/metadata.rb +4 -4
- data/lib/datadog/tracing/pipeline/span_filter.rb +2 -2
- data/lib/datadog/tracing/pipeline.rb +2 -2
- data/lib/datadog/tracing/remote.rb +45 -7
- data/lib/datadog/tracing/sampling/all_sampler.rb +1 -1
- data/lib/datadog/tracing/sampling/ext.rb +8 -8
- data/lib/datadog/tracing/sampling/matcher.rb +4 -4
- data/lib/datadog/tracing/sampling/priority_sampler.rb +4 -4
- data/lib/datadog/tracing/sampling/rate_by_key_sampler.rb +3 -3
- data/lib/datadog/tracing/sampling/rate_by_service_sampler.rb +2 -2
- data/lib/datadog/tracing/sampling/rate_sampler.rb +2 -2
- data/lib/datadog/tracing/sampling/rule.rb +4 -4
- data/lib/datadog/tracing/sampling/rule_sampler.rb +12 -12
- data/lib/datadog/tracing/sampling/sampler.rb +2 -2
- data/lib/datadog/tracing/sampling/span/ext.rb +3 -3
- data/lib/datadog/tracing/sampling/span/matcher.rb +2 -2
- data/lib/datadog/tracing/sampling/span/rule.rb +1 -1
- data/lib/datadog/tracing/sampling/span/rule_parser.rb +8 -8
- data/lib/datadog/tracing/span.rb +8 -8
- data/lib/datadog/tracing/span_event.rb +5 -5
- data/lib/datadog/tracing/span_operation.rb +21 -21
- data/lib/datadog/tracing/sync_writer.rb +12 -7
- data/lib/datadog/tracing/trace_operation.rb +11 -11
- data/lib/datadog/tracing/trace_segment.rb +10 -10
- data/lib/datadog/tracing/tracer.rb +23 -15
- data/lib/datadog/tracing/transport/http/client.rb +4 -4
- data/lib/datadog/tracing/transport/http/statistics.rb +2 -2
- data/lib/datadog/tracing/transport/http/traces.rb +8 -8
- data/lib/datadog/tracing/transport/http.rb +10 -10
- data/lib/datadog/tracing/transport/io/client.rb +2 -2
- data/lib/datadog/tracing/transport/io/response.rb +1 -1
- data/lib/datadog/tracing/transport/io/traces.rb +4 -4
- data/lib/datadog/tracing/transport/io.rb +3 -3
- data/lib/datadog/tracing/transport/native/response.rb +71 -0
- data/lib/datadog/tracing/transport/native.rb +363 -0
- data/lib/datadog/tracing/transport/serializable_trace.rb +19 -19
- data/lib/datadog/tracing/transport/statistics.rb +2 -2
- data/lib/datadog/tracing/transport/trace_formatter.rb +10 -10
- data/lib/datadog/tracing/transport/traces.rb +8 -8
- data/lib/datadog/tracing/utils.rb +2 -2
- data/lib/datadog/tracing/workers.rb +2 -2
- data/lib/datadog/tracing/writer.rb +21 -8
- data/lib/datadog/tracing.rb +3 -3
- data/lib/datadog/version.rb +4 -4
- data/lib/datadog.rb +13 -12
- metadata +33 -8
|
@@ -0,0 +1,378 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
require_relative "route_text"
|
|
4
|
+
|
|
5
|
+
module Datadog
|
|
6
|
+
module AppSec
|
|
7
|
+
module RouteNormalizer
|
|
8
|
+
# Normalizes a route spec pattern into the route format, inspired by
|
|
9
|
+
# OpenAPI v3 path templating (best effort)
|
|
10
|
+
#
|
|
11
|
+
# Example:
|
|
12
|
+
#
|
|
13
|
+
# /users/:id => /users/{id}
|
|
14
|
+
# /photos/:id.:format => /photos/{id+format}
|
|
15
|
+
# /posts/:id(.:format) => /posts/{id+format}
|
|
16
|
+
# /files/*path => /files/{path}
|
|
17
|
+
# /hello world => /hello%20world
|
|
18
|
+
#
|
|
19
|
+
# NOTE: When a request path is supplied, optional groups `(...)` are resolved
|
|
20
|
+
# against it: a group is kept only when the path actually matched it.
|
|
21
|
+
#
|
|
22
|
+
# NOTE: Without a request path (or for paths longer than {MAX_RESOLVE_LENGTH}),
|
|
23
|
+
# optional markers are flattened and kept as if present.
|
|
24
|
+
#
|
|
25
|
+
# @api private
|
|
26
|
+
class RoutePattern
|
|
27
|
+
GROUP_OPEN_CHAR = "("
|
|
28
|
+
GROUP_CLOSE_CHAR = ")"
|
|
29
|
+
|
|
30
|
+
OPTIONAL_GROUP_SUFFIX_CHAR = "?"
|
|
31
|
+
OPTIONAL_GROUP_SIGILS = [
|
|
32
|
+
GROUP_OPEN_CHAR,
|
|
33
|
+
GROUP_CLOSE_CHAR,
|
|
34
|
+
OPTIONAL_GROUP_SUFFIX_CHAR
|
|
35
|
+
].join
|
|
36
|
+
|
|
37
|
+
NAMED_PARAM_PREFIX_CHAR = ":"
|
|
38
|
+
GLOB_PARAM_PREFIX_CHAR = "*"
|
|
39
|
+
|
|
40
|
+
PATTERN_STRUCTURE_CHARS = [
|
|
41
|
+
NAMED_PARAM_PREFIX_CHAR,
|
|
42
|
+
GLOB_PARAM_PREFIX_CHAR,
|
|
43
|
+
GROUP_OPEN_CHAR,
|
|
44
|
+
GROUP_CLOSE_CHAR
|
|
45
|
+
].join
|
|
46
|
+
|
|
47
|
+
PARAM_NAME_CHARS = [*"a".."z", *"A".."Z", *"0".."9", "_"].join
|
|
48
|
+
|
|
49
|
+
EXCLUDED_PARAM_NAME_TERMINATOR_CHARS = [
|
|
50
|
+
PARAM_NAME_CHARS,
|
|
51
|
+
PATTERN_STRUCTURE_CHARS
|
|
52
|
+
].join
|
|
53
|
+
|
|
54
|
+
MAX_RESOLVE_LENGTH = 8192
|
|
55
|
+
|
|
56
|
+
Checkpoint = Struct.new(:resolved_length, :pattern_index, :path_index)
|
|
57
|
+
|
|
58
|
+
# Param sigils mark where dynamic route syntax may start
|
|
59
|
+
#
|
|
60
|
+
# Example:
|
|
61
|
+
#
|
|
62
|
+
# users -> no
|
|
63
|
+
# :id -> yes
|
|
64
|
+
# user-:id -> yes
|
|
65
|
+
# * -> yes
|
|
66
|
+
# foo: -> yes (validated later by {PARAM_TOKENS})
|
|
67
|
+
PARAM_START_SIGILS = /[:\*]/
|
|
68
|
+
PARAM_TOKENS = /:\w+|(?<!\w)\*\w*/
|
|
69
|
+
|
|
70
|
+
def initialize(pattern)
|
|
71
|
+
@pattern = pattern
|
|
72
|
+
end
|
|
73
|
+
|
|
74
|
+
def normalize(path: nil)
|
|
75
|
+
@path_index = 0
|
|
76
|
+
@pattern_index = 0
|
|
77
|
+
|
|
78
|
+
@path = path || ""
|
|
79
|
+
@path_length = @path.length
|
|
80
|
+
@pattern_length = @pattern.length
|
|
81
|
+
|
|
82
|
+
nameless_counter = 0
|
|
83
|
+
pattern = resolve_pattern_optionals(path)
|
|
84
|
+
|
|
85
|
+
result = pattern.split("/", -1).each_with_object(+"") do |segment, memo|
|
|
86
|
+
memo << "/" unless memo.empty? && segment.empty?
|
|
87
|
+
next if segment.empty?
|
|
88
|
+
|
|
89
|
+
unless segment.match?(PARAM_START_SIGILS)
|
|
90
|
+
memo << RouteText.escape(segment)
|
|
91
|
+
next
|
|
92
|
+
end
|
|
93
|
+
|
|
94
|
+
tokens = segment.scan(PARAM_TOKENS)
|
|
95
|
+
|
|
96
|
+
if tokens.empty?
|
|
97
|
+
memo << RouteText.escape(segment)
|
|
98
|
+
next
|
|
99
|
+
end
|
|
100
|
+
|
|
101
|
+
names = tokens.map do |token|
|
|
102
|
+
if token.length > 1
|
|
103
|
+
token[1..-1]
|
|
104
|
+
else
|
|
105
|
+
"param#{nameless_counter += 1}"
|
|
106
|
+
end
|
|
107
|
+
end
|
|
108
|
+
|
|
109
|
+
memo << "{#{names.join("+")}}"
|
|
110
|
+
end
|
|
111
|
+
|
|
112
|
+
result.start_with?("/") ? result : "/#{result}"
|
|
113
|
+
end
|
|
114
|
+
|
|
115
|
+
private
|
|
116
|
+
|
|
117
|
+
# Optional resolution walks the route pattern and request path together
|
|
118
|
+
#
|
|
119
|
+
# Example:
|
|
120
|
+
#
|
|
121
|
+
# pattern: /posts/:id(.:format)
|
|
122
|
+
# path: /posts/1.json
|
|
123
|
+
# ^
|
|
124
|
+
# `.` matches, so the optional group is kept
|
|
125
|
+
#
|
|
126
|
+
# pattern: /posts/:id(.:format)
|
|
127
|
+
# path: /posts/1
|
|
128
|
+
# ^
|
|
129
|
+
# path ended before `.`, so the optional group is skipped
|
|
130
|
+
#
|
|
131
|
+
# Checkpoints let optional groups fail after a partial match
|
|
132
|
+
#
|
|
133
|
+
# pattern: /posts(/:id)/edit
|
|
134
|
+
# path: /posts/edit
|
|
135
|
+
# ^
|
|
136
|
+
# `(/:id)` starts like `/edit`, so a checkpoint is saved
|
|
137
|
+
#
|
|
138
|
+
# pattern: /posts(/:id)/edit
|
|
139
|
+
# path: /posts/edit
|
|
140
|
+
# ^
|
|
141
|
+
# `:id` cannot consume `edit`, so we rewind after `(/:id)`
|
|
142
|
+
def resolve_pattern_optionals(path)
|
|
143
|
+
return @pattern if !@pattern.include?(GROUP_OPEN_CHAR) && !@pattern.include?(OPTIONAL_GROUP_SUFFIX_CHAR)
|
|
144
|
+
|
|
145
|
+
unless resolve_pattern_optionals?(path)
|
|
146
|
+
return remove_optional_group_sigils(@pattern) if @pattern.include?(GROUP_OPEN_CHAR)
|
|
147
|
+
|
|
148
|
+
return @pattern
|
|
149
|
+
end
|
|
150
|
+
|
|
151
|
+
resolved = +""
|
|
152
|
+
checkpoints = []
|
|
153
|
+
|
|
154
|
+
while @pattern_index < @pattern_length
|
|
155
|
+
char = @pattern[@pattern_index] # : String
|
|
156
|
+
|
|
157
|
+
case char
|
|
158
|
+
when GROUP_OPEN_CHAR
|
|
159
|
+
optional_group_end_index = find_next_optional_group_end_index
|
|
160
|
+
|
|
161
|
+
# NOTE: The request path may share the optional group's first char
|
|
162
|
+
# with the next required segment
|
|
163
|
+
#
|
|
164
|
+
# Example: `/posts/edit` request path starts like `(/:id)` in pattern
|
|
165
|
+
# `/posts(/:id)/edit`, but `:id` must be skipped
|
|
166
|
+
if @path_index < @path_length && @path[@path_index] == @pattern[@pattern_index + 1]
|
|
167
|
+
checkpoints << Checkpoint.new(resolved.length, optional_group_end_index + 1, @path_index)
|
|
168
|
+
@pattern_index += 1
|
|
169
|
+
else
|
|
170
|
+
@pattern_index = optional_group_end_index + 1
|
|
171
|
+
end
|
|
172
|
+
when GROUP_CLOSE_CHAR
|
|
173
|
+
@pattern_index += 1
|
|
174
|
+
@pattern_index += 1 if @pattern[@pattern_index] == OPTIONAL_GROUP_SUFFIX_CHAR
|
|
175
|
+
when OPTIONAL_GROUP_SUFFIX_CHAR
|
|
176
|
+
@pattern_index += 1
|
|
177
|
+
when NAMED_PARAM_PREFIX_CHAR
|
|
178
|
+
param_name_end_index = find_param_name_end_index(@pattern_index)
|
|
179
|
+
|
|
180
|
+
# NOTE: A ':' without a param name is literal text
|
|
181
|
+
# Example: `/foo:` must match a literal `:`, not a param
|
|
182
|
+
if param_name_end_index == @pattern_index + 1
|
|
183
|
+
unless expected_path_char?(NAMED_PARAM_PREFIX_CHAR)
|
|
184
|
+
checkpoint = restore_checkpoint!(resolved, checkpoints)
|
|
185
|
+
return remove_optional_group_sigils(@pattern) unless checkpoint
|
|
186
|
+
|
|
187
|
+
@pattern_index = checkpoint.pattern_index
|
|
188
|
+
@path_index = checkpoint.path_index
|
|
189
|
+
|
|
190
|
+
next
|
|
191
|
+
end
|
|
192
|
+
|
|
193
|
+
@path_index += 1
|
|
194
|
+
@pattern_index += 1
|
|
195
|
+
resolved << NAMED_PARAM_PREFIX_CHAR
|
|
196
|
+
|
|
197
|
+
next
|
|
198
|
+
end
|
|
199
|
+
|
|
200
|
+
# NOTE: A trailing `?` makes the param optional
|
|
201
|
+
# Example: `/posts/:id.?:format?` with `/posts/1` skips `:format?`
|
|
202
|
+
if @pattern[param_name_end_index] == OPTIONAL_GROUP_SUFFIX_CHAR && @path_index >= @path_length
|
|
203
|
+
@pattern_index = param_name_end_index + 1
|
|
204
|
+
next
|
|
205
|
+
end
|
|
206
|
+
|
|
207
|
+
param_token = @pattern[@pattern_index...param_name_end_index] # : String
|
|
208
|
+
resolved << param_token
|
|
209
|
+
|
|
210
|
+
terminator_char = find_param_value_terminator_char(param_name_end_index: param_name_end_index)
|
|
211
|
+
@path_index = find_param_value_end_index(terminator_char: terminator_char)
|
|
212
|
+
|
|
213
|
+
@pattern_index = param_name_end_index
|
|
214
|
+
when GLOB_PARAM_PREFIX_CHAR
|
|
215
|
+
param_name_end_index = find_param_name_end_index(@pattern_index)
|
|
216
|
+
terminator_char = find_param_value_terminator_char(param_name_end_index: param_name_end_index)
|
|
217
|
+
|
|
218
|
+
param_token = @pattern[@pattern_index...param_name_end_index] # : String
|
|
219
|
+
resolved << param_token
|
|
220
|
+
|
|
221
|
+
@path_index = find_glob_value_end_index(terminator_char: terminator_char)
|
|
222
|
+
@pattern_index = param_name_end_index
|
|
223
|
+
else
|
|
224
|
+
unless expected_path_char?(char)
|
|
225
|
+
if @pattern[@pattern_index + 1] == OPTIONAL_GROUP_SUFFIX_CHAR
|
|
226
|
+
@pattern_index += 2
|
|
227
|
+
next
|
|
228
|
+
end
|
|
229
|
+
|
|
230
|
+
next if skip_char_with_optional_param?
|
|
231
|
+
|
|
232
|
+
checkpoint = restore_checkpoint!(resolved, checkpoints)
|
|
233
|
+
return remove_optional_group_sigils(@pattern) unless checkpoint
|
|
234
|
+
|
|
235
|
+
@pattern_index = checkpoint.pattern_index
|
|
236
|
+
@path_index = checkpoint.path_index
|
|
237
|
+
|
|
238
|
+
next
|
|
239
|
+
end
|
|
240
|
+
|
|
241
|
+
resolved << char
|
|
242
|
+
|
|
243
|
+
@path_index += 1
|
|
244
|
+
@pattern_index += 1
|
|
245
|
+
end
|
|
246
|
+
end
|
|
247
|
+
|
|
248
|
+
resolved
|
|
249
|
+
end
|
|
250
|
+
|
|
251
|
+
def resolve_pattern_optionals?(path)
|
|
252
|
+
return false unless path
|
|
253
|
+
|
|
254
|
+
@path_length <= MAX_RESOLVE_LENGTH
|
|
255
|
+
end
|
|
256
|
+
|
|
257
|
+
def expected_path_char?(char)
|
|
258
|
+
@path_index < @path_length && @path[@path_index] == char
|
|
259
|
+
end
|
|
260
|
+
|
|
261
|
+
def restore_checkpoint!(resolved, checkpoints)
|
|
262
|
+
checkpoint = checkpoints.pop
|
|
263
|
+
return unless checkpoint
|
|
264
|
+
|
|
265
|
+
resolved.slice!(checkpoint.resolved_length..-1)
|
|
266
|
+
checkpoint
|
|
267
|
+
end
|
|
268
|
+
|
|
269
|
+
def remove_optional_group_sigils(pattern)
|
|
270
|
+
pattern.delete(OPTIONAL_GROUP_SIGILS)
|
|
271
|
+
end
|
|
272
|
+
|
|
273
|
+
# NOTE: When the path ends before a char that prefixes an optional param,
|
|
274
|
+
# skip both the char and that param
|
|
275
|
+
#
|
|
276
|
+
# Example:
|
|
277
|
+
# pattern: /posts/:id?
|
|
278
|
+
# path: /posts
|
|
279
|
+
# skip: ^^^^^
|
|
280
|
+
#
|
|
281
|
+
# pattern: /a.:b?
|
|
282
|
+
# path: /a
|
|
283
|
+
# skip: ^^^^
|
|
284
|
+
def skip_char_with_optional_param?
|
|
285
|
+
return false if @path_index < @path_length
|
|
286
|
+
|
|
287
|
+
param_start_index = @pattern_index + 1
|
|
288
|
+
return false unless param_start_char?(param_start_index)
|
|
289
|
+
|
|
290
|
+
param_name_end_index = find_param_name_end_index(param_start_index)
|
|
291
|
+
return false unless @pattern[param_name_end_index] == OPTIONAL_GROUP_SUFFIX_CHAR
|
|
292
|
+
|
|
293
|
+
@pattern_index = param_name_end_index + 1
|
|
294
|
+
true
|
|
295
|
+
end
|
|
296
|
+
|
|
297
|
+
def param_start_char?(index)
|
|
298
|
+
@pattern[index] == NAMED_PARAM_PREFIX_CHAR || @pattern[index] == GLOB_PARAM_PREFIX_CHAR
|
|
299
|
+
end
|
|
300
|
+
|
|
301
|
+
def find_param_name_end_index(param_start_index)
|
|
302
|
+
current_index = param_start_index + 1
|
|
303
|
+
|
|
304
|
+
while current_index < @pattern_length
|
|
305
|
+
char = @pattern[current_index] # : String
|
|
306
|
+
break unless PARAM_NAME_CHARS.include?(char)
|
|
307
|
+
|
|
308
|
+
current_index += 1
|
|
309
|
+
end
|
|
310
|
+
|
|
311
|
+
current_index
|
|
312
|
+
end
|
|
313
|
+
|
|
314
|
+
def find_param_value_terminator_char(param_name_end_index:)
|
|
315
|
+
char = @pattern[param_name_end_index]
|
|
316
|
+
|
|
317
|
+
if char == GROUP_OPEN_CHAR
|
|
318
|
+
@pattern[param_name_end_index + 1]
|
|
319
|
+
else
|
|
320
|
+
char
|
|
321
|
+
end
|
|
322
|
+
end
|
|
323
|
+
|
|
324
|
+
def find_param_value_end_index(terminator_char:)
|
|
325
|
+
terminator_indexes = []
|
|
326
|
+
slash_index = @path.index("/", @path_index)
|
|
327
|
+
dot_index = @path.index(".", @path_index)
|
|
328
|
+
|
|
329
|
+
terminator_indexes << slash_index if slash_index
|
|
330
|
+
terminator_indexes << dot_index if dot_index
|
|
331
|
+
|
|
332
|
+
if terminator_char && !EXCLUDED_PARAM_NAME_TERMINATOR_CHARS.include?(terminator_char)
|
|
333
|
+
custom_index = @path.index(terminator_char, @path_index)
|
|
334
|
+
terminator_indexes << custom_index if custom_index
|
|
335
|
+
end
|
|
336
|
+
|
|
337
|
+
terminator_indexes.empty? ? @path.length : terminator_indexes.min
|
|
338
|
+
end
|
|
339
|
+
|
|
340
|
+
def find_glob_value_end_index(terminator_char:)
|
|
341
|
+
return @path_length unless terminator_char
|
|
342
|
+
return @path_length if EXCLUDED_PARAM_NAME_TERMINATOR_CHARS.include?(terminator_char)
|
|
343
|
+
|
|
344
|
+
terminator_index = @path.rindex(terminator_char)
|
|
345
|
+
return @path_length unless terminator_index && terminator_index >= @path_index
|
|
346
|
+
|
|
347
|
+
terminator_index
|
|
348
|
+
end
|
|
349
|
+
|
|
350
|
+
def find_next_optional_group_end_index
|
|
351
|
+
depth = 0
|
|
352
|
+
index = @pattern_index
|
|
353
|
+
|
|
354
|
+
while index < @pattern_length
|
|
355
|
+
char = @pattern[index]
|
|
356
|
+
depth += 1 if char == GROUP_OPEN_CHAR
|
|
357
|
+
|
|
358
|
+
if char == GROUP_CLOSE_CHAR
|
|
359
|
+
depth -= 1
|
|
360
|
+
|
|
361
|
+
if depth.zero?
|
|
362
|
+
next_index = index + 1
|
|
363
|
+
|
|
364
|
+
return next_index if @pattern[next_index] == OPTIONAL_GROUP_SUFFIX_CHAR
|
|
365
|
+
|
|
366
|
+
return index
|
|
367
|
+
end
|
|
368
|
+
end
|
|
369
|
+
|
|
370
|
+
index += 1
|
|
371
|
+
end
|
|
372
|
+
|
|
373
|
+
index
|
|
374
|
+
end
|
|
375
|
+
end
|
|
376
|
+
end
|
|
377
|
+
end
|
|
378
|
+
end
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Datadog
|
|
4
|
+
module AppSec
|
|
5
|
+
module RouteNormalizer
|
|
6
|
+
# Percent-encodes route text, leaving param templates untouched
|
|
7
|
+
#
|
|
8
|
+
# @api private
|
|
9
|
+
module RouteText
|
|
10
|
+
DISALLOWED_CHARS = %r{[^\w.~/-]}
|
|
11
|
+
|
|
12
|
+
# Per-byte percent-encoding lookup, indexed by byte value (0-255)
|
|
13
|
+
#
|
|
14
|
+
# Example:
|
|
15
|
+
#
|
|
16
|
+
# 32 => %20 (space)
|
|
17
|
+
# 33 => %21 (!)
|
|
18
|
+
# 47 => / (passthrough)
|
|
19
|
+
# 65 => A (passthrough)
|
|
20
|
+
# 195 => %C3 (UTF-8 lead byte)
|
|
21
|
+
# 169 => %A9 (UTF-8 continuation byte)
|
|
22
|
+
BYTE_ENCODING_TABLE = Array.new(256) do |byte|
|
|
23
|
+
char = byte.chr
|
|
24
|
+
char.match?(DISALLOWED_CHARS) ? -("%%%02X" % byte) : -char
|
|
25
|
+
end.freeze
|
|
26
|
+
|
|
27
|
+
# Max bytes one input byte expands to as percent-encoded `%XX`
|
|
28
|
+
MAX_ENCODED_BYTE_SIZE = 3
|
|
29
|
+
|
|
30
|
+
module_function
|
|
31
|
+
|
|
32
|
+
# Escapes literal route text into normalized-route form
|
|
33
|
+
#
|
|
34
|
+
# Example:
|
|
35
|
+
#
|
|
36
|
+
# a+b => a%2Bb
|
|
37
|
+
# café => caf%C3%A9
|
|
38
|
+
# /users/path => /users/path
|
|
39
|
+
#
|
|
40
|
+
# NOTE: {URI::Parser#escape} with {DISALLOWED_CHARS} gives the same output,
|
|
41
|
+
# but the generic gsub/sprintf path is slower and allocates more per request
|
|
42
|
+
def escape(text)
|
|
43
|
+
return text unless text.match?(DISALLOWED_CHARS)
|
|
44
|
+
|
|
45
|
+
buffer = String.new(capacity: text.bytesize * MAX_ENCODED_BYTE_SIZE, encoding: Encoding::UTF_8)
|
|
46
|
+
text.each_byte { |byte| buffer << BYTE_ENCODING_TABLE.fetch(byte) }
|
|
47
|
+
buffer
|
|
48
|
+
# NOTE: Defensive only — this can never happen. {String#each_byte} yields
|
|
49
|
+
# integers in 0-255 and {BYTE_ENCODING_TABLE} has an entry for every one
|
|
50
|
+
rescue IndexError => e
|
|
51
|
+
AppSec.telemetry&.report(e, description: "AppSec: Route text byte outside 0-255 escape table")
|
|
52
|
+
"~invalid~"
|
|
53
|
+
end
|
|
54
|
+
end
|
|
55
|
+
end
|
|
56
|
+
end
|
|
57
|
+
end
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
require_relative "route_normalizer/route_pattern"
|
|
4
|
+
require_relative "route_normalizer/rails_route_pattern"
|
|
5
|
+
|
|
6
|
+
module Datadog
|
|
7
|
+
module AppSec
|
|
8
|
+
# Extracts framework route data from Rack env and normalizes it into
|
|
9
|
+
# OpenAPI v3 compatible route format
|
|
10
|
+
#
|
|
11
|
+
# @api private
|
|
12
|
+
module RouteNormalizer
|
|
13
|
+
GRAPE_ROUTE_KEY = "grape.routing_args"
|
|
14
|
+
SINATRA_ROUTE_KEY = "sinatra.route"
|
|
15
|
+
DATADOG_ROUTE_KEY = "datadog.action_dispatch.route"
|
|
16
|
+
RAILS_ROUTE_KEY = "action_dispatch.route"
|
|
17
|
+
RAILS_ROUTE_URI_PATTERN_KEY = "action_dispatch.route_uri_pattern"
|
|
18
|
+
RAILS_PATH_PARAMS_KEY = "action_dispatch.request.path_parameters"
|
|
19
|
+
|
|
20
|
+
module_function
|
|
21
|
+
|
|
22
|
+
# Extracts a normalized route path for a Rack request.
|
|
23
|
+
#
|
|
24
|
+
# Examples:
|
|
25
|
+
#
|
|
26
|
+
# Grape: "/api/users/:id" => "/api/users/{id}"
|
|
27
|
+
# Sinatra: "GET /download/*.*" => "/download/{param1+param2}"
|
|
28
|
+
# Rails: "/posts/:id(.:format)" + path => "/posts/{id+format}"
|
|
29
|
+
# Pattern: "/users/:id" => "/users/{id}"
|
|
30
|
+
def extract_normalized_route(rack_env, prefix: nil, pattern: nil)
|
|
31
|
+
route_prefix = prefix || rack_env["SCRIPT_NAME"]
|
|
32
|
+
|
|
33
|
+
if rack_env.key?(GRAPE_ROUTE_KEY)
|
|
34
|
+
route_info = rack_env[GRAPE_ROUTE_KEY][:route_info]
|
|
35
|
+
normalize_route_string(route_info&.pattern&.origin)
|
|
36
|
+
elsif rack_env.key?(SINATRA_ROUTE_KEY)
|
|
37
|
+
normalize_route_string(rack_env[SINATRA_ROUTE_KEY].split(" ", 2)[1])
|
|
38
|
+
elsif (rails_route = rack_env[DATADOG_ROUTE_KEY] || rack_env[RAILS_ROUTE_KEY])
|
|
39
|
+
normalize_rails_route(rails_route, rack_env, route_prefix)
|
|
40
|
+
elsif rack_env.key?(RAILS_ROUTE_URI_PATTERN_KEY)
|
|
41
|
+
normalize_rails_route(rack_env[RAILS_ROUTE_URI_PATTERN_KEY], rack_env, route_prefix)
|
|
42
|
+
else
|
|
43
|
+
normalize_route_string(pattern)
|
|
44
|
+
end
|
|
45
|
+
rescue => e
|
|
46
|
+
AppSec.telemetry&.report(e, description: "AppSec: Could not compute normalized route")
|
|
47
|
+
|
|
48
|
+
nil
|
|
49
|
+
end
|
|
50
|
+
|
|
51
|
+
private_class_method def normalize_rails_route(route, rack_env, route_prefix)
|
|
52
|
+
path_params = rack_env.fetch(RAILS_PATH_PARAMS_KEY, {})
|
|
53
|
+
path = path_without_prefix(rack_env["PATH_INFO"].to_s, route_prefix)
|
|
54
|
+
|
|
55
|
+
RailsRoutePattern.new(route).normalize(path_params: path_params, path: path)
|
|
56
|
+
end
|
|
57
|
+
|
|
58
|
+
private_class_method def normalize_route_string(route)
|
|
59
|
+
return unless route
|
|
60
|
+
|
|
61
|
+
RoutePattern.new(route).normalize
|
|
62
|
+
end
|
|
63
|
+
|
|
64
|
+
private_class_method def path_without_prefix(path, prefix)
|
|
65
|
+
return path unless prefix
|
|
66
|
+
|
|
67
|
+
prefix = prefix.to_s
|
|
68
|
+
return path if prefix.empty? || prefix == "/"
|
|
69
|
+
return path unless path.start_with?(prefix)
|
|
70
|
+
|
|
71
|
+
next_char = path[prefix.length]
|
|
72
|
+
return path if next_char && next_char != "/"
|
|
73
|
+
|
|
74
|
+
# NOTE: `start_with?` guards impossible `nil` case
|
|
75
|
+
stripped = path[prefix.length..-1] # : String
|
|
76
|
+
stripped.empty? ? "/" : stripped
|
|
77
|
+
end
|
|
78
|
+
end
|
|
79
|
+
end
|
|
80
|
+
end
|
|
@@ -6,7 +6,7 @@ module Datadog
|
|
|
6
6
|
# SecurityEngine::Engine creates WAF builder and manages its configuration.
|
|
7
7
|
# It also rebuilds WAF handle from the WAF builder when configuration changes.
|
|
8
8
|
class Engine
|
|
9
|
-
DEFAULT_RULES_CONFIG_PATH =
|
|
9
|
+
DEFAULT_RULES_CONFIG_PATH = "ASM_DD/default"
|
|
10
10
|
TELEMETRY_ACTIONS = %w[init update].freeze
|
|
11
11
|
DIAGNOSTICS_CONFIG_KEYS = %w[
|
|
12
12
|
rules
|
|
@@ -36,19 +36,19 @@ module Datadog
|
|
|
36
36
|
)
|
|
37
37
|
|
|
38
38
|
diagnostics = load_default_config(telemetry: telemetry)
|
|
39
|
-
report_configuration_diagnostics(diagnostics, action:
|
|
40
|
-
@ruleset_version = diagnostics[
|
|
39
|
+
report_configuration_diagnostics(diagnostics, action: "init", telemetry: telemetry)
|
|
40
|
+
@ruleset_version = diagnostics["ruleset_version"]
|
|
41
41
|
|
|
42
42
|
@handle_ref = ThreadSafeRef.new(@waf_builder.build_handle)
|
|
43
43
|
|
|
44
|
-
metric(
|
|
44
|
+
metric("init", success: true, ruleset_version: @ruleset_version, telemetry: telemetry)
|
|
45
45
|
rescue WAF::Error => e
|
|
46
|
-
error_message =
|
|
46
|
+
error_message = "AppSec security engine failed to initialize"
|
|
47
47
|
|
|
48
48
|
Datadog.logger.error("#{error_message}, error #{e.inspect}")
|
|
49
49
|
telemetry.report(e, description: error_message)
|
|
50
50
|
|
|
51
|
-
metric(
|
|
51
|
+
metric("init", success: false, ruleset_version: @ruleset_version, telemetry: telemetry)
|
|
52
52
|
|
|
53
53
|
raise e
|
|
54
54
|
end
|
|
@@ -58,23 +58,23 @@ module Datadog
|
|
|
58
58
|
end
|
|
59
59
|
|
|
60
60
|
def add_or_update_config(config, path:)
|
|
61
|
-
is_ruleset_update = path.include?(
|
|
61
|
+
is_ruleset_update = path.include?("ASM_DD")
|
|
62
62
|
|
|
63
63
|
# default config has to be removed when adding an ASM_DD config
|
|
64
64
|
remove_config_at_path(DEFAULT_RULES_CONFIG_PATH) if is_ruleset_update
|
|
65
65
|
|
|
66
66
|
diagnostics = @waf_builder.add_or_update_config(config, path: path)
|
|
67
|
-
@reconfigured_ruleset_version = diagnostics[
|
|
68
|
-
report_configuration_diagnostics(diagnostics, action:
|
|
67
|
+
@reconfigured_ruleset_version = diagnostics["ruleset_version"] if diagnostics.key?("ruleset_version")
|
|
68
|
+
report_configuration_diagnostics(diagnostics, action: "update", telemetry: AppSec.telemetry)
|
|
69
69
|
|
|
70
70
|
# we need to load default config if diagnostics contains top-level error for rules or processors
|
|
71
71
|
if is_ruleset_update &&
|
|
72
|
-
(diagnostics.key?(
|
|
73
|
-
diagnostics.dig(
|
|
74
|
-
diagnostics.dig(
|
|
72
|
+
(diagnostics.key?("error") ||
|
|
73
|
+
diagnostics.dig("rules", "error") ||
|
|
74
|
+
diagnostics.dig("processors", "errors"))
|
|
75
75
|
diagnostics = load_default_config(telemetry: AppSec.telemetry)
|
|
76
|
-
@reconfigured_ruleset_version = diagnostics[
|
|
77
|
-
report_configuration_diagnostics(diagnostics, action:
|
|
76
|
+
@reconfigured_ruleset_version = diagnostics["ruleset_version"]
|
|
77
|
+
report_configuration_diagnostics(diagnostics, action: "update", telemetry: AppSec.telemetry)
|
|
78
78
|
end
|
|
79
79
|
|
|
80
80
|
diagnostics
|
|
@@ -88,10 +88,10 @@ module Datadog
|
|
|
88
88
|
def remove_config_at_path(path)
|
|
89
89
|
result = @waf_builder.remove_config_at_path(path)
|
|
90
90
|
|
|
91
|
-
if result && path != DEFAULT_RULES_CONFIG_PATH && path.include?(
|
|
91
|
+
if result && path != DEFAULT_RULES_CONFIG_PATH && path.include?("ASM_DD")
|
|
92
92
|
diagnostics = load_default_config(telemetry: AppSec.telemetry)
|
|
93
|
-
@reconfigured_ruleset_version = diagnostics[
|
|
94
|
-
report_configuration_diagnostics(diagnostics, action:
|
|
93
|
+
@reconfigured_ruleset_version = diagnostics["ruleset_version"]
|
|
94
|
+
report_configuration_diagnostics(diagnostics, action: "update", telemetry: AppSec.telemetry)
|
|
95
95
|
end
|
|
96
96
|
|
|
97
97
|
result
|
|
@@ -108,16 +108,16 @@ module Datadog
|
|
|
108
108
|
|
|
109
109
|
@handle_ref.current = new_waf_handle
|
|
110
110
|
|
|
111
|
-
metric(
|
|
111
|
+
metric("updates", success: true, ruleset_version: @ruleset_version, telemetry: AppSec.telemetry)
|
|
112
112
|
rescue WAF::Error => e
|
|
113
113
|
# WAF::Error can only be raised during new WAF handle creation or when reading known addresses.
|
|
114
114
|
# This means that the current WAF handle was not yet substituted.
|
|
115
|
-
error_message =
|
|
115
|
+
error_message = "AppSec security engine failed to reconfigure, reverting to the previous configuration"
|
|
116
116
|
|
|
117
117
|
Datadog.logger.error("#{error_message}, error #{e.inspect}")
|
|
118
118
|
AppSec.telemetry.report(e, description: error_message)
|
|
119
119
|
|
|
120
|
-
metric(
|
|
120
|
+
metric("updates", success: false, ruleset_version: @reconfigured_ruleset_version, telemetry: AppSec.telemetry)
|
|
121
121
|
end
|
|
122
122
|
|
|
123
123
|
private
|
|
@@ -139,54 +139,54 @@ module Datadog
|
|
|
139
139
|
config = AppSec::Processor::RuleLoader.load_rules(telemetry: telemetry, ruleset: @default_ruleset)
|
|
140
140
|
|
|
141
141
|
# deprecated - ip and user id denylists should be configured via RC
|
|
142
|
-
config[
|
|
142
|
+
config["rules_data"] ||= AppSec::Processor::RuleLoader.load_data(
|
|
143
143
|
ip_denylist: @default_ip_denylist,
|
|
144
144
|
user_id_denylist: @default_user_id_denylist
|
|
145
145
|
)
|
|
146
146
|
|
|
147
147
|
# deprecated - ip passlist should be configured via RC
|
|
148
|
-
config[
|
|
148
|
+
config["exclusions"] ||= AppSec::Processor::RuleLoader.load_exclusions(ip_passlist: @default_ip_passlist)
|
|
149
149
|
|
|
150
150
|
@waf_builder.add_or_update_config(config, path: DEFAULT_RULES_CONFIG_PATH)
|
|
151
151
|
end
|
|
152
152
|
|
|
153
153
|
def report_configuration_diagnostics(diagnostics, action:, telemetry:)
|
|
154
|
-
raise ArgumentError,
|
|
154
|
+
raise ArgumentError, "action must be one of TELEMETRY_ACTIONS" unless TELEMETRY_ACTIONS.include?(action)
|
|
155
155
|
|
|
156
156
|
common_tags = {
|
|
157
157
|
waf_version: Datadog::AppSec::WAF::VERSION::BASE_STRING,
|
|
158
|
-
event_rules_version: diagnostics[
|
|
158
|
+
event_rules_version: diagnostics["ruleset_version"].to_s,
|
|
159
159
|
action: action
|
|
160
160
|
}
|
|
161
161
|
|
|
162
|
-
if diagnostics[
|
|
162
|
+
if diagnostics["error"]
|
|
163
163
|
telemetry.inc(
|
|
164
|
-
Ext::TELEMETRY_METRICS_NAMESPACE,
|
|
165
|
-
tags: common_tags.merge(scope:
|
|
164
|
+
Ext::TELEMETRY_METRICS_NAMESPACE, "waf.config_errors", 1,
|
|
165
|
+
tags: common_tags.merge(scope: "top-level")
|
|
166
166
|
)
|
|
167
167
|
|
|
168
|
-
telemetry.error(diagnostics[
|
|
168
|
+
telemetry.error(diagnostics["error"])
|
|
169
169
|
end
|
|
170
170
|
|
|
171
171
|
diagnostics.each do |config_key, config_diagnostics|
|
|
172
172
|
next unless DIAGNOSTICS_CONFIG_KEYS.include?(config_key)
|
|
173
|
-
next if !config_diagnostics.key?(
|
|
173
|
+
next if !config_diagnostics.key?("error") && config_diagnostics.fetch("errors", []).empty?
|
|
174
174
|
|
|
175
|
-
if config_diagnostics[
|
|
176
|
-
telemetry.error(config_diagnostics[
|
|
175
|
+
if config_diagnostics["error"]
|
|
176
|
+
telemetry.error(config_diagnostics["error"])
|
|
177
177
|
|
|
178
178
|
telemetry.inc(
|
|
179
|
-
Ext::TELEMETRY_METRICS_NAMESPACE,
|
|
180
|
-
tags: common_tags.merge(config_key: config_key, scope:
|
|
179
|
+
Ext::TELEMETRY_METRICS_NAMESPACE, "waf.config_errors", 1,
|
|
180
|
+
tags: common_tags.merge(config_key: config_key, scope: "top-level")
|
|
181
181
|
)
|
|
182
|
-
elsif config_diagnostics[
|
|
183
|
-
config_diagnostics[
|
|
182
|
+
elsif config_diagnostics["errors"]
|
|
183
|
+
config_diagnostics["errors"].each do |error, config_ids|
|
|
184
184
|
telemetry.error("#{error}: [#{config_ids.join(",")}]")
|
|
185
185
|
end
|
|
186
186
|
|
|
187
187
|
telemetry.inc(
|
|
188
|
-
Ext::TELEMETRY_METRICS_NAMESPACE,
|
|
189
|
-
tags: common_tags.merge(config_key: config_key, scope:
|
|
188
|
+
Ext::TELEMETRY_METRICS_NAMESPACE, "waf.config_errors", config_diagnostics["errors"].count,
|
|
189
|
+
tags: common_tags.merge(config_key: config_key, scope: "item")
|
|
190
190
|
)
|
|
191
191
|
end
|
|
192
192
|
end
|