ddtrace 1.12.1 → 1.23.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +613 -9
- data/LICENSE-3rdparty.csv +1 -1
- data/bin/ddprofrb +15 -0
- data/bin/ddtracerb +3 -1
- data/ext/{ddtrace_profiling_loader/ddtrace_profiling_loader.c → datadog_profiling_loader/datadog_profiling_loader.c} +2 -2
- data/ext/{ddtrace_profiling_loader → datadog_profiling_loader}/extconf.rb +3 -3
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/NativeExtensionDesign.md +3 -5
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/clock_id.h +0 -3
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/clock_id_from_pthread.c +3 -22
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/clock_id_noop.c +0 -1
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_cpu_and_wall_time_worker.c +338 -108
- data/ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.c +422 -0
- data/ext/datadog_profiling_native_extension/collectors_discrete_dynamic_sampler.h +101 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_dynamic_sampling_rate.c +22 -14
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_dynamic_sampling_rate.h +4 -0
- data/ext/datadog_profiling_native_extension/collectors_gc_profiling_helper.c +156 -0
- data/ext/datadog_profiling_native_extension/collectors_gc_profiling_helper.h +5 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_idle_sampling_helper.c +3 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_stack.c +111 -118
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_stack.h +11 -4
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_thread_context.c +545 -144
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_thread_context.h +3 -2
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/extconf.rb +68 -17
- data/ext/datadog_profiling_native_extension/heap_recorder.c +1047 -0
- data/ext/datadog_profiling_native_extension/heap_recorder.h +166 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/helpers.h +6 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/http_transport.c +60 -32
- data/ext/datadog_profiling_native_extension/libdatadog_helpers.c +62 -0
- data/ext/datadog_profiling_native_extension/libdatadog_helpers.h +42 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/native_extension_helpers.rb +50 -4
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/private_vm_api_access.c +155 -32
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/private_vm_api_access.h +16 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/profiling.c +19 -3
- data/ext/datadog_profiling_native_extension/ruby_helpers.c +267 -0
- data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/ruby_helpers.h +33 -0
- data/ext/datadog_profiling_native_extension/stack_recorder.c +1040 -0
- data/ext/datadog_profiling_native_extension/stack_recorder.h +27 -0
- data/ext/datadog_profiling_native_extension/time_helpers.c +53 -0
- data/ext/datadog_profiling_native_extension/time_helpers.h +26 -0
- data/lib/datadog/appsec/assets/waf_rules/processors.json +92 -0
- data/lib/datadog/appsec/assets/waf_rules/recommended.json +698 -75
- data/lib/datadog/appsec/assets/waf_rules/scanners.json +114 -0
- data/lib/datadog/appsec/assets/waf_rules/strict.json +98 -8
- data/lib/datadog/appsec/assets.rb +8 -0
- data/lib/datadog/appsec/component.rb +21 -2
- data/lib/datadog/appsec/configuration/settings.rb +167 -189
- data/lib/datadog/appsec/configuration.rb +0 -79
- data/lib/datadog/appsec/contrib/auto_instrument.rb +2 -4
- data/lib/datadog/appsec/contrib/devise/event.rb +57 -0
- data/lib/datadog/appsec/contrib/devise/ext.rb +13 -0
- data/lib/datadog/appsec/contrib/devise/integration.rb +42 -0
- data/lib/datadog/appsec/contrib/devise/patcher/authenticatable_patch.rb +76 -0
- data/lib/datadog/appsec/contrib/devise/patcher/registration_controller_patch.rb +54 -0
- data/lib/datadog/appsec/contrib/devise/patcher.rb +45 -0
- data/lib/datadog/appsec/contrib/devise/resource.rb +35 -0
- data/lib/datadog/appsec/contrib/devise/tracking.rb +57 -0
- data/lib/datadog/appsec/contrib/rack/ext.rb +2 -1
- data/lib/datadog/appsec/contrib/rack/gateway/request.rb +6 -2
- data/lib/datadog/appsec/contrib/rack/gateway/watcher.rb +8 -6
- data/lib/datadog/appsec/contrib/rack/reactive/request.rb +3 -8
- data/lib/datadog/appsec/contrib/rack/reactive/request_body.rb +3 -6
- data/lib/datadog/appsec/contrib/rack/reactive/response.rb +3 -6
- data/lib/datadog/appsec/contrib/rack/request_body_middleware.rb +3 -2
- data/lib/datadog/appsec/contrib/rack/request_middleware.rb +77 -27
- data/lib/datadog/appsec/contrib/rails/ext.rb +3 -2
- data/lib/datadog/appsec/contrib/rails/framework.rb +1 -3
- data/lib/datadog/appsec/contrib/rails/gateway/watcher.rb +3 -2
- data/lib/datadog/appsec/contrib/rails/patcher.rb +17 -11
- data/lib/datadog/appsec/contrib/rails/reactive/action.rb +3 -6
- data/lib/datadog/appsec/contrib/sinatra/ext.rb +2 -1
- data/lib/datadog/appsec/contrib/sinatra/framework.rb +1 -3
- data/lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb +6 -4
- data/lib/datadog/appsec/contrib/sinatra/patcher.rb +13 -7
- data/lib/datadog/appsec/contrib/sinatra/reactive/routed.rb +3 -6
- data/lib/datadog/appsec/event.rb +106 -50
- data/lib/datadog/appsec/extensions.rb +1 -130
- data/lib/datadog/appsec/monitor/gateway/watcher.rb +3 -3
- data/lib/datadog/appsec/monitor/reactive/set_user.rb +3 -6
- data/lib/datadog/appsec/processor/actions.rb +49 -0
- data/lib/datadog/appsec/processor/rule_loader.rb +60 -0
- data/lib/datadog/appsec/processor/rule_merger.rb +22 -2
- data/lib/datadog/appsec/processor.rb +35 -7
- data/lib/datadog/appsec/rate_limiter.rb +1 -1
- data/lib/datadog/appsec/remote.rb +17 -11
- data/lib/datadog/appsec/response.rb +82 -4
- data/lib/datadog/appsec/sample_rate.rb +21 -0
- data/lib/datadog/appsec.rb +3 -4
- data/lib/datadog/auto_instrument.rb +3 -0
- data/lib/datadog/core/backport.rb +51 -0
- data/lib/datadog/core/configuration/agent_settings_resolver.rb +38 -29
- data/lib/datadog/core/configuration/base.rb +6 -16
- data/lib/datadog/core/configuration/components.rb +20 -7
- data/lib/datadog/core/configuration/ext.rb +28 -5
- data/lib/datadog/core/configuration/option.rb +271 -21
- data/lib/datadog/core/configuration/option_definition.rb +73 -32
- data/lib/datadog/core/configuration/options.rb +27 -15
- data/lib/datadog/core/configuration/settings.rb +398 -119
- data/lib/datadog/core/configuration.rb +24 -4
- data/lib/datadog/core/diagnostics/environment_logger.rb +132 -235
- data/lib/datadog/core/environment/class_count.rb +6 -6
- data/lib/datadog/core/environment/execution.rb +103 -0
- data/lib/datadog/core/environment/ext.rb +13 -11
- data/lib/datadog/core/environment/git.rb +25 -0
- data/lib/datadog/core/environment/identity.rb +18 -48
- data/lib/datadog/core/environment/platform.rb +7 -1
- data/lib/datadog/core/environment/variable_helpers.rb +0 -69
- data/lib/datadog/core/environment/yjit.rb +58 -0
- data/lib/datadog/core/error.rb +1 -0
- data/lib/datadog/core/git/ext.rb +6 -23
- data/lib/datadog/core/logging/ext.rb +3 -1
- data/lib/datadog/core/metrics/ext.rb +7 -5
- data/lib/datadog/core/remote/client/capabilities.rb +7 -2
- data/lib/datadog/core/remote/client.rb +3 -0
- data/lib/datadog/core/remote/component.rb +52 -48
- data/lib/datadog/core/remote/configuration/content.rb +28 -1
- data/lib/datadog/core/remote/configuration/repository.rb +3 -1
- data/lib/datadog/core/remote/ext.rb +2 -1
- data/lib/datadog/core/remote/negotiation.rb +20 -7
- data/lib/datadog/core/remote/tie/tracing.rb +39 -0
- data/lib/datadog/core/remote/tie.rb +27 -0
- data/lib/datadog/core/remote/transport/config.rb +60 -0
- data/lib/datadog/core/remote/transport/http/api/instance.rb +39 -0
- data/lib/datadog/core/remote/transport/http/api/spec.rb +21 -0
- data/lib/datadog/core/remote/transport/http/api.rb +58 -0
- data/lib/datadog/core/remote/transport/http/builder.rb +219 -0
- data/lib/datadog/core/remote/transport/http/client.rb +48 -0
- data/lib/datadog/core/remote/transport/http/config.rb +280 -0
- data/lib/datadog/core/remote/transport/http/negotiation.rb +146 -0
- data/lib/datadog/core/remote/transport/http.rb +179 -0
- data/lib/datadog/core/{transport → remote/transport}/negotiation.rb +25 -23
- data/lib/datadog/core/remote/worker.rb +11 -5
- data/lib/datadog/core/runtime/ext.rb +22 -12
- data/lib/datadog/core/runtime/metrics.rb +43 -0
- data/lib/datadog/core/telemetry/client.rb +28 -10
- data/lib/datadog/core/telemetry/emitter.rb +9 -11
- data/lib/datadog/core/telemetry/event.rb +250 -44
- data/lib/datadog/core/telemetry/ext.rb +8 -1
- data/lib/datadog/core/telemetry/heartbeat.rb +3 -7
- data/lib/datadog/core/telemetry/http/ext.rb +13 -8
- data/lib/datadog/core/telemetry/http/response.rb +4 -0
- data/lib/datadog/core/telemetry/http/transport.rb +10 -3
- data/lib/datadog/core/telemetry/request.rb +59 -0
- data/lib/datadog/core/transport/ext.rb +49 -0
- data/lib/datadog/core/transport/http/adapters/net.rb +168 -0
- data/lib/datadog/core/transport/http/adapters/registry.rb +29 -0
- data/lib/datadog/core/transport/http/adapters/test.rb +89 -0
- data/lib/datadog/core/transport/http/adapters/unix_socket.rb +83 -0
- data/lib/datadog/core/transport/http/api/endpoint.rb +31 -0
- data/lib/datadog/core/transport/http/api/fallbacks.rb +26 -0
- data/lib/datadog/core/transport/http/api/map.rb +18 -0
- data/lib/datadog/core/transport/http/env.rb +62 -0
- data/lib/datadog/core/transport/http/response.rb +60 -0
- data/lib/datadog/core/transport/parcel.rb +22 -0
- data/lib/datadog/core/transport/request.rb +17 -0
- data/lib/datadog/core/transport/response.rb +64 -0
- data/lib/datadog/core/utils/duration.rb +52 -0
- data/lib/datadog/core/utils/hash.rb +47 -0
- data/lib/datadog/core/utils/network.rb +1 -1
- data/lib/datadog/core/utils/safe_dup.rb +27 -20
- data/lib/datadog/core/utils/url.rb +25 -0
- data/lib/datadog/core/utils.rb +1 -1
- data/lib/datadog/core/workers/async.rb +3 -2
- data/lib/datadog/core/workers/polling.rb +2 -2
- data/lib/datadog/kit/appsec/events.rb +139 -89
- data/lib/datadog/kit/enable_core_dumps.rb +5 -6
- data/lib/datadog/kit/identity.rb +80 -65
- data/lib/datadog/opentelemetry/api/context.rb +10 -3
- data/lib/datadog/opentelemetry/sdk/propagator.rb +5 -3
- data/lib/datadog/opentelemetry/sdk/span_processor.rb +48 -5
- data/lib/datadog/opentelemetry/sdk/trace/span.rb +167 -0
- data/lib/datadog/opentelemetry/trace.rb +58 -0
- data/lib/datadog/opentelemetry.rb +4 -0
- data/lib/datadog/opentracer/text_map_propagator.rb +2 -1
- data/lib/datadog/opentracer.rb +9 -0
- data/lib/datadog/profiling/collectors/code_provenance.rb +10 -4
- data/lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb +43 -20
- data/lib/datadog/profiling/collectors/idle_sampling_helper.rb +3 -1
- data/lib/datadog/profiling/collectors/info.rb +101 -0
- data/lib/datadog/profiling/collectors/thread_context.rb +17 -2
- data/lib/datadog/profiling/component.rb +248 -97
- data/lib/datadog/profiling/exporter.rb +26 -5
- data/lib/datadog/profiling/ext.rb +2 -12
- data/lib/datadog/profiling/flush.rb +10 -5
- data/lib/datadog/profiling/http_transport.rb +23 -6
- data/lib/datadog/profiling/load_native_extension.rb +25 -6
- data/lib/datadog/profiling/native_extension.rb +1 -22
- data/lib/datadog/profiling/profiler.rb +36 -13
- data/lib/datadog/profiling/scheduler.rb +20 -15
- data/lib/datadog/profiling/stack_recorder.rb +19 -4
- data/lib/datadog/profiling/tag_builder.rb +5 -0
- data/lib/datadog/profiling/tasks/exec.rb +3 -3
- data/lib/datadog/profiling/tasks/help.rb +3 -3
- data/lib/datadog/profiling.rb +28 -79
- data/lib/datadog/tracing/component.rb +70 -11
- data/lib/datadog/tracing/configuration/agent_settings_resolver.rb +13 -0
- data/lib/datadog/tracing/configuration/dynamic/option.rb +71 -0
- data/lib/datadog/tracing/configuration/dynamic.rb +64 -0
- data/lib/datadog/tracing/configuration/ext.rb +40 -33
- data/lib/datadog/tracing/configuration/http.rb +74 -0
- data/lib/datadog/tracing/configuration/settings.rb +136 -99
- data/lib/datadog/tracing/contrib/action_cable/configuration/settings.rb +10 -6
- data/lib/datadog/tracing/contrib/action_cable/ext.rb +21 -18
- data/lib/datadog/tracing/contrib/action_mailer/configuration/settings.rb +10 -6
- data/lib/datadog/tracing/contrib/action_mailer/events/deliver.rb +1 -1
- data/lib/datadog/tracing/contrib/action_mailer/ext.rb +21 -18
- data/lib/datadog/tracing/contrib/action_pack/configuration/settings.rb +10 -7
- data/lib/datadog/tracing/contrib/action_pack/ext.rb +11 -8
- data/lib/datadog/tracing/contrib/action_view/configuration/settings.rb +10 -6
- data/lib/datadog/tracing/contrib/action_view/ext.rb +13 -10
- data/lib/datadog/tracing/contrib/active_job/configuration/settings.rb +14 -7
- data/lib/datadog/tracing/contrib/active_job/ext.rb +26 -23
- data/lib/datadog/tracing/contrib/active_job/log_injection.rb +1 -1
- data/lib/datadog/tracing/contrib/active_job/patcher.rb +1 -1
- data/lib/datadog/tracing/contrib/active_model_serializers/configuration/settings.rb +10 -6
- data/lib/datadog/tracing/contrib/active_model_serializers/ext.rb +13 -10
- data/lib/datadog/tracing/contrib/active_record/configuration/resolver.rb +29 -15
- data/lib/datadog/tracing/contrib/active_record/configuration/settings.rb +10 -7
- data/lib/datadog/tracing/contrib/active_record/events/sql.rb +2 -6
- data/lib/datadog/tracing/contrib/active_record/ext.rb +18 -15
- data/lib/datadog/tracing/contrib/active_record/utils.rb +1 -1
- data/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb +106 -202
- data/lib/datadog/tracing/contrib/active_support/cache/patcher.rb +3 -0
- data/lib/datadog/tracing/contrib/active_support/configuration/settings.rb +10 -7
- data/lib/datadog/tracing/contrib/active_support/ext.rb +19 -16
- data/lib/datadog/tracing/contrib/analytics.rb +0 -1
- data/lib/datadog/tracing/contrib/aws/configuration/settings.rb +15 -7
- data/lib/datadog/tracing/contrib/aws/ext.rb +38 -24
- data/lib/datadog/tracing/contrib/aws/instrumentation.rb +16 -5
- data/lib/datadog/tracing/contrib/concurrent_ruby/async_patch.rb +20 -0
- data/lib/datadog/tracing/contrib/concurrent_ruby/configuration/settings.rb +3 -2
- data/lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb +14 -14
- data/lib/datadog/tracing/contrib/concurrent_ruby/ext.rb +4 -2
- data/lib/datadog/tracing/contrib/concurrent_ruby/future_patch.rb +3 -10
- data/lib/datadog/tracing/contrib/concurrent_ruby/integration.rb +2 -1
- data/lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb +19 -2
- data/lib/datadog/tracing/contrib/concurrent_ruby/promises_future_patch.rb +22 -0
- data/lib/datadog/tracing/contrib/configurable.rb +1 -1
- data/lib/datadog/tracing/contrib/configuration/settings.rb +1 -1
- data/lib/datadog/tracing/contrib/dalli/configuration/settings.rb +21 -7
- data/lib/datadog/tracing/contrib/dalli/ext.rb +27 -11
- data/lib/datadog/tracing/contrib/dalli/instrumentation.rb +17 -8
- data/lib/datadog/tracing/contrib/delayed_job/configuration/settings.rb +14 -7
- data/lib/datadog/tracing/contrib/delayed_job/ext.rb +17 -14
- data/lib/datadog/tracing/contrib/elasticsearch/configuration/settings.rb +15 -7
- data/lib/datadog/tracing/contrib/elasticsearch/ext.rb +22 -15
- data/lib/datadog/tracing/contrib/elasticsearch/patcher.rb +104 -99
- data/lib/datadog/tracing/contrib/ethon/configuration/settings.rb +17 -9
- data/lib/datadog/tracing/contrib/ethon/easy_patch.rb +48 -3
- data/lib/datadog/tracing/contrib/ethon/ext.rb +20 -11
- data/lib/datadog/tracing/contrib/ethon/multi_patch.rb +6 -3
- data/lib/datadog/tracing/contrib/excon/configuration/settings.rb +20 -10
- data/lib/datadog/tracing/contrib/excon/ext.rb +17 -8
- data/lib/datadog/tracing/contrib/excon/middleware.rb +25 -5
- data/lib/datadog/tracing/contrib/ext.rb +26 -1
- data/lib/datadog/tracing/contrib/extensions.rb +38 -2
- data/lib/datadog/tracing/contrib/faraday/configuration/settings.rb +27 -10
- data/lib/datadog/tracing/contrib/faraday/ext.rb +17 -8
- data/lib/datadog/tracing/contrib/faraday/middleware.rb +22 -6
- data/lib/datadog/tracing/contrib/grape/configuration/settings.rb +9 -6
- data/lib/datadog/tracing/contrib/grape/ext.rb +17 -14
- data/lib/datadog/tracing/contrib/graphql/configuration/settings.rb +9 -6
- data/lib/datadog/tracing/contrib/graphql/ext.rb +8 -5
- data/lib/datadog/tracing/contrib/grpc/configuration/settings.rb +40 -9
- data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb +39 -20
- data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb +37 -18
- data/lib/datadog/tracing/contrib/grpc/datadog_interceptor.rb +0 -4
- data/lib/datadog/tracing/contrib/grpc/ext.rb +17 -13
- data/lib/datadog/tracing/contrib/grpc/formatting.rb +127 -0
- data/lib/datadog/tracing/contrib/hanami/configuration/settings.rb +3 -2
- data/lib/datadog/tracing/contrib/hanami/ext.rb +10 -8
- data/lib/datadog/tracing/contrib/http/circuit_breaker.rb +5 -8
- data/lib/datadog/tracing/contrib/http/configuration/settings.rb +34 -11
- data/lib/datadog/tracing/contrib/http/distributed/fetcher.rb +2 -2
- data/lib/datadog/tracing/contrib/http/ext.rb +17 -9
- data/lib/datadog/tracing/contrib/http/instrumentation.rb +27 -7
- data/lib/datadog/tracing/contrib/httpclient/configuration/settings.rb +34 -11
- data/lib/datadog/tracing/contrib/httpclient/ext.rb +18 -9
- data/lib/datadog/tracing/contrib/httpclient/instrumentation.rb +22 -5
- data/lib/datadog/tracing/contrib/httprb/configuration/settings.rb +34 -11
- data/lib/datadog/tracing/contrib/httprb/ext.rb +17 -9
- data/lib/datadog/tracing/contrib/httprb/instrumentation.rb +22 -5
- data/lib/datadog/tracing/contrib/kafka/configuration/settings.rb +10 -6
- data/lib/datadog/tracing/contrib/kafka/ext.rb +43 -39
- data/lib/datadog/tracing/contrib/lograge/configuration/settings.rb +3 -2
- data/lib/datadog/tracing/contrib/lograge/ext.rb +3 -1
- data/lib/datadog/tracing/contrib/lograge/instrumentation.rb +2 -17
- data/lib/datadog/tracing/contrib/mongodb/configuration/settings.rb +15 -7
- data/lib/datadog/tracing/contrib/mongodb/ext.rb +21 -16
- data/lib/datadog/tracing/contrib/mongodb/subscribers.rb +16 -5
- data/lib/datadog/tracing/contrib/mysql2/configuration/settings.rb +22 -14
- data/lib/datadog/tracing/contrib/mysql2/ext.rb +16 -10
- data/lib/datadog/tracing/contrib/mysql2/instrumentation.rb +22 -7
- data/lib/datadog/tracing/contrib/opensearch/configuration/settings.rb +53 -0
- data/lib/datadog/tracing/contrib/opensearch/ext.rb +38 -0
- data/lib/datadog/tracing/contrib/opensearch/integration.rb +44 -0
- data/lib/datadog/tracing/contrib/opensearch/patcher.rb +135 -0
- data/lib/datadog/tracing/contrib/opensearch/quantize.rb +81 -0
- data/lib/datadog/tracing/contrib/pg/configuration/settings.rb +23 -14
- data/lib/datadog/tracing/contrib/pg/ext.rb +23 -19
- data/lib/datadog/tracing/contrib/pg/instrumentation.rb +49 -9
- data/lib/datadog/tracing/contrib/presto/configuration/settings.rb +15 -7
- data/lib/datadog/tracing/contrib/presto/ext.rb +26 -20
- data/lib/datadog/tracing/contrib/presto/instrumentation.rb +14 -5
- data/lib/datadog/tracing/contrib/propagation/sql_comment/ext.rb +12 -10
- data/lib/datadog/tracing/contrib/propagation/sql_comment.rb +1 -1
- data/lib/datadog/tracing/contrib/qless/configuration/settings.rb +13 -8
- data/lib/datadog/tracing/contrib/qless/ext.rb +15 -12
- data/lib/datadog/tracing/contrib/que/configuration/settings.rb +22 -12
- data/lib/datadog/tracing/contrib/que/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/racecar/configuration/settings.rb +10 -7
- data/lib/datadog/tracing/contrib/racecar/event.rb +5 -5
- data/lib/datadog/tracing/contrib/racecar/ext.rb +21 -18
- data/lib/datadog/tracing/contrib/rack/configuration/settings.rb +17 -12
- data/lib/datadog/tracing/contrib/rack/ext.rb +19 -16
- data/lib/datadog/tracing/contrib/rack/header_collection.rb +3 -0
- data/lib/datadog/tracing/contrib/rack/header_tagging.rb +63 -0
- data/lib/datadog/tracing/contrib/rack/middlewares.rb +16 -50
- data/lib/datadog/tracing/contrib/rails/auto_instrument_railtie.rb +0 -2
- data/lib/datadog/tracing/contrib/rails/configuration/settings.rb +20 -15
- data/lib/datadog/tracing/contrib/rails/ext.rb +8 -5
- data/lib/datadog/tracing/contrib/rails/log_injection.rb +7 -10
- data/lib/datadog/tracing/contrib/rails/patcher.rb +10 -41
- data/lib/datadog/tracing/contrib/rails/railtie.rb +3 -3
- data/lib/datadog/tracing/contrib/rake/configuration/settings.rb +14 -10
- data/lib/datadog/tracing/contrib/rake/ext.rb +15 -12
- data/lib/datadog/tracing/contrib/redis/configuration/settings.rb +18 -9
- data/lib/datadog/tracing/contrib/redis/ext.rb +23 -15
- data/lib/datadog/tracing/contrib/redis/instrumentation.rb +5 -40
- data/lib/datadog/tracing/contrib/redis/patcher.rb +34 -21
- data/lib/datadog/tracing/contrib/redis/tags.rb +16 -7
- data/lib/datadog/tracing/contrib/redis/trace_middleware.rb +46 -33
- data/lib/datadog/tracing/contrib/resque/configuration/settings.rb +14 -7
- data/lib/datadog/tracing/contrib/resque/ext.rb +10 -7
- data/lib/datadog/tracing/contrib/rest_client/configuration/settings.rb +17 -9
- data/lib/datadog/tracing/contrib/rest_client/ext.rb +16 -8
- data/lib/datadog/tracing/contrib/rest_client/request_patch.rb +25 -5
- data/lib/datadog/tracing/contrib/roda/configuration/settings.rb +10 -6
- data/lib/datadog/tracing/contrib/roda/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/semantic_logger/configuration/settings.rb +3 -2
- data/lib/datadog/tracing/contrib/semantic_logger/ext.rb +3 -1
- data/lib/datadog/tracing/contrib/semantic_logger/instrumentation.rb +4 -20
- data/lib/datadog/tracing/contrib/sequel/configuration/settings.rb +10 -6
- data/lib/datadog/tracing/contrib/sequel/ext.rb +11 -8
- data/lib/datadog/tracing/contrib/sequel/utils.rb +7 -7
- data/lib/datadog/tracing/contrib/shoryuken/configuration/settings.rb +15 -8
- data/lib/datadog/tracing/contrib/shoryuken/ext.rb +15 -12
- data/lib/datadog/tracing/contrib/sidekiq/configuration/settings.rb +19 -11
- data/lib/datadog/tracing/contrib/sidekiq/ext.rb +33 -30
- data/lib/datadog/tracing/contrib/sinatra/configuration/settings.rb +12 -9
- data/lib/datadog/tracing/contrib/sinatra/env.rb +0 -17
- data/lib/datadog/tracing/contrib/sinatra/ext.rb +22 -19
- data/lib/datadog/tracing/contrib/sinatra/tracer_middleware.rb +3 -14
- data/lib/datadog/tracing/contrib/sneakers/configuration/settings.rb +15 -8
- data/lib/datadog/tracing/contrib/sneakers/ext.rb +2 -0
- data/lib/datadog/tracing/contrib/sneakers/tracer.rb +1 -1
- data/lib/datadog/tracing/contrib/span_attribute_schema.rb +74 -10
- data/lib/datadog/tracing/contrib/stripe/configuration/settings.rb +10 -6
- data/lib/datadog/tracing/contrib/stripe/ext.rb +1 -0
- data/lib/datadog/tracing/contrib/sucker_punch/configuration/settings.rb +10 -6
- data/lib/datadog/tracing/contrib/sucker_punch/ext.rb +16 -13
- data/lib/datadog/tracing/contrib/trilogy/configuration/settings.rb +58 -0
- data/lib/datadog/tracing/contrib/trilogy/ext.rb +27 -0
- data/lib/datadog/tracing/contrib/trilogy/instrumentation.rb +94 -0
- data/lib/datadog/tracing/contrib/trilogy/integration.rb +43 -0
- data/lib/datadog/{ci/contrib/cucumber → tracing/contrib/trilogy}/patcher.rb +10 -6
- data/lib/datadog/tracing/contrib/utils/database.rb +5 -3
- data/lib/datadog/tracing/contrib/utils/quantization/http.rb +11 -11
- data/lib/datadog/tracing/contrib.rb +2 -0
- data/lib/datadog/tracing/correlation.rb +29 -12
- data/lib/datadog/tracing/diagnostics/environment_logger.rb +165 -0
- data/lib/datadog/tracing/diagnostics/ext.rb +21 -19
- data/lib/datadog/tracing/distributed/b3_multi.rb +2 -2
- data/lib/datadog/tracing/distributed/b3_single.rb +1 -1
- data/lib/datadog/tracing/distributed/datadog.rb +0 -1
- data/lib/datadog/tracing/distributed/propagation.rb +35 -34
- data/lib/datadog/tracing/distributed/trace_context.rb +52 -17
- data/lib/datadog/tracing/metadata/ext.rb +9 -6
- data/lib/datadog/tracing/metadata/tagging.rb +3 -3
- data/lib/datadog/tracing/remote.rb +78 -0
- data/lib/datadog/tracing/sampling/matcher.rb +23 -3
- data/lib/datadog/tracing/sampling/rule.rb +7 -2
- data/lib/datadog/tracing/sampling/rule_sampler.rb +31 -0
- data/lib/datadog/tracing/span_operation.rb +3 -15
- data/lib/datadog/tracing/sync_writer.rb +3 -3
- data/lib/datadog/tracing/trace_digest.rb +31 -0
- data/lib/datadog/tracing/trace_operation.rb +17 -5
- data/lib/datadog/tracing/trace_segment.rb +5 -2
- data/lib/datadog/tracing/tracer.rb +12 -1
- data/lib/datadog/{core → tracing}/transport/http/api/instance.rb +1 -1
- data/lib/datadog/{core → tracing}/transport/http/api/spec.rb +1 -1
- data/lib/datadog/tracing/transport/http/api.rb +43 -0
- data/lib/datadog/{core → tracing}/transport/http/builder.rb +13 -68
- data/lib/datadog/tracing/transport/http/client.rb +57 -0
- data/lib/datadog/tracing/transport/http/statistics.rb +47 -0
- data/lib/datadog/tracing/transport/http/traces.rb +152 -0
- data/lib/datadog/tracing/transport/http.rb +125 -0
- data/lib/datadog/tracing/transport/io/client.rb +89 -0
- data/lib/datadog/tracing/transport/io/response.rb +27 -0
- data/lib/datadog/tracing/transport/io/traces.rb +101 -0
- data/lib/datadog/tracing/transport/io.rb +30 -0
- data/lib/datadog/tracing/transport/serializable_trace.rb +126 -0
- data/lib/datadog/tracing/transport/statistics.rb +77 -0
- data/lib/datadog/tracing/transport/trace_formatter.rb +240 -0
- data/lib/datadog/tracing/transport/traces.rb +224 -0
- data/lib/datadog/tracing/workers/trace_writer.rb +6 -4
- data/lib/datadog/tracing/workers.rb +4 -2
- data/lib/datadog/tracing/writer.rb +5 -2
- data/lib/datadog/tracing.rb +8 -2
- data/lib/ddtrace/transport/ext.rb +22 -14
- data/lib/ddtrace/version.rb +9 -12
- data/lib/ddtrace.rb +1 -1
- metadata +157 -139
- data/ext/ddtrace_profiling_native_extension/libdatadog_helpers.h +0 -25
- data/ext/ddtrace_profiling_native_extension/ruby_helpers.c +0 -110
- data/ext/ddtrace_profiling_native_extension/stack_recorder.c +0 -591
- data/ext/ddtrace_profiling_native_extension/stack_recorder.h +0 -14
- data/ext/ddtrace_profiling_native_extension/time_helpers.c +0 -17
- data/ext/ddtrace_profiling_native_extension/time_helpers.h +0 -10
- data/lib/datadog/ci/configuration/components.rb +0 -32
- data/lib/datadog/ci/configuration/settings.rb +0 -53
- data/lib/datadog/ci/contrib/cucumber/configuration/settings.rb +0 -33
- data/lib/datadog/ci/contrib/cucumber/ext.rb +0 -20
- data/lib/datadog/ci/contrib/cucumber/formatter.rb +0 -94
- data/lib/datadog/ci/contrib/cucumber/instrumentation.rb +0 -28
- data/lib/datadog/ci/contrib/cucumber/integration.rb +0 -47
- data/lib/datadog/ci/contrib/rspec/configuration/settings.rb +0 -33
- data/lib/datadog/ci/contrib/rspec/example.rb +0 -68
- data/lib/datadog/ci/contrib/rspec/ext.rb +0 -19
- data/lib/datadog/ci/contrib/rspec/integration.rb +0 -48
- data/lib/datadog/ci/contrib/rspec/patcher.rb +0 -27
- data/lib/datadog/ci/ext/app_types.rb +0 -9
- data/lib/datadog/ci/ext/environment.rb +0 -575
- data/lib/datadog/ci/ext/settings.rb +0 -10
- data/lib/datadog/ci/ext/test.rb +0 -35
- data/lib/datadog/ci/extensions.rb +0 -19
- data/lib/datadog/ci/flush.rb +0 -38
- data/lib/datadog/ci/test.rb +0 -81
- data/lib/datadog/ci.rb +0 -20
- data/lib/datadog/core/configuration/dependency_resolver.rb +0 -28
- data/lib/datadog/core/configuration/option_definition_set.rb +0 -22
- data/lib/datadog/core/configuration/option_set.rb +0 -10
- data/lib/datadog/core/telemetry/collector.rb +0 -231
- data/lib/datadog/core/telemetry/v1/app_event.rb +0 -52
- data/lib/datadog/core/telemetry/v1/application.rb +0 -92
- data/lib/datadog/core/telemetry/v1/configuration.rb +0 -25
- data/lib/datadog/core/telemetry/v1/dependency.rb +0 -43
- data/lib/datadog/core/telemetry/v1/host.rb +0 -59
- data/lib/datadog/core/telemetry/v1/integration.rb +0 -64
- data/lib/datadog/core/telemetry/v1/product.rb +0 -36
- data/lib/datadog/core/telemetry/v1/telemetry_request.rb +0 -106
- data/lib/datadog/core/transport/config.rb +0 -58
- data/lib/datadog/core/transport/http/api.rb +0 -57
- data/lib/datadog/core/transport/http/client.rb +0 -45
- data/lib/datadog/core/transport/http/config.rb +0 -268
- data/lib/datadog/core/transport/http/negotiation.rb +0 -144
- data/lib/datadog/core/transport/http.rb +0 -169
- data/lib/datadog/core/utils/object_set.rb +0 -43
- data/lib/datadog/core/utils/string_table.rb +0 -47
- data/lib/datadog/profiling/backtrace_location.rb +0 -34
- data/lib/datadog/profiling/buffer.rb +0 -43
- data/lib/datadog/profiling/collectors/old_stack.rb +0 -301
- data/lib/datadog/profiling/encoding/profile.rb +0 -41
- data/lib/datadog/profiling/event.rb +0 -15
- data/lib/datadog/profiling/events/stack.rb +0 -82
- data/lib/datadog/profiling/old_recorder.rb +0 -107
- data/lib/datadog/profiling/pprof/builder.rb +0 -125
- data/lib/datadog/profiling/pprof/converter.rb +0 -102
- data/lib/datadog/profiling/pprof/message_set.rb +0 -16
- data/lib/datadog/profiling/pprof/payload.rb +0 -20
- data/lib/datadog/profiling/pprof/pprof.proto +0 -212
- data/lib/datadog/profiling/pprof/pprof_pb.rb +0 -81
- data/lib/datadog/profiling/pprof/stack_sample.rb +0 -139
- data/lib/datadog/profiling/pprof/string_table.rb +0 -12
- data/lib/datadog/profiling/pprof/template.rb +0 -118
- data/lib/datadog/profiling/trace_identifiers/ddtrace.rb +0 -43
- data/lib/datadog/profiling/trace_identifiers/helper.rb +0 -45
- data/lib/datadog/tracing/contrib/sinatra/headers.rb +0 -35
- data/lib/ddtrace/transport/http/adapters/net.rb +0 -168
- data/lib/ddtrace/transport/http/adapters/registry.rb +0 -27
- data/lib/ddtrace/transport/http/adapters/test.rb +0 -85
- data/lib/ddtrace/transport/http/adapters/unix_socket.rb +0 -77
- data/lib/ddtrace/transport/http/api/endpoint.rb +0 -29
- data/lib/ddtrace/transport/http/api/fallbacks.rb +0 -24
- data/lib/ddtrace/transport/http/api/instance.rb +0 -35
- data/lib/ddtrace/transport/http/api/map.rb +0 -16
- data/lib/ddtrace/transport/http/api/spec.rb +0 -17
- data/lib/ddtrace/transport/http/api.rb +0 -39
- data/lib/ddtrace/transport/http/builder.rb +0 -176
- data/lib/ddtrace/transport/http/client.rb +0 -52
- data/lib/ddtrace/transport/http/env.rb +0 -58
- data/lib/ddtrace/transport/http/response.rb +0 -58
- data/lib/ddtrace/transport/http/statistics.rb +0 -43
- data/lib/ddtrace/transport/http/traces.rb +0 -144
- data/lib/ddtrace/transport/http.rb +0 -117
- data/lib/ddtrace/transport/io/client.rb +0 -85
- data/lib/ddtrace/transport/io/response.rb +0 -25
- data/lib/ddtrace/transport/io/traces.rb +0 -99
- data/lib/ddtrace/transport/io.rb +0 -28
- data/lib/ddtrace/transport/parcel.rb +0 -20
- data/lib/ddtrace/transport/request.rb +0 -15
- data/lib/ddtrace/transport/response.rb +0 -60
- data/lib/ddtrace/transport/serializable_trace.rb +0 -122
- data/lib/ddtrace/transport/statistics.rb +0 -75
- data/lib/ddtrace/transport/trace_formatter.rb +0 -198
- data/lib/ddtrace/transport/traces.rb +0 -216
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/collectors_idle_sampling_helper.h +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/setup_signal_handler.c +0 -0
- /data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/setup_signal_handler.h +0 -0
@@ -24,35 +24,39 @@ module Datadog
|
|
24
24
|
end
|
25
25
|
|
26
26
|
option :enabled do |o|
|
27
|
-
o.
|
28
|
-
o.
|
27
|
+
o.type :bool
|
28
|
+
o.env Ext::ENV_ENABLED
|
29
|
+
o.default true
|
29
30
|
end
|
30
31
|
|
32
|
+
# @!visibility private
|
31
33
|
option :analytics_enabled do |o|
|
32
|
-
o.
|
33
|
-
o.
|
34
|
-
o.
|
34
|
+
o.type :bool, nilable: true
|
35
|
+
o.env Ext::ENV_ANALYTICS_ENABLED
|
36
|
+
o.after_set do |value|
|
35
37
|
# Update ActionPack analytics too
|
36
38
|
Datadog.configuration.tracing[:action_pack][:analytics_enabled] = value
|
37
39
|
end
|
38
40
|
end
|
39
41
|
|
40
42
|
option :analytics_sample_rate do |o|
|
41
|
-
o.
|
42
|
-
o.
|
43
|
-
o.
|
43
|
+
o.type :float
|
44
|
+
o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
|
45
|
+
o.default 1.0
|
46
|
+
o.after_set do |value|
|
44
47
|
# Update ActionPack analytics too
|
45
48
|
Datadog.configuration.tracing[:action_pack][:analytics_sample_rate] = value
|
46
49
|
end
|
47
50
|
end
|
48
51
|
|
49
|
-
option :distributed_tracing, default: true
|
50
|
-
|
51
|
-
option :request_queuing, default: false
|
52
|
+
option :distributed_tracing, default: true, type: :bool
|
52
53
|
|
54
|
+
option :request_queuing do |o|
|
55
|
+
o.default false
|
56
|
+
end
|
53
57
|
# DEV-2.0: Breaking changes for removal.
|
54
58
|
option :exception_controller do |o|
|
55
|
-
o.
|
59
|
+
o.after_set do |value|
|
56
60
|
if value
|
57
61
|
Datadog::Core.log_deprecation do
|
58
62
|
'The error controller is now automatically detected. '\
|
@@ -62,11 +66,12 @@ module Datadog
|
|
62
66
|
end
|
63
67
|
end
|
64
68
|
|
65
|
-
option :middleware, default: true
|
66
|
-
option :middleware_names, default: false
|
69
|
+
option :middleware, default: true, type: :bool
|
70
|
+
option :middleware_names, default: false, type: :bool
|
67
71
|
option :template_base_path do |o|
|
72
|
+
o.type :string
|
68
73
|
o.default 'views/'
|
69
|
-
o.
|
74
|
+
o.after_set do |value|
|
70
75
|
# Update ActionView template base path too
|
71
76
|
Datadog.configuration.tracing[:action_view][:template_base_path] = value
|
72
77
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Datadog
|
2
4
|
module Tracing
|
3
5
|
module Contrib
|
@@ -5,11 +7,12 @@ module Datadog
|
|
5
7
|
# Rails integration constants
|
6
8
|
# @public_api Changing resource names, tag names, or environment variables creates breaking changes.
|
7
9
|
module Ext
|
8
|
-
APP = 'rails'
|
9
|
-
ENV_ENABLED = 'DD_TRACE_RAILS_ENABLED'
|
10
|
-
|
11
|
-
|
12
|
-
|
10
|
+
APP = 'rails'
|
11
|
+
ENV_ENABLED = 'DD_TRACE_RAILS_ENABLED'
|
12
|
+
# @!visibility private
|
13
|
+
ENV_ANALYTICS_ENABLED = 'DD_TRACE_RAILS_ANALYTICS_ENABLED'
|
14
|
+
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RAILS_ANALYTICS_SAMPLE_RATE'
|
15
|
+
ENV_DISABLE = 'DISABLE_DATADOG_RAILS'
|
13
16
|
end
|
14
17
|
end
|
15
18
|
end
|
@@ -7,17 +7,14 @@ module Datadog
|
|
7
7
|
module LogInjection
|
8
8
|
module_function
|
9
9
|
|
10
|
-
|
11
|
-
|
12
|
-
#
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
app.config.log_tags << proc { Tracing.log_correlation }
|
18
|
-
end
|
10
|
+
# Use `app.config.log_tags` to inject propagation tags into the default Rails logger.
|
11
|
+
def configure_log_tags(app_config)
|
12
|
+
# When using SemanticLogger, app_config.log_tags could be a Hash and should not be modified here
|
13
|
+
return unless app_config.log_tags.nil? || app_config.log_tags.respond_to?(:<<)
|
14
|
+
|
15
|
+
app_config.log_tags ||= [] # Can be nil, we initialized it if so
|
16
|
+
app_config.log_tags << proc { Tracing.log_correlation if Datadog.configuration.tracing.log_injection }
|
19
17
|
rescue StandardError => e
|
20
|
-
# TODO: can we use Datadog.logger at this point?
|
21
18
|
Datadog.logger.warn(
|
22
19
|
"Unable to add Datadog Trace context to ActiveSupport::TaggedLogging: #{e.class.name} #{e.message}"
|
23
20
|
)
|
@@ -24,23 +24,24 @@ module Datadog
|
|
24
24
|
end
|
25
25
|
|
26
26
|
def patch
|
27
|
-
|
28
|
-
|
27
|
+
patch_before_initialize
|
28
|
+
patch_after_initialize
|
29
29
|
end
|
30
30
|
|
31
|
-
def
|
31
|
+
def patch_before_initialize
|
32
32
|
::ActiveSupport.on_load(:before_initialize) do
|
33
|
-
Contrib::Rails::Patcher.
|
33
|
+
Contrib::Rails::Patcher.before_initialize(self)
|
34
34
|
end
|
35
35
|
end
|
36
36
|
|
37
|
-
def
|
37
|
+
def before_initialize(app)
|
38
38
|
BEFORE_INITIALIZE_ONLY_ONCE_PER_APP[app].run do
|
39
39
|
# Middleware must be added before the application is initialized.
|
40
40
|
# Otherwise the middleware stack will be frozen.
|
41
41
|
# Sometimes we don't want to activate middleware e.g. OpenTracing, etc.
|
42
42
|
add_middleware(app) if Datadog.configuration.tracing[:rails][:middleware]
|
43
|
-
|
43
|
+
|
44
|
+
Rails::LogInjection.configure_log_tags(app.config)
|
44
45
|
end
|
45
46
|
end
|
46
47
|
|
@@ -61,45 +62,13 @@ module Datadog
|
|
61
62
|
app.middleware.insert_after(::ActionDispatch::DebugExceptions, Contrib::Rails::ExceptionMiddleware)
|
62
63
|
end
|
63
64
|
|
64
|
-
def
|
65
|
-
should_warn = true
|
66
|
-
# check if lograge key exists
|
67
|
-
# Note: Rails executes initializers sequentially based on alphabetical order,
|
68
|
-
# and lograge config could occur after datadog config.
|
69
|
-
# So checking for `app.config.lograge.enabled` may yield a false negative,
|
70
|
-
# and adding custom options naively if `config.lograge` exists from the lograge Railtie,
|
71
|
-
# is inconsistent since a lograge initializer would override it.
|
72
|
-
# Instead, we patch Lograge `custom_options` internals directly
|
73
|
-
# as part of Rails framework patching
|
74
|
-
# and just flag off the warning log here.
|
75
|
-
# SemanticLogger we similarly patch in the after_initiaize block, and should flag
|
76
|
-
# off the warning log here if we know we'll patch this gem later.
|
77
|
-
should_warn = false if app.config.respond_to?(:lograge) || defined?(::SemanticLogger)
|
78
|
-
|
79
|
-
# if lograge isn't set, check if tagged logged is enabled.
|
80
|
-
# if so, add proc that injects trace identifiers for tagged logging.
|
81
|
-
logger = app.config.logger || ::Rails.logger
|
82
|
-
|
83
|
-
if logger \
|
84
|
-
&& defined?(::ActiveSupport::TaggedLogging) \
|
85
|
-
&& logger.is_a?(::ActiveSupport::TaggedLogging)
|
86
|
-
|
87
|
-
Contrib::Rails::LogInjection.add_as_tagged_logging_logger(app)
|
88
|
-
should_warn = false
|
89
|
-
end
|
90
|
-
|
91
|
-
if should_warn
|
92
|
-
Datadog.logger.warn("Unable to enable Datadog Trace context, Logger #{logger.class} is not supported")
|
93
|
-
end
|
94
|
-
end
|
95
|
-
|
96
|
-
def patch_after_intialize
|
65
|
+
def patch_after_initialize
|
97
66
|
::ActiveSupport.on_load(:after_initialize) do
|
98
|
-
Contrib::Rails::Patcher.
|
67
|
+
Contrib::Rails::Patcher.after_initialize(self)
|
99
68
|
end
|
100
69
|
end
|
101
70
|
|
102
|
-
def
|
71
|
+
def after_initialize(app)
|
103
72
|
AFTER_INITIALIZE_ONLY_ONCE_PER_APP[app].run do
|
104
73
|
# Finish configuring the tracer after the application is initialized.
|
105
74
|
# We need to wait for some things, like application name, middleware stack, etc.
|
@@ -6,12 +6,12 @@ module Datadog
|
|
6
6
|
# Railtie class initializes
|
7
7
|
class Railtie < Rails::Railtie
|
8
8
|
# Add the trace middleware to the application stack
|
9
|
-
initializer 'datadog.
|
10
|
-
Tracing::Contrib::Rails::Patcher.
|
9
|
+
initializer 'datadog.before_initialize' do |app|
|
10
|
+
Tracing::Contrib::Rails::Patcher.before_initialize(app)
|
11
11
|
end
|
12
12
|
|
13
13
|
config.after_initialize do
|
14
|
-
Tracing::Contrib::Rails::Patcher.
|
14
|
+
Tracing::Contrib::Rails::Patcher.after_initialize(self)
|
15
15
|
end
|
16
16
|
end
|
17
17
|
end
|
@@ -14,21 +14,25 @@ module Datadog
|
|
14
14
|
# @public_api
|
15
15
|
class Settings < Contrib::Configuration::Settings
|
16
16
|
option :enabled do |o|
|
17
|
-
o.
|
18
|
-
o.
|
17
|
+
o.type :bool
|
18
|
+
o.env Ext::ENV_ENABLED
|
19
|
+
o.default true
|
19
20
|
end
|
20
21
|
|
22
|
+
# @!visibility private
|
21
23
|
option :analytics_enabled do |o|
|
22
|
-
o.
|
23
|
-
o.
|
24
|
+
o.type :bool
|
25
|
+
o.env Ext::ENV_ANALYTICS_ENABLED
|
26
|
+
o.default false
|
24
27
|
end
|
25
28
|
|
26
29
|
option :analytics_sample_rate do |o|
|
27
|
-
o.
|
28
|
-
o.
|
30
|
+
o.type :float
|
31
|
+
o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
|
32
|
+
o.default 1.0
|
29
33
|
end
|
30
34
|
|
31
|
-
option :quantize, default: {}
|
35
|
+
option :quantize, default: {}, type: :hash
|
32
36
|
option :service_name
|
33
37
|
|
34
38
|
# A list of rake tasks, using their string names, to be instrumented.
|
@@ -36,9 +40,9 @@ module Datadog
|
|
36
40
|
# Automatically instrumenting all Rake tasks can lead to long-running tasks
|
37
41
|
# causing undue memory accumulation, as the trace for such tasks is never flushed.
|
38
42
|
option :tasks do |o|
|
39
|
-
o.
|
40
|
-
o.
|
41
|
-
o.
|
43
|
+
o.type :array
|
44
|
+
o.default []
|
45
|
+
o.after_set do |value|
|
42
46
|
# DEV: It should be possible to modify the value after it's set. E.g. for normalization.
|
43
47
|
options[:tasks].instance_variable_set(:@value, value.map(&:to_s).to_set)
|
44
48
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Datadog
|
2
4
|
module Tracing
|
3
5
|
module Contrib
|
@@ -5,18 +7,19 @@ module Datadog
|
|
5
7
|
# Rake integration constants
|
6
8
|
# @public_api Changing resource names, tag names, or environment variables creates breaking changes.
|
7
9
|
module Ext
|
8
|
-
ENV_ENABLED = 'DD_TRACE_RAKE_ENABLED'
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
10
|
+
ENV_ENABLED = 'DD_TRACE_RAKE_ENABLED'
|
11
|
+
# @!visibility private
|
12
|
+
ENV_ANALYTICS_ENABLED = 'DD_TRACE_RAKE_ANALYTICS_ENABLED'
|
13
|
+
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RAKE_ANALYTICS_SAMPLE_RATE'
|
14
|
+
SERVICE_NAME = 'rake'
|
15
|
+
SPAN_INVOKE = 'rake.invoke'
|
16
|
+
SPAN_EXECUTE = 'rake.execute'
|
17
|
+
TAG_EXECUTE_ARGS = 'rake.execute.args'
|
18
|
+
TAG_INVOKE_ARGS = 'rake.invoke.args'
|
19
|
+
TAG_TASK_ARG_NAMES = 'rake.task.arg_names'
|
20
|
+
TAG_COMPONENT = 'rake'
|
21
|
+
TAG_OPERATION_EXECUTE = 'execute'
|
22
|
+
TAG_OPERATION_INVOKE = 'invoke'
|
20
23
|
end
|
21
24
|
end
|
22
25
|
end
|
@@ -12,23 +12,28 @@ module Datadog
|
|
12
12
|
# @public_api
|
13
13
|
class Settings < Contrib::Configuration::Settings
|
14
14
|
option :enabled do |o|
|
15
|
-
o.
|
16
|
-
o.
|
15
|
+
o.type :bool
|
16
|
+
o.env Ext::ENV_ENABLED
|
17
|
+
o.default true
|
17
18
|
end
|
18
19
|
|
20
|
+
# @!visibility private
|
19
21
|
option :analytics_enabled do |o|
|
20
|
-
o.
|
21
|
-
o.
|
22
|
+
o.type :bool
|
23
|
+
o.env Ext::ENV_ANALYTICS_ENABLED
|
24
|
+
o.default false
|
22
25
|
end
|
23
26
|
|
24
27
|
option :analytics_sample_rate do |o|
|
25
|
-
o.
|
26
|
-
o.
|
28
|
+
o.type :float
|
29
|
+
o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
|
30
|
+
o.default 1.0
|
27
31
|
end
|
28
32
|
|
29
33
|
option :command_args do |o|
|
30
|
-
o.
|
31
|
-
o.
|
34
|
+
o.type :bool
|
35
|
+
o.env Ext::ENV_COMMAND_ARGS
|
36
|
+
o.default false
|
32
37
|
end
|
33
38
|
|
34
39
|
option :service_name do |o|
|
@@ -38,7 +43,11 @@ module Datadog
|
|
38
43
|
Ext::DEFAULT_PEER_SERVICE_NAME
|
39
44
|
)
|
40
45
|
end
|
41
|
-
|
46
|
+
end
|
47
|
+
|
48
|
+
option :peer_service do |o|
|
49
|
+
o.type :string, nilable: true
|
50
|
+
o.env Ext::ENV_PEER_SERVICE
|
42
51
|
end
|
43
52
|
end
|
44
53
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Datadog
|
2
4
|
module Tracing
|
3
5
|
module Contrib
|
@@ -5,21 +7,27 @@ module Datadog
|
|
5
7
|
# Redis integration constants
|
6
8
|
# @public_api Changing resource names, tag names, or environment variables creates breaking changes.
|
7
9
|
module Ext
|
8
|
-
ENV_ENABLED = 'DD_TRACE_REDIS_ENABLED'
|
9
|
-
ENV_SERVICE_NAME = 'DD_TRACE_REDIS_SERVICE_NAME'
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
10
|
+
ENV_ENABLED = 'DD_TRACE_REDIS_ENABLED'
|
11
|
+
ENV_SERVICE_NAME = 'DD_TRACE_REDIS_SERVICE_NAME'
|
12
|
+
ENV_PEER_SERVICE = 'DD_TRACE_REDIS_PEER_SERVICE'
|
13
|
+
# @!visibility private
|
14
|
+
ENV_ANALYTICS_ENABLED = 'DD_TRACE_REDIS_ANALYTICS_ENABLED'
|
15
|
+
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_REDIS_ANALYTICS_SAMPLE_RATE'
|
16
|
+
ENV_COMMAND_ARGS = 'DD_REDIS_COMMAND_ARGS'
|
17
|
+
METRIC_PIPELINE_LEN = 'redis.pipeline_length'
|
18
|
+
DEFAULT_PEER_SERVICE_NAME = 'redis'
|
19
|
+
SPAN_COMMAND = 'redis.command'
|
20
|
+
TAG_DB = 'out.redis_db'
|
21
|
+
TAG_RAW_COMMAND = 'redis.raw_command'
|
22
|
+
TYPE = 'redis'
|
23
|
+
TAG_COMPONENT = 'redis'
|
24
|
+
TAG_OPERATION_COMMAND = 'command'
|
25
|
+
TAG_SYSTEM = 'redis'
|
26
|
+
TAG_DATABASE_INDEX = 'db.redis.database_index'
|
27
|
+
PEER_SERVICE_SOURCES = Array[
|
28
|
+
Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
|
29
|
+
Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
|
30
|
+
Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
|
23
31
|
end
|
24
32
|
end
|
25
33
|
end
|
@@ -3,6 +3,7 @@ require_relative 'configuration/resolver'
|
|
3
3
|
require_relative 'ext'
|
4
4
|
require_relative 'quantize'
|
5
5
|
require_relative 'tags'
|
6
|
+
require_relative 'trace_middleware'
|
6
7
|
|
7
8
|
module Datadog
|
8
9
|
module Tracing
|
@@ -17,37 +18,17 @@ module Datadog
|
|
17
18
|
# InstanceMethods - implementing instrumentation
|
18
19
|
module InstanceMethods
|
19
20
|
def call(*args, &block)
|
20
|
-
|
21
|
-
|
22
|
-
Tracing.trace(Contrib::Redis::Ext::SPAN_COMMAND) do |span|
|
23
|
-
span.service = service_name
|
24
|
-
span.span_type = Contrib::Redis::Ext::TYPE
|
25
|
-
span.resource = get_command(args, show_command_args)
|
26
|
-
Contrib::Redis::Tags.set_common_tags(self, span, show_command_args)
|
27
|
-
|
28
|
-
super
|
29
|
-
end
|
21
|
+
TraceMiddleware.call(self, args[0], service_name, command_args?) { super }
|
30
22
|
end
|
31
23
|
|
32
24
|
def call_pipeline(*args, &block)
|
33
|
-
|
34
|
-
|
35
|
-
Tracing.trace(Contrib::Redis::Ext::SPAN_COMMAND) do |span|
|
36
|
-
span.service = service_name
|
37
|
-
span.span_type = Contrib::Redis::Ext::TYPE
|
38
|
-
commands = get_pipeline_commands(args, show_command_args)
|
39
|
-
span.resource = commands.any? ? commands.join("\n") : '(none)'
|
40
|
-
span.set_metric Contrib::Redis::Ext::METRIC_PIPELINE_LEN, commands.length
|
41
|
-
Contrib::Redis::Tags.set_common_tags(self, span, show_command_args)
|
42
|
-
|
43
|
-
super
|
44
|
-
end
|
25
|
+
TraceMiddleware.call_pipelined(self, args[0].commands, service_name, command_args?) { super }
|
45
26
|
end
|
46
27
|
|
47
28
|
private
|
48
29
|
|
49
30
|
def command_args?
|
50
|
-
pinned = Datadog.configuration_for(
|
31
|
+
pinned = Datadog.configuration_for(self, :command_args)
|
51
32
|
|
52
33
|
return pinned unless pinned.nil?
|
53
34
|
|
@@ -55,26 +36,10 @@ module Datadog
|
|
55
36
|
end
|
56
37
|
|
57
38
|
def service_name
|
58
|
-
Datadog.configuration_for(
|
39
|
+
Datadog.configuration_for(self, :service_name) ||
|
59
40
|
datadog_configuration[:service_name]
|
60
41
|
end
|
61
42
|
|
62
|
-
def get_command(args, show_command_args)
|
63
|
-
if show_command_args
|
64
|
-
Contrib::Redis::Quantize.format_command_args(*args)
|
65
|
-
else
|
66
|
-
Contrib::Redis::Quantize.get_verb(*args)
|
67
|
-
end
|
68
|
-
end
|
69
|
-
|
70
|
-
def get_pipeline_commands(args, show_command_args)
|
71
|
-
if show_command_args
|
72
|
-
args[0].commands.map { |c| Contrib::Redis::Quantize.format_command_args(c) }
|
73
|
-
else
|
74
|
-
args[0].commands.map { |c| Contrib::Redis::Quantize.get_verb(c) }
|
75
|
-
end
|
76
|
-
end
|
77
|
-
|
78
43
|
def datadog_configuration
|
79
44
|
Datadog.configuration.tracing[:redis, options]
|
80
45
|
end
|
@@ -10,38 +10,48 @@ module Datadog
|
|
10
10
|
module Patcher
|
11
11
|
include Contrib::Patcher
|
12
12
|
|
13
|
-
# Patch for redis instance
|
14
|
-
module
|
13
|
+
# Patch for redis instance (with redis < 5)
|
14
|
+
module DatadogPinPatch
|
15
15
|
def self.included(base)
|
16
16
|
base.prepend(InstanceMethods)
|
17
17
|
end
|
18
18
|
|
19
19
|
# Instance method patch for redis instance
|
20
20
|
module InstanceMethods
|
21
|
-
|
22
|
-
|
23
|
-
|
21
|
+
def datadog_pin=(pin)
|
22
|
+
pin.onto(datadog_target)
|
23
|
+
end
|
24
|
+
|
25
|
+
def datadog_target
|
26
|
+
# For `redis-rb` 4.x
|
27
|
+
return _client if respond_to?(:_client)
|
28
|
+
# For `redis-rb` 3.x
|
29
|
+
return client if respond_to?(:client)
|
30
|
+
|
31
|
+
Datadog.logger.warn 'Fail to apply configuration on redis client instance with ' \
|
32
|
+
'`Datadog.configure_onto(redis)`.'
|
33
|
+
|
34
|
+
# Null object instead of raising error
|
35
|
+
self
|
24
36
|
end
|
25
37
|
end
|
26
38
|
end
|
27
39
|
|
28
|
-
# Patch for redis
|
29
|
-
module
|
40
|
+
# Patch for redis instance (with redis >= 5)
|
41
|
+
module NotSupportedNoticePatch
|
30
42
|
def self.included(base)
|
31
43
|
base.prepend(InstanceMethods)
|
32
44
|
end
|
33
45
|
|
34
|
-
# Instance method patch for redis
|
46
|
+
# Instance method patch for redis instance
|
35
47
|
module InstanceMethods
|
36
|
-
def
|
37
|
-
|
38
|
-
|
39
|
-
|
48
|
+
def datadog_pin=(_pin)
|
49
|
+
Datadog.logger.warn \
|
50
|
+
'`Datadog.configure_onto(redis)` is not supported on Redis 5+. To instrument '\
|
51
|
+
"a redis instance with custom configuration, please initialize it with:\n"\
|
52
|
+
" `Redis.new(..., custom: { datadog: { service_name: 'my-service' } })`.\n\n" \
|
53
|
+
'See: https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md#redis'
|
40
54
|
end
|
41
|
-
|
42
|
-
private
|
43
|
-
|
44
|
-
attr_reader :redis_instance
|
45
55
|
end
|
46
56
|
end
|
47
57
|
|
@@ -62,12 +72,15 @@ module Datadog
|
|
62
72
|
::RedisClient.register(TraceMiddleware)
|
63
73
|
end
|
64
74
|
|
65
|
-
if Integration.redis_compatible?
|
66
|
-
|
75
|
+
if Integration.redis_compatible?
|
76
|
+
if Integration.redis_version < Gem::Version.new('5.0.0')
|
77
|
+
require_relative 'instrumentation'
|
67
78
|
|
68
|
-
|
69
|
-
|
70
|
-
|
79
|
+
::Redis.include(DatadogPinPatch)
|
80
|
+
::Redis::Client.include(Instrumentation)
|
81
|
+
else # warn about non-supported configure_onto usage
|
82
|
+
::Redis.include(NotSupportedNoticePatch)
|
83
|
+
end
|
71
84
|
end
|
72
85
|
end
|
73
86
|
end
|
@@ -12,15 +12,22 @@ module Datadog
|
|
12
12
|
# Tags handles generic common tags assignment.
|
13
13
|
module Tags
|
14
14
|
class << self
|
15
|
-
def set_common_tags(client, span,
|
16
|
-
|
17
|
-
|
15
|
+
def set_common_tags(client, span, raw_command)
|
16
|
+
if datadog_configuration[:peer_service]
|
17
|
+
span.set_tag(
|
18
|
+
Tracing::Metadata::Ext::TAG_PEER_SERVICE,
|
19
|
+
datadog_configuration[:peer_service]
|
20
|
+
)
|
21
|
+
end
|
18
22
|
|
19
|
-
# Tag
|
20
|
-
if
|
21
|
-
span.set_tag(Tracing::
|
23
|
+
# Tag original global service name if not used
|
24
|
+
if span.service != Datadog.configuration.service
|
25
|
+
span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
|
22
26
|
end
|
23
27
|
|
28
|
+
span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
|
29
|
+
span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_COMMAND)
|
30
|
+
|
24
31
|
span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, client.host)
|
25
32
|
|
26
33
|
span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
|
@@ -35,7 +42,9 @@ module Datadog
|
|
35
42
|
|
36
43
|
span.set_tag Ext::TAG_DATABASE_INDEX, client.db.to_s
|
37
44
|
span.set_tag Ext::TAG_DB, client.db
|
38
|
-
span.set_tag Ext::TAG_RAW_COMMAND,
|
45
|
+
span.set_tag Ext::TAG_RAW_COMMAND, raw_command
|
46
|
+
|
47
|
+
Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
|
39
48
|
end
|
40
49
|
|
41
50
|
private
|