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,120 +24,125 @@ module Datadog
|
|
24
24
|
require 'json'
|
25
25
|
require_relative 'quantize'
|
26
26
|
|
27
|
-
|
27
|
+
transport_module::Client.prepend(Client)
|
28
28
|
end
|
29
29
|
|
30
30
|
SELF_DEPRECATION_ONLY_ONCE = Core::Utils::OnlyOnce.new
|
31
31
|
|
32
|
-
#
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
32
|
+
# Patches Elasticsearch::Transport::Client module
|
33
|
+
module Client
|
34
|
+
# rubocop:disable Metrics/MethodLength
|
35
|
+
# rubocop:disable Metrics/AbcSize
|
36
|
+
def perform_request(*args)
|
37
|
+
# DEV-2.0: Remove this access, as `Client#self` in this context is not exposed to the user
|
38
|
+
# since `elasticsearch` v8.0.0. In contrast, `Client#transport` is always available across
|
39
|
+
# all `elasticsearch` gem versions and should be used instead.
|
40
|
+
service = Datadog.configuration_for(self, :service_name)
|
41
|
+
|
42
|
+
if service
|
43
|
+
SELF_DEPRECATION_ONLY_ONCE.run do
|
44
|
+
Datadog.logger.warn(
|
45
|
+
'Providing configuration though the Elasticsearch client object is deprecated.' \
|
46
|
+
'Configure the `client#transport` object instead: ' \
|
47
|
+
'Datadog.configure_onto(client.transport, service_name: service_name, ...)'
|
48
|
+
)
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
# `Client#transport` is most convenient object both this integration and the library
|
53
|
+
# user have shared access to across all `elasticsearch` versions.
|
54
|
+
#
|
55
|
+
# `Client#self` in this context is an internal object that the library user
|
56
|
+
# does not have access to since `elasticsearch` v8.0.0.
|
57
|
+
service ||= Datadog.configuration_for(transport, :service_name) || datadog_configuration[:service_name]
|
58
|
+
|
59
|
+
method = args[0]
|
60
|
+
path = args[1]
|
61
|
+
params = args[2]
|
62
|
+
body = args[3]
|
63
|
+
full_url = URI.parse(path)
|
64
|
+
url = full_url.path
|
65
|
+
response = nil
|
66
|
+
|
67
|
+
Tracing.trace(Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_QUERY, service: service) do |span|
|
68
|
+
begin
|
69
|
+
connection = transport.connections.first
|
70
|
+
host = connection.host[:host] if connection
|
71
|
+
port = connection.host[:port] if connection
|
72
|
+
|
73
|
+
if datadog_configuration[:peer_service]
|
74
|
+
span.set_tag(
|
75
|
+
Tracing::Metadata::Ext::TAG_PEER_SERVICE,
|
76
|
+
datadog_configuration[:peer_service]
|
54
77
|
)
|
55
78
|
end
|
56
|
-
end
|
57
79
|
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
connection = transport.connections.first
|
77
|
-
host = connection.host[:host] if connection
|
78
|
-
port = connection.host[:port] if connection
|
79
|
-
|
80
|
-
span.span_type = Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_TYPE_QUERY
|
81
|
-
|
82
|
-
span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
|
83
|
-
span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
|
84
|
-
span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
|
85
|
-
|
86
|
-
span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
|
87
|
-
|
88
|
-
# load JSON for the following fields unless they're already strings
|
89
|
-
params = JSON.generate(params) if params && !params.is_a?(String)
|
90
|
-
body = JSON.generate(body) if body && !body.is_a?(String)
|
91
|
-
|
92
|
-
# Tag as an external peer service
|
93
|
-
if Contrib::SpanAttributeSchema.default_span_attribute_schema?
|
94
|
-
span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
|
95
|
-
end
|
96
|
-
|
97
|
-
span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
|
98
|
-
|
99
|
-
# Set analytics sample rate
|
100
|
-
if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
|
101
|
-
Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
|
102
|
-
end
|
103
|
-
|
104
|
-
span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_METHOD, method)
|
105
|
-
span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_URL, url)
|
106
|
-
span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_PARAMS, params) if params
|
107
|
-
if body
|
108
|
-
quantize_options = datadog_configuration[:quantize]
|
109
|
-
quantized_body = Datadog::Tracing::Contrib::Elasticsearch::Quantize.format_body(
|
110
|
-
body,
|
111
|
-
quantize_options
|
112
|
-
)
|
113
|
-
span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_BODY, quantized_body)
|
114
|
-
end
|
115
|
-
span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, host) if host
|
116
|
-
span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, port) if port
|
117
|
-
|
118
|
-
quantized_url = Datadog::Tracing::Contrib::Elasticsearch::Quantize.format_url(url)
|
119
|
-
span.resource = "#{method} #{quantized_url}"
|
120
|
-
rescue StandardError => e
|
121
|
-
Datadog.logger.error(e.message)
|
122
|
-
ensure
|
123
|
-
# the call is still executed
|
124
|
-
response = perform_request_without_datadog(*args)
|
125
|
-
span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
|
80
|
+
# Tag original global service name if not used
|
81
|
+
if span.service != Datadog.configuration.service
|
82
|
+
span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
|
83
|
+
end
|
84
|
+
|
85
|
+
span.span_type = Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_TYPE_QUERY
|
86
|
+
|
87
|
+
span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
|
88
|
+
span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
|
89
|
+
span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
|
90
|
+
|
91
|
+
span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
|
92
|
+
|
93
|
+
span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
|
94
|
+
|
95
|
+
# Set analytics sample rate
|
96
|
+
if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
|
97
|
+
Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
|
126
98
|
end
|
99
|
+
|
100
|
+
span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_METHOD, method)
|
101
|
+
tag_params(params, span)
|
102
|
+
tag_body(body, span)
|
103
|
+
span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_URL, url)
|
104
|
+
span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, host) if host
|
105
|
+
span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, port) if port
|
106
|
+
|
107
|
+
quantized_url = Datadog::Tracing::Contrib::Elasticsearch::Quantize.format_url(url)
|
108
|
+
span.resource = "#{method} #{quantized_url}"
|
109
|
+
Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
|
110
|
+
rescue StandardError => e
|
111
|
+
Datadog.logger.error(e.message)
|
112
|
+
ensure
|
113
|
+
# the call is still executed
|
114
|
+
response = super
|
115
|
+
span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
|
127
116
|
end
|
128
|
-
response
|
129
117
|
end
|
118
|
+
response
|
119
|
+
end
|
130
120
|
|
131
|
-
|
132
|
-
|
133
|
-
|
121
|
+
def tag_params(params, span)
|
122
|
+
return unless params
|
123
|
+
|
124
|
+
params = JSON.generate(params) unless params.is_a?(String)
|
125
|
+
span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_PARAMS, params)
|
126
|
+
end
|
127
|
+
|
128
|
+
def tag_body(body, span)
|
129
|
+
return unless body
|
130
|
+
|
131
|
+
body = JSON.generate(body) unless body.is_a?(String)
|
132
|
+
quantize_options = datadog_configuration[:quantize]
|
133
|
+
quantized_body = Datadog::Tracing::Contrib::Elasticsearch::Quantize.format_body(
|
134
|
+
body,
|
135
|
+
quantize_options
|
136
|
+
)
|
137
|
+
span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_BODY, quantized_body)
|
138
|
+
end
|
139
|
+
|
140
|
+
def datadog_configuration
|
141
|
+
Datadog.configuration.tracing[:elasticsearch]
|
134
142
|
end
|
135
|
-
# rubocop:enable Metrics/BlockLength
|
136
143
|
end
|
137
144
|
# rubocop:enable Metrics/MethodLength
|
138
145
|
# rubocop:enable Metrics/AbcSize
|
139
|
-
# rubocop:enable Metrics/CyclomaticComplexity
|
140
|
-
# rubocop:enable Metrics/PerceivedComplexity
|
141
146
|
|
142
147
|
# `Elasticsearch` namespace renamed to `Elastic` in version 8.0.0 of the transport gem:
|
143
148
|
# @see https://github.com/elastic/elastic-transport-ruby/commit/ef804cbbd284f2a82d825221f87124f8b5ff823c
|
@@ -12,23 +12,27 @@ 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
|
-
option :split_by_domain, default: false
|
35
|
+
option :split_by_domain, default: false, type: :bool
|
32
36
|
|
33
37
|
option :service_name do |o|
|
34
38
|
o.default do
|
@@ -37,7 +41,11 @@ module Datadog
|
|
37
41
|
Ext::DEFAULT_PEER_SERVICE_NAME
|
38
42
|
)
|
39
43
|
end
|
40
|
-
|
44
|
+
end
|
45
|
+
|
46
|
+
option :peer_service do |o|
|
47
|
+
o.type :string, nilable: true
|
48
|
+
o.env Ext::ENV_PEER_SERVICE
|
41
49
|
end
|
42
50
|
end
|
43
51
|
end
|
@@ -1,5 +1,6 @@
|
|
1
1
|
require 'uri'
|
2
2
|
|
3
|
+
require_relative '../../../core/utils/hash'
|
3
4
|
require_relative '../../metadata/ext'
|
4
5
|
require_relative '../../propagation/http'
|
5
6
|
require_relative 'ext'
|
@@ -58,6 +59,12 @@ module Datadog
|
|
58
59
|
set_span_error_message("Request has failed with HTTP error: #{response_code}")
|
59
60
|
end
|
60
61
|
end
|
62
|
+
|
63
|
+
@datadog_span.set_tags(
|
64
|
+
Datadog.configuration.tracing.header_tags.response_tags(
|
65
|
+
Core::Utils::Hash::CaseInsensitiveWrapper.new(parse_response_headers)
|
66
|
+
)
|
67
|
+
)
|
61
68
|
ensure
|
62
69
|
@datadog_span.finish
|
63
70
|
@datadog_span = nil
|
@@ -122,10 +129,18 @@ module Datadog
|
|
122
129
|
method = @datadog_method.to_s if instance_variable_defined?(:@datadog_method) && !@datadog_method.nil?
|
123
130
|
span.resource = method
|
124
131
|
|
125
|
-
if
|
126
|
-
|
127
|
-
|
132
|
+
if datadog_configuration[:peer_service]
|
133
|
+
span.set_tag(
|
134
|
+
Tracing::Metadata::Ext::TAG_PEER_SERVICE,
|
135
|
+
datadog_configuration[:peer_service]
|
136
|
+
)
|
137
|
+
end
|
138
|
+
|
139
|
+
# Tag original global service name if not used
|
140
|
+
if span.service != Datadog.configuration.service
|
141
|
+
span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
|
128
142
|
end
|
143
|
+
|
129
144
|
# Set analytics sample rate
|
130
145
|
Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
|
131
146
|
|
@@ -142,6 +157,16 @@ module Datadog
|
|
142
157
|
span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, uri.host)
|
143
158
|
span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, uri.port)
|
144
159
|
span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, uri.host)
|
160
|
+
|
161
|
+
if @datadog_original_headers
|
162
|
+
span.set_tags(
|
163
|
+
Datadog.configuration.tracing.header_tags.request_tags(
|
164
|
+
Core::Utils::Hash::CaseInsensitiveWrapper.new(@datadog_original_headers)
|
165
|
+
)
|
166
|
+
)
|
167
|
+
end
|
168
|
+
|
169
|
+
Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
|
145
170
|
end
|
146
171
|
|
147
172
|
def set_span_error_message(message)
|
@@ -168,6 +193,26 @@ module Datadog
|
|
168
193
|
def analytics_sample_rate
|
169
194
|
datadog_configuration[:analytics_sample_rate]
|
170
195
|
end
|
196
|
+
|
197
|
+
# `#response_headers` returns a "\n" concatenated String containing:
|
198
|
+
# * The HTTP Status-Line.
|
199
|
+
# * The response headers.
|
200
|
+
# * A trailing "\n".
|
201
|
+
#
|
202
|
+
# This method extracts only the headers from it.
|
203
|
+
def parse_response_headers
|
204
|
+
return {} if response_headers.empty?
|
205
|
+
|
206
|
+
lines = response_headers.split("\n")
|
207
|
+
|
208
|
+
lines = lines[1..(lines.size - 1)] # Remove Status-Line and trailing whitespace.
|
209
|
+
|
210
|
+
# Find only well-behaved HTTP headers.
|
211
|
+
lines.map do |line|
|
212
|
+
header = line.split(':', 2)
|
213
|
+
header.size != 2 ? nil : header
|
214
|
+
end.compact.to_h
|
215
|
+
end
|
171
216
|
end
|
172
217
|
end
|
173
218
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Datadog
|
2
4
|
module Tracing
|
3
5
|
module Contrib
|
@@ -5,17 +7,24 @@ module Datadog
|
|
5
7
|
# Ethon 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_ETHON_ENABLED'
|
9
|
-
ENV_SERVICE_NAME = 'DD_TRACE_ETHON_SERVICE_NAME'
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
10
|
+
ENV_ENABLED = 'DD_TRACE_ETHON_ENABLED'
|
11
|
+
ENV_SERVICE_NAME = 'DD_TRACE_ETHON_SERVICE_NAME'
|
12
|
+
ENV_PEER_SERVICE = 'DD_TRACE_ETHON_PEER_SERVICE'
|
13
|
+
|
14
|
+
# @!visibility private
|
15
|
+
ENV_ANALYTICS_ENABLED = 'DD_TRACE_ETHON_ANALYTICS_ENABLED'
|
16
|
+
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ETHON_ANALYTICS_SAMPLE_RATE'
|
17
|
+
DEFAULT_PEER_SERVICE_NAME = 'ethon'
|
18
|
+
SPAN_REQUEST = 'ethon.request'
|
19
|
+
SPAN_MULTI_REQUEST = 'ethon.multi.request'
|
20
|
+
NOT_APPLICABLE_METHOD = 'N/A'
|
21
|
+
TAG_COMPONENT = 'ethon'
|
22
|
+
TAG_OPERATION_REQUEST = 'request'
|
23
|
+
TAG_OPERATION_MULTI_REQUEST = 'multi.request'
|
24
|
+
PEER_SERVICE_SOURCES = Array[
|
25
|
+
Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
|
26
|
+
Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
|
27
|
+
Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
|
19
28
|
end
|
20
29
|
end
|
21
30
|
end
|
@@ -69,9 +69,12 @@ module Datadog
|
|
69
69
|
|
70
70
|
@datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
|
71
71
|
|
72
|
-
if
|
73
|
-
|
74
|
-
@datadog_multi_span.set_tag(
|
72
|
+
# Tag original global service name if not used
|
73
|
+
if @datadog_multi_span.service != Datadog.configuration.service
|
74
|
+
@datadog_multi_span.set_tag(
|
75
|
+
Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE,
|
76
|
+
Datadog.configuration.service
|
77
|
+
)
|
75
78
|
end
|
76
79
|
|
77
80
|
# Set analytics sample rate
|
@@ -12,23 +12,29 @@ 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
|
30
|
-
option :error_handler
|
31
|
-
|
33
|
+
option :distributed_tracing, default: true, type: :bool
|
34
|
+
option :error_handler do |o|
|
35
|
+
o.type :proc, nilable: true
|
36
|
+
end
|
37
|
+
option :split_by_domain, default: false, type: :bool
|
32
38
|
|
33
39
|
option :service_name do |o|
|
34
40
|
o.default do
|
@@ -37,7 +43,11 @@ module Datadog
|
|
37
43
|
Ext::DEFAULT_PEER_SERVICE_NAME
|
38
44
|
)
|
39
45
|
end
|
40
|
-
|
46
|
+
end
|
47
|
+
|
48
|
+
option :peer_service do |o|
|
49
|
+
o.type :string, nilable: true
|
50
|
+
o.env Ext::ENV_PEER_SERVICE
|
41
51
|
end
|
42
52
|
end
|
43
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,14 +7,21 @@ module Datadog
|
|
5
7
|
# Excon 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_EXCON_ENABLED'
|
9
|
-
ENV_SERVICE_NAME = 'DD_TRACE_EXCON_SERVICE_NAME'
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
10
|
+
ENV_ENABLED = 'DD_TRACE_EXCON_ENABLED'
|
11
|
+
ENV_SERVICE_NAME = 'DD_TRACE_EXCON_SERVICE_NAME'
|
12
|
+
ENV_PEER_SERVICE = 'DD_TRACE_EXCON_PEER_SERVICE'
|
13
|
+
|
14
|
+
# @!visibility private
|
15
|
+
ENV_ANALYTICS_ENABLED = 'DD_TRACE_EXCON_ANALYTICS_ENABLED'
|
16
|
+
ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_EXCON_ANALYTICS_SAMPLE_RATE'
|
17
|
+
DEFAULT_PEER_SERVICE_NAME = 'excon'
|
18
|
+
SPAN_REQUEST = 'excon.request'
|
19
|
+
TAG_COMPONENT = 'excon'
|
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
|
16
25
|
end
|
17
26
|
end
|
18
27
|
end
|
@@ -114,16 +114,23 @@ module Datadog
|
|
114
114
|
span.service = service_name(datum[:host], @options)
|
115
115
|
span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
|
116
116
|
|
117
|
+
if @options[:peer_service]
|
118
|
+
span.set_tag(
|
119
|
+
Tracing::Metadata::Ext::TAG_PEER_SERVICE,
|
120
|
+
@options[:peer_service]
|
121
|
+
)
|
122
|
+
end
|
123
|
+
|
124
|
+
# Tag original global service name if not used
|
125
|
+
if span.service != Datadog.configuration.service
|
126
|
+
span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
|
127
|
+
end
|
128
|
+
|
117
129
|
span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
|
118
130
|
|
119
131
|
span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
|
120
132
|
span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
|
121
133
|
|
122
|
-
if Contrib::SpanAttributeSchema.default_span_attribute_schema?
|
123
|
-
# Tag as an external peer service
|
124
|
-
span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
|
125
|
-
end
|
126
|
-
|
127
134
|
span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, datum[:host])
|
128
135
|
|
129
136
|
# Set analytics sample rate
|
@@ -133,6 +140,13 @@ module Datadog
|
|
133
140
|
span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, datum[:method].to_s.upcase)
|
134
141
|
span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, datum[:host])
|
135
142
|
span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, datum[:port])
|
143
|
+
span.set_tags(
|
144
|
+
Datadog.configuration.tracing.header_tags.request_tags(
|
145
|
+
Core::Utils::Hash::CaseInsensitiveWrapper.new(datum[:headers])
|
146
|
+
)
|
147
|
+
)
|
148
|
+
|
149
|
+
Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
|
136
150
|
end
|
137
151
|
|
138
152
|
def handle_response(datum)
|
@@ -144,6 +158,12 @@ module Datadog
|
|
144
158
|
response = datum[:response]
|
145
159
|
span.set_error(["Error #{response[:status]}", response[:body]]) if error_handler.call(response)
|
146
160
|
span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response[:status])
|
161
|
+
|
162
|
+
span.set_tags(
|
163
|
+
Datadog.configuration.tracing.header_tags.response_tags(
|
164
|
+
Core::Utils::Hash::CaseInsensitiveWrapper.new(response[:headers])
|
165
|
+
)
|
166
|
+
)
|
147
167
|
end
|
148
168
|
span.set_error(datum[:error]) if datum.key?(:error)
|
149
169
|
span.finish
|
@@ -12,17 +12,42 @@ module Datadog
|
|
12
12
|
TAG_SYSTEM = 'db.system'
|
13
13
|
TAG_STATEMENT = 'db.statement'
|
14
14
|
TAG_ROW_COUNT = 'db.row_count'
|
15
|
+
PEER_SERVICE_SOURCES = Array[TAG_INSTANCE,
|
16
|
+
Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
|
17
|
+
Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
|
18
|
+
Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
|
15
19
|
end
|
16
20
|
|
17
21
|
module RPC
|
18
22
|
TAG_SYSTEM = 'rpc.system'
|
19
23
|
TAG_SERVICE = 'rpc.service'
|
20
24
|
TAG_METHOD = 'rpc.method'
|
25
|
+
PEER_SERVICE_SOURCES = Array[TAG_SERVICE,
|
26
|
+
Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
|
27
|
+
Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
|
28
|
+
Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
|
29
|
+
module GRPC
|
30
|
+
TAG_STATUS_CODE = 'rpc.grpc.status_code'
|
31
|
+
TAG_FULL_METHOD = 'rpc.grpc.full_method'
|
32
|
+
end
|
21
33
|
end
|
22
34
|
|
23
35
|
module Messaging
|
24
36
|
TAG_SYSTEM = 'messaging.system'
|
25
|
-
|
37
|
+
PEER_SERVICE_SOURCES = Array[Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
|
38
|
+
Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
|
39
|
+
Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
|
40
|
+
end
|
41
|
+
|
42
|
+
module Metadata
|
43
|
+
# Name of tag from which where peer.service information was extracted from
|
44
|
+
TAG_PEER_SERVICE_SOURCE = '_dd.peer.service.source'
|
45
|
+
|
46
|
+
# Value of tag from which peer.service value was remapped from
|
47
|
+
TAG_PEER_SERVICE_REMAP = '_dd.peer.service.remapped_from'
|
48
|
+
|
49
|
+
# Set equal to the global service when contrib span.service is overriden
|
50
|
+
TAG_BASE_SERVICE = '_dd.base_service'
|
26
51
|
end
|
27
52
|
end
|
28
53
|
end
|
@@ -108,6 +108,38 @@ module Datadog
|
|
108
108
|
module Settings
|
109
109
|
InvalidIntegrationError = Class.new(StandardError)
|
110
110
|
|
111
|
+
def self.included(base)
|
112
|
+
base.class_eval do
|
113
|
+
settings :contrib do
|
114
|
+
# Key-value map for explicitly re-mapping peer.service values
|
115
|
+
#
|
116
|
+
# @default `DD_TRACE_PEER_SERVICE_MAPPING` environment variable converted to hash
|
117
|
+
# @return [Hash]
|
118
|
+
option :peer_service_mapping do |o|
|
119
|
+
o.env Tracing::Configuration::Ext::SpanAttributeSchema::ENV_PEER_SERVICE_MAPPING
|
120
|
+
o.type :hash
|
121
|
+
o.default({})
|
122
|
+
end
|
123
|
+
|
124
|
+
# Global service name behavior
|
125
|
+
settings :global_default_service_name do
|
126
|
+
# Overrides default service name to global service name
|
127
|
+
#
|
128
|
+
# Allows for usage of v1 service name changes without
|
129
|
+
# being forced to update schema versions
|
130
|
+
#
|
131
|
+
# @default `DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED` environment variable, otherwise `false`
|
132
|
+
# @return [Boolean]
|
133
|
+
option :enabled do |o|
|
134
|
+
o.env Tracing::Configuration::Ext::SpanAttributeSchema::ENV_GLOBAL_DEFAULT_SERVICE_NAME_ENABLED
|
135
|
+
o.type :bool
|
136
|
+
o.default false
|
137
|
+
end
|
138
|
+
end
|
139
|
+
end
|
140
|
+
end
|
141
|
+
end
|
142
|
+
|
111
143
|
# Applies instrumentation for the provided `integration_name`.
|
112
144
|
#
|
113
145
|
# Options may be provided, that are specific to that instrumentation.
|
@@ -136,8 +168,12 @@ module Datadog
|
|
136
168
|
integration
|
137
169
|
end
|
138
170
|
|
139
|
-
|
140
|
-
|
171
|
+
def use(integration_name, options = {}, &block)
|
172
|
+
Core.log_deprecation do
|
173
|
+
'Configuration with `use` has been deprecated, use `instrument` instead.'
|
174
|
+
end
|
175
|
+
instrument(integration_name, options, &block)
|
176
|
+
end
|
141
177
|
|
142
178
|
# For the provided `integration_name`, resolves a matching configuration
|
143
179
|
# for the provided integration from an integration-specific `key`.
|