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
@@ -0,0 +1,127 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Datadog
|
4
|
+
module Tracing
|
5
|
+
module Contrib
|
6
|
+
module GRPC
|
7
|
+
module Formatting
|
8
|
+
VALUE_UNKNOWN = 'unknown'
|
9
|
+
|
10
|
+
# A class to extract GRPC span attributes from the GRPC implementing class method object.
|
11
|
+
class MethodObjectFormatter
|
12
|
+
# grpc_full_method is a string containing all the rpc method information (from the Protobuf definition)
|
13
|
+
# in a single string with the following format: /$package.$service/$method
|
14
|
+
attr_reader :grpc_full_method
|
15
|
+
|
16
|
+
# legacy_grpc_service is built using the Ruby GRPC service implementation package and class name instead
|
17
|
+
# of the rpc interface representation from Protobuf. It's kept for compatibility.
|
18
|
+
attr_reader :legacy_grpc_service
|
19
|
+
|
20
|
+
# legacy_grpc_method is built using the Ruby GRPC service implementation method name instead of the rpc
|
21
|
+
# interface representation from Protobuf. It's kept for compatibility.
|
22
|
+
attr_reader :legacy_grpc_method
|
23
|
+
|
24
|
+
# resource_name is used for the span resource name.
|
25
|
+
attr_reader :resource_name
|
26
|
+
|
27
|
+
def initialize(grpc_method_object)
|
28
|
+
@grpc_full_method = format_full_method(grpc_method_object)
|
29
|
+
@resource_name = format_resource_name(grpc_method_object)
|
30
|
+
@legacy_grpc_method = extract_legacy_grpc_method(grpc_method_object)
|
31
|
+
@legacy_grpc_service = extract_legacy_grpc_service(grpc_method_object)
|
32
|
+
end
|
33
|
+
|
34
|
+
private
|
35
|
+
|
36
|
+
def format_full_method(grpc_method_object)
|
37
|
+
service = extract_grpc_service(grpc_method_object)
|
38
|
+
method = extract_grpc_method(grpc_method_object)
|
39
|
+
"/#{service}/#{method}"
|
40
|
+
end
|
41
|
+
|
42
|
+
def extract_grpc_service(grpc_method_object)
|
43
|
+
owner = grpc_method_object.owner
|
44
|
+
return VALUE_UNKNOWN unless owner.instance_variable_defined?(:@service_name)
|
45
|
+
|
46
|
+
# Ruby protoc generated code includes this variable which directly contains the value from the original
|
47
|
+
# protobuf definition
|
48
|
+
owner.service_name.to_s
|
49
|
+
end
|
50
|
+
|
51
|
+
# extract_grpc_method attempts to find the original method name from the Protobuf file definition,
|
52
|
+
# since grpc gem forces the implementation method name to be in snake_case.
|
53
|
+
def extract_grpc_method(grpc_method_object)
|
54
|
+
owner = grpc_method_object.owner
|
55
|
+
|
56
|
+
return VALUE_UNKNOWN unless owner.instance_variable_defined?(:@rpc_descs)
|
57
|
+
|
58
|
+
method, = owner.rpc_descs.find do |k, _|
|
59
|
+
::GRPC::GenericService.underscore(k.to_s) == grpc_method_object.name.to_s
|
60
|
+
end
|
61
|
+
|
62
|
+
return VALUE_UNKNOWN if method.nil?
|
63
|
+
|
64
|
+
method.to_s
|
65
|
+
end
|
66
|
+
|
67
|
+
def extract_legacy_grpc_service(grpc_method_object)
|
68
|
+
grpc_method_object.owner.to_s
|
69
|
+
end
|
70
|
+
|
71
|
+
def extract_legacy_grpc_method(grpc_method_object)
|
72
|
+
grpc_method_object.name
|
73
|
+
end
|
74
|
+
|
75
|
+
def format_resource_name(grpc_method_object)
|
76
|
+
grpc_method_object
|
77
|
+
.owner
|
78
|
+
.to_s
|
79
|
+
.downcase
|
80
|
+
.split('::')
|
81
|
+
.<<(grpc_method_object.name)
|
82
|
+
.join('.')
|
83
|
+
end
|
84
|
+
end
|
85
|
+
|
86
|
+
# A class to extract GRPC span attributes from the full method string.
|
87
|
+
class FullMethodStringFormatter
|
88
|
+
# grpc_full_method is a string containing all the rpc method information (from the Protobuf definition)
|
89
|
+
# in a single string with the following format: /$package.$service/$method
|
90
|
+
attr_reader :grpc_full_method
|
91
|
+
|
92
|
+
# resource_name is used for the span resource name.
|
93
|
+
attr_reader :resource_name
|
94
|
+
|
95
|
+
# rpc_service represents the $package.$service part of the grpc_full_method string.
|
96
|
+
attr_reader :rpc_service
|
97
|
+
|
98
|
+
def initialize(grpc_full_method)
|
99
|
+
@grpc_full_method = grpc_full_method
|
100
|
+
@resource_name = format_resource_name(grpc_full_method)
|
101
|
+
@rpc_service = extract_grpc_service(grpc_full_method)
|
102
|
+
end
|
103
|
+
|
104
|
+
private
|
105
|
+
|
106
|
+
def format_resource_name(grpc_full_method)
|
107
|
+
grpc_full_method
|
108
|
+
.downcase
|
109
|
+
.split('/')
|
110
|
+
.reject(&:empty?)
|
111
|
+
.join('.')
|
112
|
+
end
|
113
|
+
|
114
|
+
def extract_grpc_service(grpc_full_method)
|
115
|
+
parts = grpc_full_method.split('/')
|
116
|
+
if parts.length < 3
|
117
|
+
''
|
118
|
+
else
|
119
|
+
parts[1]
|
120
|
+
end
|
121
|
+
end
|
122
|
+
end
|
123
|
+
end
|
124
|
+
end
|
125
|
+
end
|
126
|
+
end
|
127
|
+
end
|
@@ -11,8 +11,9 @@ module Datadog
|
|
11
11
|
# Configuration for Hanami instrumentation
|
12
12
|
class Settings < Contrib::Configuration::Settings
|
13
13
|
option :enabled do |o|
|
14
|
-
o.
|
15
|
-
o.
|
14
|
+
o.type :bool
|
15
|
+
o.env Ext::ENV_ENABLED
|
16
|
+
o.default true
|
16
17
|
end
|
17
18
|
end
|
18
19
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Datadog
|
2
4
|
module Tracing
|
3
5
|
module Contrib
|
@@ -5,16 +7,16 @@ module Datadog
|
|
5
7
|
# Hanami 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_HANAMI_ENABLED'
|
10
|
+
ENV_ENABLED = 'DD_TRACE_HANAMI_ENABLED'
|
9
11
|
|
10
|
-
SPAN_ACTION = 'hanami.action'
|
11
|
-
SPAN_ROUTING = 'hanami.routing'
|
12
|
-
SPAN_RENDER = 'hanami.render'
|
12
|
+
SPAN_ACTION = 'hanami.action'
|
13
|
+
SPAN_ROUTING = 'hanami.routing'
|
14
|
+
SPAN_RENDER = 'hanami.render'
|
13
15
|
|
14
|
-
TAG_COMPONENT = 'hanami'
|
15
|
-
TAG_OPERATION_ACTION = 'action'
|
16
|
-
TAG_OPERATION_ROUTING = 'routing'
|
17
|
-
TAG_OPERATION_RENDER = 'render'
|
16
|
+
TAG_COMPONENT = 'hanami'
|
17
|
+
TAG_OPERATION_ACTION = 'action'
|
18
|
+
TAG_OPERATION_ROUTING = 'routing'
|
19
|
+
TAG_OPERATION_RENDER = 'render'
|
18
20
|
end
|
19
21
|
end
|
20
22
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require_relative '
|
3
|
+
require_relative '../../../core/transport/ext'
|
4
4
|
|
5
5
|
module Datadog
|
6
6
|
module Tracing
|
@@ -10,7 +10,7 @@ module Datadog
|
|
10
10
|
# For avoiding recursive traces.
|
11
11
|
module CircuitBreaker
|
12
12
|
def should_skip_tracing?(request)
|
13
|
-
return true if
|
13
|
+
return true if internal_request?(request)
|
14
14
|
|
15
15
|
# we don't want a "shotgun" effect with two nested traces for one
|
16
16
|
# logical get, and request is likely to call itself recursively
|
@@ -23,12 +23,9 @@ module Datadog
|
|
23
23
|
# We don't want to trace our own call to the API (they use net/http)
|
24
24
|
# TODO: We don't want this kind of soft-check on HTTP requests.
|
25
25
|
# Remove this when transport implements its own "skip tracing" mechanism.
|
26
|
-
def
|
27
|
-
|
28
|
-
|
29
|
-
else
|
30
|
-
false
|
31
|
-
end
|
26
|
+
def internal_request?(request)
|
27
|
+
!!(request[Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION] ||
|
28
|
+
request[Datadog::Core::Transport::Ext::HTTP::HEADER_DD_INTERNAL_UNTRACED_REQUEST])
|
32
29
|
end
|
33
30
|
|
34
31
|
def should_skip_distributed_tracing?(client_config)
|
@@ -12,21 +12,25 @@ 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
|
-
option :distributed_tracing, default: true
|
33
|
+
option :distributed_tracing, default: true, type: :bool
|
30
34
|
|
31
35
|
option :service_name do |o|
|
32
36
|
o.default do
|
@@ -35,15 +39,34 @@ module Datadog
|
|
35
39
|
Ext::DEFAULT_PEER_SERVICE_NAME
|
36
40
|
)
|
37
41
|
end
|
38
|
-
o.lazy
|
39
42
|
end
|
40
43
|
|
41
44
|
option :error_status_codes do |o|
|
42
|
-
o.
|
43
|
-
o.
|
45
|
+
o.env Ext::ENV_ERROR_STATUS_CODES
|
46
|
+
o.default 400...600
|
47
|
+
o.env_parser do |value|
|
48
|
+
values = if value.include?(',')
|
49
|
+
value.split(',')
|
50
|
+
else
|
51
|
+
value.split
|
52
|
+
end
|
53
|
+
values.map! do |v|
|
54
|
+
v.gsub!(/\A[\s,]*|[\s,]*\Z/, '')
|
55
|
+
|
56
|
+
v.empty? ? nil : v
|
57
|
+
end
|
58
|
+
|
59
|
+
values.compact!
|
60
|
+
values
|
61
|
+
end
|
62
|
+
end
|
63
|
+
|
64
|
+
option :peer_service do |o|
|
65
|
+
o.type :string, nilable: true
|
66
|
+
o.env Ext::ENV_PEER_SERVICE
|
44
67
|
end
|
45
68
|
|
46
|
-
option :split_by_domain, default: false
|
69
|
+
option :split_by_domain, default: false, type: :bool
|
47
70
|
end
|
48
71
|
end
|
49
72
|
end
|
@@ -13,8 +13,8 @@ module Datadog
|
|
13
13
|
#
|
14
14
|
# In case both variants are present, the verbatim match will be used.
|
15
15
|
class Fetcher < Tracing::Distributed::Fetcher
|
16
|
-
#
|
17
|
-
#
|
16
|
+
# @param [String] name the header name
|
17
|
+
# @return [String, nil] the header value or nil if not found
|
18
18
|
def [](name)
|
19
19
|
# Try to fetch with the plain key
|
20
20
|
value = super(name)
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Datadog
|
2
4
|
module Tracing
|
3
5
|
module Contrib
|
@@ -5,15 +7,21 @@ module Datadog
|
|
5
7
|
# HTTP 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_HTTP_ENABLED'
|
9
|
-
ENV_SERVICE_NAME = 'DD_TRACE_NET_HTTP_SERVICE_NAME'
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
10
|
+
ENV_ENABLED = 'DD_TRACE_HTTP_ENABLED'
|
11
|
+
ENV_SERVICE_NAME = 'DD_TRACE_NET_HTTP_SERVICE_NAME'
|
12
|
+
ENV_PEER_SERVICE = 'DD_TRACE_NET_HTTP_PEER_SERVICE'
|
13
|
+
# @!visibility private
|
14
|
+
ENV_ANALYTICS_ENABLED = 'DD_TRACE_HTTP_ANALYTICS_ENABLED'
|
15
|
+
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_HTTP_ANALYTICS_SAMPLE_RATE'
|
16
|
+
ENV_ERROR_STATUS_CODES = 'DD_TRACE_HTTP_ERROR_STATUS_CODES'
|
17
|
+
DEFAULT_PEER_SERVICE_NAME = 'net/http'
|
18
|
+
SPAN_REQUEST = 'http.request'
|
19
|
+
TAG_COMPONENT = 'net/http'
|
20
|
+
TAG_OPERATION_REQUEST = 'request'
|
21
|
+
PEER_SERVICE_SOURCES = Array[
|
22
|
+
Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
|
23
|
+
Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
|
24
|
+
Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
|
17
25
|
end
|
18
26
|
end
|
19
27
|
end
|
@@ -3,6 +3,7 @@ require 'uri'
|
|
3
3
|
require_relative '../../metadata/ext'
|
4
4
|
require_relative '../analytics'
|
5
5
|
require_relative '../http_annotation_helper'
|
6
|
+
require_relative '../utils/quantization/http'
|
6
7
|
|
7
8
|
module Datadog
|
8
9
|
module Tracing
|
@@ -68,27 +69,42 @@ module Datadog
|
|
68
69
|
end
|
69
70
|
|
70
71
|
def annotate_span_with_request!(span, request, request_options)
|
72
|
+
if request_options[:peer_service]
|
73
|
+
span.set_tag(
|
74
|
+
Tracing::Metadata::Ext::TAG_PEER_SERVICE,
|
75
|
+
request_options[:peer_service]
|
76
|
+
)
|
77
|
+
end
|
78
|
+
|
79
|
+
# Tag original global service name if not used
|
80
|
+
if span.service != Datadog.configuration.service
|
81
|
+
span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
|
82
|
+
end
|
83
|
+
|
71
84
|
span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
|
72
85
|
|
73
86
|
span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
|
74
87
|
span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
|
75
|
-
|
76
|
-
|
88
|
+
span.set_tag(
|
89
|
+
Tracing::Metadata::Ext::HTTP::TAG_URL,
|
90
|
+
Contrib::Utils::Quantization::HTTP.url(request.path, { query: { exclude: :all } })
|
91
|
+
)
|
77
92
|
span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, request.method)
|
78
93
|
|
79
94
|
host, port = host_and_port(request)
|
80
95
|
span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, host)
|
81
96
|
span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, port.to_s)
|
82
97
|
|
83
|
-
if Contrib::SpanAttributeSchema.default_span_attribute_schema?
|
84
|
-
# Tag as an external peer service
|
85
|
-
span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
|
86
|
-
end
|
87
|
-
|
88
98
|
span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host)
|
89
99
|
|
90
100
|
# Set analytics sample rate
|
91
101
|
set_analytics_sample_rate(span, request_options)
|
102
|
+
|
103
|
+
span.set_tags(
|
104
|
+
Datadog.configuration.tracing.header_tags.request_tags(request)
|
105
|
+
)
|
106
|
+
|
107
|
+
Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
|
92
108
|
end
|
93
109
|
|
94
110
|
def annotate_span_with_response!(span, response, request_options)
|
@@ -97,6 +113,10 @@ module Datadog
|
|
97
113
|
span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.code)
|
98
114
|
|
99
115
|
span.set_error(response) if request_options[:error_status_codes].include? response.code.to_i
|
116
|
+
|
117
|
+
span.set_tags(
|
118
|
+
Datadog.configuration.tracing.header_tags.response_tags(response)
|
119
|
+
)
|
100
120
|
end
|
101
121
|
|
102
122
|
def annotate_span_with_error!(span, error)
|
@@ -12,21 +12,25 @@ 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
|
-
option :distributed_tracing, default: true
|
33
|
+
option :distributed_tracing, default: true, type: :bool
|
30
34
|
|
31
35
|
option :service_name do |o|
|
32
36
|
o.default do
|
@@ -35,15 +39,34 @@ module Datadog
|
|
35
39
|
Ext::DEFAULT_PEER_SERVICE_NAME
|
36
40
|
)
|
37
41
|
end
|
38
|
-
o.lazy
|
39
42
|
end
|
40
43
|
|
41
44
|
option :error_status_codes do |o|
|
42
|
-
o.
|
43
|
-
o.
|
45
|
+
o.env Ext::ENV_ERROR_STATUS_CODES
|
46
|
+
o.default 400...600
|
47
|
+
o.env_parser do |value|
|
48
|
+
values = if value.include?(',')
|
49
|
+
value.split(',')
|
50
|
+
else
|
51
|
+
value.split
|
52
|
+
end
|
53
|
+
values.map! do |v|
|
54
|
+
v.gsub!(/\A[\s,]*|[\s,]*\Z/, '')
|
55
|
+
|
56
|
+
v.empty? ? nil : v
|
57
|
+
end
|
58
|
+
|
59
|
+
values.compact!
|
60
|
+
values
|
61
|
+
end
|
62
|
+
end
|
63
|
+
|
64
|
+
option :peer_service do |o|
|
65
|
+
o.type :string, nilable: true
|
66
|
+
o.env Ext::ENV_PEER_SERVICE
|
44
67
|
end
|
45
68
|
|
46
|
-
option :split_by_domain, default: false
|
69
|
+
option :split_by_domain, default: false, type: :bool
|
47
70
|
end
|
48
71
|
end
|
49
72
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Datadog
|
2
4
|
module Tracing
|
3
5
|
module Contrib
|
@@ -5,15 +7,22 @@ module Datadog
|
|
5
7
|
# Httpclient 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_HTTPCLIENT_ENABLED'
|
9
|
-
ENV_SERVICE_NAME = 'DD_TRACE_HTTPCLIENT_SERVICE_NAME'
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
10
|
+
ENV_ENABLED = 'DD_TRACE_HTTPCLIENT_ENABLED'
|
11
|
+
ENV_SERVICE_NAME = 'DD_TRACE_HTTPCLIENT_SERVICE_NAME'
|
12
|
+
ENV_PEER_SERVICE = 'DD_TRACE_HTTPCLIENT_PEER_SERVICE'
|
13
|
+
|
14
|
+
# @!visibility private
|
15
|
+
ENV_ANALYTICS_ENABLED = 'DD_TRACE_HTTPCLIENT_ANALYTICS_ENABLED'
|
16
|
+
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_HTTPCLIENT_ANALYTICS_SAMPLE_RATE'
|
17
|
+
ENV_ERROR_STATUS_CODES = 'DD_TRACE_HTTPCLIENT_ERROR_STATUS_CODES'
|
18
|
+
DEFAULT_PEER_SERVICE_NAME = 'httpclient'
|
19
|
+
SPAN_REQUEST = 'httpclient.request'
|
20
|
+
TAG_COMPONENT = 'httpclient'
|
21
|
+
TAG_OPERATION_REQUEST = 'request'
|
22
|
+
PEER_SERVICE_SOURCES = Array[
|
23
|
+
Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
|
24
|
+
Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
|
25
|
+
Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
|
17
26
|
end
|
18
27
|
end
|
19
28
|
end
|
@@ -51,6 +51,18 @@ module Datadog
|
|
51
51
|
def annotate_span_with_request!(span, req, req_options)
|
52
52
|
span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
|
53
53
|
|
54
|
+
if req_options[:peer_service]
|
55
|
+
span.set_tag(
|
56
|
+
Tracing::Metadata::Ext::TAG_PEER_SERVICE,
|
57
|
+
req_options[:peer_service]
|
58
|
+
)
|
59
|
+
end
|
60
|
+
|
61
|
+
# Tag original global service name if not used
|
62
|
+
if span.service != Datadog.configuration.service
|
63
|
+
span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
|
64
|
+
end
|
65
|
+
|
54
66
|
span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
|
55
67
|
span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
|
56
68
|
|
@@ -63,14 +75,15 @@ module Datadog
|
|
63
75
|
span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, uri.host)
|
64
76
|
span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, uri.port)
|
65
77
|
|
66
|
-
if Contrib::SpanAttributeSchema.default_span_attribute_schema?
|
67
|
-
# Tag as an external peer service
|
68
|
-
span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
|
69
|
-
end
|
70
|
-
|
71
78
|
span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, uri.host)
|
72
79
|
|
73
80
|
set_analytics_sample_rate(span, req_options)
|
81
|
+
|
82
|
+
span.set_tags(
|
83
|
+
Datadog.configuration.tracing.header_tags.request_tags(req.http_header)
|
84
|
+
)
|
85
|
+
|
86
|
+
Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
|
74
87
|
end
|
75
88
|
|
76
89
|
def annotate_span_with_response!(span, response, request_options)
|
@@ -81,6 +94,10 @@ module Datadog
|
|
81
94
|
if request_options[:error_status_codes].include? response.code.to_i
|
82
95
|
span.set_error(["Error #{response.status}", response.body])
|
83
96
|
end
|
97
|
+
|
98
|
+
span.set_tags(
|
99
|
+
Datadog.configuration.tracing.header_tags.response_tags(response.header)
|
100
|
+
)
|
84
101
|
end
|
85
102
|
|
86
103
|
def annotate_span_with_error!(span, error)
|
@@ -12,21 +12,25 @@ 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
|
-
option :distributed_tracing, default: true
|
33
|
+
option :distributed_tracing, default: true, type: :bool
|
30
34
|
|
31
35
|
option :service_name do |o|
|
32
36
|
o.default do
|
@@ -35,15 +39,34 @@ module Datadog
|
|
35
39
|
Ext::DEFAULT_PEER_SERVICE_NAME
|
36
40
|
)
|
37
41
|
end
|
38
|
-
o.lazy
|
39
42
|
end
|
40
43
|
|
41
44
|
option :error_status_codes do |o|
|
42
|
-
o.
|
43
|
-
o.
|
45
|
+
o.env Ext::ENV_ERROR_STATUS_CODES
|
46
|
+
o.default 400...600
|
47
|
+
o.env_parser do |value|
|
48
|
+
values = if value.include?(',')
|
49
|
+
value.split(',')
|
50
|
+
else
|
51
|
+
value.split
|
52
|
+
end
|
53
|
+
values.map! do |v|
|
54
|
+
v.gsub!(/\A[\s,]*|[\s,]*\Z/, '')
|
55
|
+
|
56
|
+
v.empty? ? nil : v
|
57
|
+
end
|
58
|
+
|
59
|
+
values.compact!
|
60
|
+
values
|
61
|
+
end
|
62
|
+
end
|
63
|
+
|
64
|
+
option :peer_service do |o|
|
65
|
+
o.type :string, nilable: true
|
66
|
+
o.env Ext::ENV_PEER_SERVICE
|
44
67
|
end
|
45
68
|
|
46
|
-
option :split_by_domain, default: false
|
69
|
+
option :split_by_domain, default: false, type: :bool
|
47
70
|
end
|
48
71
|
end
|
49
72
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Datadog
|
2
4
|
module Tracing
|
3
5
|
module Contrib
|
@@ -5,15 +7,21 @@ module Datadog
|
|
5
7
|
# Httprb 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_HTTPRB_ENABLED'
|
9
|
-
ENV_SERVICE_NAME = 'DD_TRACE_HTTPRB_SERVICE_NAME'
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
10
|
+
ENV_ENABLED = 'DD_TRACE_HTTPRB_ENABLED'
|
11
|
+
ENV_SERVICE_NAME = 'DD_TRACE_HTTPRB_SERVICE_NAME'
|
12
|
+
ENV_PEER_SERVICE = 'DD_TRACE_HTTPRB_PEER_SERVICE'
|
13
|
+
# @!visibility private
|
14
|
+
ENV_ANALYTICS_ENABLED = 'DD_TRACE_HTTPRB_ANALYTICS_ENABLED'
|
15
|
+
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_EHTTPRB_ANALYTICS_SAMPLE_RATE'
|
16
|
+
ENV_ERROR_STATUS_CODES = 'DD_TRACE_HTTPCLIENT_ERROR_STATUS_CODES'
|
17
|
+
DEFAULT_PEER_SERVICE_NAME = 'httprb'
|
18
|
+
SPAN_REQUEST = 'httprb.request'
|
19
|
+
TAG_COMPONENT = 'httprb'
|
20
|
+
TAG_OPERATION_REQUEST = 'request'
|
21
|
+
PEER_SERVICE_SOURCES = Array[
|
22
|
+
Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
|
23
|
+
Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
|
24
|
+
Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
|
17
25
|
end
|
18
26
|
end
|
19
27
|
end
|