datadog 2.48.0 → 2.49.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +47 -1
- data/ext/datadog_profiling_native_extension/collectors_stack.c +1 -1
- data/ext/datadog_profiling_native_extension/collectors_stack.h +4 -2
- data/ext/datadog_profiling_native_extension/extconf.rb +3 -0
- data/ext/datadog_profiling_native_extension/private_vm_api_access.c +13 -21
- data/ext/libdatadog_api/extconf.rb +2 -0
- data/ext/libdatadog_api/feature_flags.c +137 -0
- data/ext/libdatadog_api/process_discovery.c +3 -3
- data/ext/libdatadog_extconf_helpers.rb +1 -1
- data/lib/datadog/ai_guard/contrib/rack/patcher.rb +3 -5
- data/lib/datadog/ai_guard/contrib/rails/patcher.rb +7 -9
- data/lib/datadog/ai_guard/contrib/ruby_llm/patcher.rb +3 -5
- data/lib/datadog/ai_guard/metrics/telemetry.rb +2 -4
- data/lib/datadog/appsec/actions_handler.rb +5 -7
- data/lib/datadog/appsec/api_security/endpoint_collection/grape_route_serializer.rb +1 -3
- data/lib/datadog/appsec/api_security/endpoint_collection/rails_route_serializer.rb +1 -3
- data/lib/datadog/appsec/api_security/endpoint_collection/sinatra_route_serializer.rb +1 -3
- data/lib/datadog/appsec/assets.rb +8 -10
- data/lib/datadog/appsec/configuration.rb +1 -1
- data/lib/datadog/appsec/context.rb +63 -6
- data/lib/datadog/appsec/contrib/active_record/instrumentation.rb +1 -3
- data/lib/datadog/appsec/contrib/active_record/patcher.rb +21 -24
- data/lib/datadog/appsec/contrib/aws_lambda/patcher.rb +3 -5
- data/lib/datadog/appsec/contrib/aws_lambda/waf_addresses.rb +9 -11
- data/lib/datadog/appsec/contrib/devise/configuration.rb +2 -4
- data/lib/datadog/appsec/contrib/devise/patcher.rb +3 -5
- data/lib/datadog/appsec/contrib/excon/patcher.rb +3 -5
- data/lib/datadog/appsec/contrib/faraday/patcher.rb +4 -6
- data/lib/datadog/appsec/contrib/graphql/patcher.rb +3 -5
- data/lib/datadog/appsec/contrib/rack/input_peeker.rb +3 -5
- data/lib/datadog/appsec/contrib/rack/patcher.rb +3 -5
- data/lib/datadog/appsec/contrib/rack/request_body_middleware.rb +5 -4
- data/lib/datadog/appsec/contrib/rack/request_middleware.rb +6 -7
- data/lib/datadog/appsec/contrib/rails/patcher.rb +19 -16
- data/lib/datadog/appsec/contrib/rails/patches/live_thread_patch.rb +33 -0
- data/lib/datadog/appsec/contrib/rest_client/patcher.rb +3 -5
- data/lib/datadog/appsec/contrib/sinatra/patcher.rb +4 -6
- data/lib/datadog/appsec/default_header_tags.rb +2 -4
- data/lib/datadog/appsec/metrics/exporter.rb +4 -6
- data/lib/datadog/appsec/metrics/telemetry.rb +1 -3
- data/lib/datadog/appsec/metrics/telemetry_exporter.rb +2 -4
- data/lib/datadog/appsec/route_normalizer/route_text.rb +1 -3
- data/lib/datadog/appsec/route_normalizer.rb +4 -6
- data/lib/datadog/appsec/utils/http/body_reader.rb +3 -5
- data/lib/datadog/appsec/utils/http/url_encoded.rb +2 -4
- data/lib/datadog/core/borrowing_token_bucket.rb +60 -0
- data/lib/datadog/core/chunker.rb +1 -3
- data/lib/datadog/core/configuration/components.rb +48 -17
- data/lib/datadog/core/configuration/settings.rb +2 -1
- data/lib/datadog/core/configuration/supported_configurations.rb +2 -0
- data/lib/datadog/core/diagnostics/environment_logger.rb +1 -6
- data/lib/datadog/core/encoding.rb +8 -12
- data/lib/datadog/core/environment/cgroup.rb +3 -5
- data/lib/datadog/core/environment/container.rb +9 -11
- data/lib/datadog/core/environment/ext.rb +1 -6
- data/lib/datadog/core/environment/gc.rb +2 -4
- data/lib/datadog/core/environment/identity.rb +13 -15
- data/lib/datadog/core/environment/platform.rb +10 -12
- data/lib/datadog/core/environment/socket.rb +3 -5
- data/lib/datadog/core/environment/thread_count.rb +2 -4
- data/lib/datadog/core/environment/variable_helpers.rb +2 -6
- data/lib/datadog/core/environment/vm_cache.rb +5 -7
- data/lib/datadog/core/environment/yjit.rb +25 -24
- data/lib/datadog/core/logger.rb +5 -2
- data/lib/datadog/core/metrics/client.rb +8 -16
- data/lib/datadog/core/metrics/helpers.rb +3 -0
- data/lib/datadog/core/metrics/metric.rb +3 -1
- data/lib/datadog/core/rate_limiter.rb +9 -31
- data/lib/datadog/core/refillable_bucket.rb +72 -0
- data/lib/datadog/core/remote/client/capabilities.rb +4 -0
- data/lib/datadog/core/remote/client.rb +1 -5
- data/lib/datadog/core/remote/transport/http.rb +2 -4
- data/lib/datadog/core/tag_normalizer.rb +0 -2
- data/lib/datadog/core/telemetry/configuration_value.rb +1 -3
- data/lib/datadog/core/telemetry/transport/http.rb +2 -4
- data/lib/datadog/core/telemetry/worker.rb +30 -24
- data/lib/datadog/core/transport/http.rb +2 -4
- data/lib/datadog/core/utils/at_fork_monkey_patch.rb +2 -2
- data/lib/datadog/core/utils/forking.rb +1 -1
- data/lib/datadog/core/utils/lru_cache.rb +2 -2
- data/lib/datadog/core/utils/network.rb +1 -1
- data/lib/datadog/core/utils/time.rb +2 -2
- data/lib/datadog/core/utils/truncation.rb +1 -3
- data/lib/datadog/core/workers/async.rb +16 -14
- data/lib/datadog/core/workers/runtime_metrics.rb +1 -1
- data/lib/datadog/data_streams/transport/http.rb +1 -3
- data/lib/datadog/di/component.rb +14 -2
- data/lib/datadog/di/context.rb +50 -0
- data/lib/datadog/di/contrib.rb +2 -2
- data/lib/datadog/di/correlation_sampler/trace_budget.rb +75 -0
- data/lib/datadog/di/correlation_sampler/trace_budget_ledger/entry.rb +34 -0
- data/lib/datadog/di/correlation_sampler/trace_budget_ledger.rb +104 -0
- data/lib/datadog/di/correlation_sampler.rb +224 -0
- data/lib/datadog/di/guardrails_telemetry/reason.rb +8 -3
- data/lib/datadog/di/instrumenter.rb +294 -109
- data/lib/datadog/di/probe.rb +13 -2
- data/lib/datadog/di/probe_builder.rb +6 -8
- data/lib/datadog/di/probe_file_loader.rb +2 -2
- data/lib/datadog/di/probe_manager.rb +7 -30
- data/lib/datadog/di/probe_notification_builder.rb +42 -11
- data/lib/datadog/di/probe_notifier_worker.rb +11 -0
- data/lib/datadog/di/snapshot_pruner/node.rb +190 -0
- data/lib/datadog/di/snapshot_pruner/node_queue.rb +104 -0
- data/lib/datadog/di/snapshot_pruner/parser.rb +102 -0
- data/lib/datadog/di/snapshot_pruner.rb +128 -0
- data/lib/datadog/di/transport/input.rb +75 -15
- data/lib/datadog/di/utils.rb +3 -3
- data/lib/datadog/di.rb +29 -0
- data/lib/datadog/error_tracking/filters.rb +6 -8
- data/lib/datadog/open_feature/agentless/parser.rb +2 -4
- data/lib/datadog/open_feature/component.rb +24 -2
- data/lib/datadog/open_feature/configuration.rb +13 -0
- data/lib/datadog/open_feature/evaluation_engine.rb +5 -5
- data/lib/datadog/open_feature/exposure_hook.rb +146 -0
- data/lib/datadog/open_feature/exposures/event.rb +10 -8
- data/lib/datadog/open_feature/exposures/reporter.rb +34 -25
- data/lib/datadog/open_feature/ext.rb +12 -0
- data/lib/datadog/open_feature/flag_evaluation/aggregator.rb +10 -8
- data/lib/datadog/open_feature/flag_evaluation/writer.rb +9 -6
- data/lib/datadog/open_feature/hooks/exposure_logging_hook.rb +58 -0
- data/lib/datadog/open_feature/hooks/flag_eval_evp_hook.rb +4 -2
- data/lib/datadog/open_feature/hooks/flag_eval_metrics_hook.rb +3 -5
- data/lib/datadog/open_feature/hooks/span_enrichment_hook/codec.rb +3 -5
- data/lib/datadog/open_feature/native_evaluator.rb +30 -2
- data/lib/datadog/open_feature/noop_evaluator.rb +3 -1
- data/lib/datadog/open_feature/provider.rb +54 -4
- data/lib/datadog/open_feature/resolution_details.rb +1 -0
- data/lib/datadog/open_feature/split_features.rb +76 -0
- data/lib/datadog/opentelemetry/sdk/propagator.rb +5 -2
- data/lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb +28 -31
- data/lib/datadog/profiling/component.rb +31 -9
- data/lib/datadog/profiling/profiler.rb +6 -0
- data/lib/datadog/profiling/remote.rb +381 -0
- data/lib/datadog/profiling/worker_state.rb +65 -0
- data/lib/datadog/profiling.rb +1 -0
- data/lib/datadog/symbol_database/file_hash.rb +1 -3
- data/lib/datadog/tracing/component.rb +14 -16
- data/lib/datadog/tracing/configuration/settings.rb +2 -2
- data/lib/datadog/tracing/contrib/action_cable/events/broadcast.rb +4 -6
- data/lib/datadog/tracing/contrib/action_cable/events/perform_action.rb +4 -6
- data/lib/datadog/tracing/contrib/action_cable/events/transmit.rb +4 -6
- data/lib/datadog/tracing/contrib/action_cable/events.rb +3 -5
- data/lib/datadog/tracing/contrib/action_cable/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/action_mailer/events/deliver.rb +5 -7
- data/lib/datadog/tracing/contrib/action_mailer/events/process.rb +4 -6
- data/lib/datadog/tracing/contrib/action_mailer/events.rb +3 -5
- data/lib/datadog/tracing/contrib/action_mailer/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/action_pack/action_controller/instrumentation.rb +2 -4
- data/lib/datadog/tracing/contrib/action_pack/action_controller/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/action_pack/action_dispatch/instrumentation.rb +2 -4
- data/lib/datadog/tracing/contrib/action_pack/action_dispatch/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/action_pack/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/action_view/events/render_partial.rb +3 -5
- data/lib/datadog/tracing/contrib/action_view/events/render_template.rb +3 -5
- data/lib/datadog/tracing/contrib/action_view/events.rb +3 -5
- data/lib/datadog/tracing/contrib/action_view/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/action_view/utils.rb +1 -3
- data/lib/datadog/tracing/contrib/active_job/events/discard.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/events/enqueue.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/events/enqueue_at.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/events/enqueue_retry.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/events/perform.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/events/retry_stopped.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/events.rb +3 -5
- data/lib/datadog/tracing/contrib/active_job/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/active_model_serializers/events/render.rb +4 -6
- data/lib/datadog/tracing/contrib/active_model_serializers/events/serialize.rb +4 -6
- data/lib/datadog/tracing/contrib/active_model_serializers/events.rb +3 -5
- data/lib/datadog/tracing/contrib/active_model_serializers/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/active_record/events/instantiation.rb +4 -6
- data/lib/datadog/tracing/contrib/active_record/events/sql.rb +3 -5
- data/lib/datadog/tracing/contrib/active_record/events.rb +3 -5
- data/lib/datadog/tracing/contrib/active_record/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/active_support/cache/events/cache.rb +8 -10
- data/lib/datadog/tracing/contrib/active_support/cache/events.rb +3 -5
- data/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb +5 -7
- data/lib/datadog/tracing/contrib/active_support/cache/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/active_support/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/analytics.rb +4 -6
- data/lib/datadog/tracing/contrib/aws/patcher.rb +5 -7
- data/lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb +5 -7
- data/lib/datadog/tracing/contrib/configuration/settings.rb +17 -0
- data/lib/datadog/tracing/contrib/dalli/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/dalli/quantize.rb +1 -3
- data/lib/datadog/tracing/contrib/delayed_job/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/elasticsearch/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/elasticsearch/quantize.rb +6 -8
- data/lib/datadog/tracing/contrib/ethon/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/excon/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/faraday/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/grape/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/graphql/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/graphql/trace_patcher.rb +1 -3
- data/lib/datadog/tracing/contrib/graphql/tracing_patcher.rb +1 -3
- data/lib/datadog/tracing/contrib/graphql/unified_trace_patcher.rb +1 -3
- data/lib/datadog/tracing/contrib/grpc/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/hanami/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/http/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/httpclient/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/httprb/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/kafka/events/connection/request.rb +4 -6
- data/lib/datadog/tracing/contrib/kafka/events/consumer/process_batch.rb +3 -5
- data/lib/datadog/tracing/contrib/kafka/events/consumer/process_message.rb +3 -5
- data/lib/datadog/tracing/contrib/kafka/events/consumer_group/heartbeat.rb +3 -5
- data/lib/datadog/tracing/contrib/kafka/events/consumer_group/join_group.rb +2 -4
- data/lib/datadog/tracing/contrib/kafka/events/consumer_group/leave_group.rb +2 -4
- data/lib/datadog/tracing/contrib/kafka/events/consumer_group/sync_group.rb +2 -4
- data/lib/datadog/tracing/contrib/kafka/events/produce_operation/send_messages.rb +4 -6
- data/lib/datadog/tracing/contrib/kafka/events/producer/deliver_messages.rb +4 -6
- data/lib/datadog/tracing/contrib/kafka/events.rb +3 -5
- data/lib/datadog/tracing/contrib/kafka/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/karafka/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/lograge/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/mongodb/parsers.rb +5 -7
- data/lib/datadog/tracing/contrib/mongodb/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/mysql2/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/opensearch/patcher.rb +1 -3
- data/lib/datadog/tracing/contrib/opensearch/quantize.rb +5 -7
- data/lib/datadog/tracing/contrib/pg/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/presto/patcher.rb +1 -3
- data/lib/datadog/tracing/contrib/que/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/racecar/events/batch.rb +3 -5
- data/lib/datadog/tracing/contrib/racecar/events/consume.rb +3 -5
- data/lib/datadog/tracing/contrib/racecar/events/message.rb +3 -5
- data/lib/datadog/tracing/contrib/racecar/events.rb +3 -5
- data/lib/datadog/tracing/contrib/racecar/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/rack/patcher.rb +13 -19
- data/lib/datadog/tracing/contrib/rack/request_queue.rb +1 -3
- data/lib/datadog/tracing/contrib/rack/route_inference.rb +4 -6
- data/lib/datadog/tracing/contrib/rack/trace_proxy_middleware.rb +4 -6
- data/lib/datadog/tracing/contrib/rails/configuration/settings.rb +4 -0
- data/lib/datadog/tracing/contrib/rails/ext.rb +2 -0
- data/lib/datadog/tracing/contrib/rails/framework.rb +6 -8
- data/lib/datadog/tracing/contrib/rails/log_injection.rb +1 -3
- data/lib/datadog/tracing/contrib/rails/patcher.rb +9 -11
- data/lib/datadog/tracing/contrib/rake/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/redis/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/redis/quantize.rb +7 -9
- data/lib/datadog/tracing/contrib/resque/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/rest_client/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/roda/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/semantic_logger/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/sequel/patcher.rb +4 -6
- data/lib/datadog/tracing/contrib/shoryuken/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/sidekiq/patcher.rb +7 -9
- data/lib/datadog/tracing/contrib/sinatra/env.rb +3 -5
- data/lib/datadog/tracing/contrib/sinatra/patcher.rb +5 -7
- data/lib/datadog/tracing/contrib/sneakers/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/stripe/patcher.rb +2 -4
- data/lib/datadog/tracing/contrib/stripe/request.rb +4 -6
- data/lib/datadog/tracing/contrib/sucker_punch/exception_handler.rb +1 -3
- data/lib/datadog/tracing/contrib/sucker_punch/instrumentation.rb +1 -3
- data/lib/datadog/tracing/contrib/sucker_punch/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/support.rb +1 -3
- data/lib/datadog/tracing/contrib/trilogy/configuration/settings.rb +4 -0
- data/lib/datadog/tracing/contrib/trilogy/instrumentation.rb +2 -1
- data/lib/datadog/tracing/contrib/trilogy/patcher.rb +3 -5
- data/lib/datadog/tracing/contrib/utils/database.rb +1 -3
- data/lib/datadog/tracing/contrib/utils/quantization/hash_formatter.rb +8 -10
- data/lib/datadog/tracing/contrib/utils/quantization/http.rb +11 -13
- data/lib/datadog/tracing/contrib/waterdrop/patcher.rb +3 -5
- data/lib/datadog/tracing/correlation.rb +3 -5
- data/lib/datadog/tracing/distributed/propagation.rb +2 -2
- data/lib/datadog/tracing/distributed/propagation_policy.rb +1 -3
- data/lib/datadog/tracing/distributed/trace_state/datadog.rb +5 -5
- data/lib/datadog/tracing/distributed/trace_state/open_telemetry.rb +2 -2
- data/lib/datadog/tracing/metadata/ext.rb +3 -9
- data/lib/datadog/tracing/remote.rb +1 -1
- data/lib/datadog/tracing/trace_operation.rb +11 -3
- data/lib/datadog/tracing/tracer.rb +9 -1
- data/lib/datadog/tracing/transport/http.rb +1 -3
- data/lib/datadog/tracing/transport/io.rb +2 -4
- data/lib/datadog/tracing/transport/traces.rb +1 -3
- data/lib/datadog/tracing/utils.rb +4 -6
- data/lib/datadog/version.rb +1 -1
- metadata +22 -6
|
@@ -42,13 +42,11 @@ module Datadog
|
|
|
42
42
|
module Patcher
|
|
43
43
|
include Contrib::Patcher
|
|
44
44
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
def target_version
|
|
45
|
+
def self.target_version
|
|
48
46
|
Integration.version
|
|
49
47
|
end
|
|
50
48
|
|
|
51
|
-
def patch
|
|
49
|
+
def self.patch
|
|
52
50
|
require_relative "tracer"
|
|
53
51
|
register_tracer
|
|
54
52
|
|
|
@@ -56,16 +54,16 @@ module Datadog
|
|
|
56
54
|
setup_tracer
|
|
57
55
|
end
|
|
58
56
|
|
|
59
|
-
def register_tracer
|
|
57
|
+
def self.register_tracer
|
|
60
58
|
::Sinatra::Base.register(Contrib::Sinatra::Tracer)
|
|
61
59
|
::Sinatra::Base.prepend(Sinatra::Tracer::Base)
|
|
62
60
|
end
|
|
63
61
|
|
|
64
|
-
def setup_tracer
|
|
62
|
+
def self.setup_tracer
|
|
65
63
|
::Sinatra::Base.singleton_class.prepend(TracerSetupPatch)
|
|
66
64
|
end
|
|
67
65
|
|
|
68
|
-
def patch_default_middlewares
|
|
66
|
+
def self.patch_default_middlewares
|
|
69
67
|
::Sinatra::Base.singleton_class.prepend(DefaultMiddlewarePatch)
|
|
70
68
|
end
|
|
71
69
|
end
|
|
@@ -11,13 +11,11 @@ module Datadog
|
|
|
11
11
|
module Patcher
|
|
12
12
|
include Contrib::Patcher
|
|
13
13
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
def target_version
|
|
14
|
+
def self.target_version
|
|
17
15
|
Integration.version
|
|
18
16
|
end
|
|
19
17
|
|
|
20
|
-
def patch
|
|
18
|
+
def self.patch
|
|
21
19
|
::Sneakers.middleware.use(Sneakers::Tracer, nil)
|
|
22
20
|
end
|
|
23
21
|
end
|
|
@@ -11,13 +11,11 @@ module Datadog
|
|
|
11
11
|
module Patcher
|
|
12
12
|
include Contrib::Patcher
|
|
13
13
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
def target_version
|
|
14
|
+
def self.target_version
|
|
17
15
|
Integration.version
|
|
18
16
|
end
|
|
19
17
|
|
|
20
|
-
def patch
|
|
18
|
+
def self.patch
|
|
21
19
|
::Stripe::Instrumentation.subscribe(:request_begin, :datadog_tracing) { |event| Request.start_span(event) }
|
|
22
20
|
::Stripe::Instrumentation.subscribe(:request_end, :datadog_tracing) { |event| Request.finish_span(event) }
|
|
23
21
|
end
|
|
@@ -10,16 +10,14 @@ module Datadog
|
|
|
10
10
|
module Stripe
|
|
11
11
|
# Defines instrumentation for Stripe requests
|
|
12
12
|
module Request
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
def start_span(event)
|
|
13
|
+
def self.start_span(event)
|
|
16
14
|
# Start a trace
|
|
17
15
|
Tracing.trace(Ext::SPAN_REQUEST).tap do |span|
|
|
18
16
|
event.user_data[:datadog_span] = span
|
|
19
17
|
end
|
|
20
18
|
end
|
|
21
19
|
|
|
22
|
-
def finish_span(event)
|
|
20
|
+
def self.finish_span(event)
|
|
23
21
|
span = event.user_data[:datadog_span]
|
|
24
22
|
# If no active span, return.
|
|
25
23
|
return nil if span.nil?
|
|
@@ -32,7 +30,7 @@ module Datadog
|
|
|
32
30
|
end
|
|
33
31
|
end
|
|
34
32
|
|
|
35
|
-
def tag_span(span, event)
|
|
33
|
+
def self.tag_span(span, event)
|
|
36
34
|
# dependent upon stripe/stripe-ruby#1168
|
|
37
35
|
span.resource = "stripe.#{event.object_name}" if event.respond_to?(:object_name) && event.object_name
|
|
38
36
|
|
|
@@ -58,7 +56,7 @@ module Datadog
|
|
|
58
56
|
Datadog.logger.debug { "#{e.class}: #{e.message}" }
|
|
59
57
|
end
|
|
60
58
|
|
|
61
|
-
def configuration
|
|
59
|
+
def self.configuration
|
|
62
60
|
Datadog.configuration.tracing[:stripe]
|
|
63
61
|
end
|
|
64
62
|
end
|
|
@@ -12,11 +12,9 @@ module Datadog
|
|
|
12
12
|
module SuckerPunch
|
|
13
13
|
# Defines instrumentation patches for the `sucker_punch` gem
|
|
14
14
|
module Instrumentation
|
|
15
|
-
module_function
|
|
16
|
-
|
|
17
15
|
# rubocop:disable Metrics/MethodLength
|
|
18
16
|
# rubocop:disable Metrics/AbcSize
|
|
19
|
-
def patch!
|
|
17
|
+
def self.patch!
|
|
20
18
|
# rubocop:disable Metrics/BlockLength
|
|
21
19
|
::SuckerPunch::Job::ClassMethods.class_eval do
|
|
22
20
|
alias_method :__run_perform_without_datadog, :__run_perform
|
|
@@ -11,13 +11,11 @@ module Datadog
|
|
|
11
11
|
module Patcher
|
|
12
12
|
include Contrib::Patcher
|
|
13
13
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
def target_version
|
|
14
|
+
def self.target_version
|
|
17
15
|
Integration.version
|
|
18
16
|
end
|
|
19
17
|
|
|
20
|
-
def patch
|
|
18
|
+
def self.patch
|
|
21
19
|
require_relative "exception_handler"
|
|
22
20
|
require_relative "instrumentation"
|
|
23
21
|
|
|
@@ -25,7 +23,7 @@ module Datadog
|
|
|
25
23
|
Instrumentation.patch!
|
|
26
24
|
end
|
|
27
25
|
|
|
28
|
-
def get_option(option)
|
|
26
|
+
def self.get_option(option)
|
|
29
27
|
Datadog.configuration.tracing[:sucker_punch].get_option(option)
|
|
30
28
|
end
|
|
31
29
|
end
|
|
@@ -5,8 +5,6 @@ module Datadog
|
|
|
5
5
|
module Contrib
|
|
6
6
|
# Miscellaneous support methods to aid in the creation of integrations.
|
|
7
7
|
module Support
|
|
8
|
-
module_function
|
|
9
|
-
|
|
10
8
|
# Checks if a constant is loaded in a module, handling autoloaded constants correctly.
|
|
11
9
|
#
|
|
12
10
|
# This method is particularly useful when you need to check if a constant is fully loaded,
|
|
@@ -16,7 +14,7 @@ module Datadog
|
|
|
16
14
|
# @param base_module [Module] the module to check for the constant
|
|
17
15
|
# @param constant [Symbol] the name of the constant to check
|
|
18
16
|
# @return [Boolean] true if the constant has been loaded, false otherwise
|
|
19
|
-
def fully_loaded?(base_module, constant)
|
|
17
|
+
def self.fully_loaded?(base_module, constant)
|
|
20
18
|
# Autoload constants return `constant` for `defined?`, but that doesn't mean they are loaded...
|
|
21
19
|
base_module.const_defined?(constant) &&
|
|
22
20
|
# ... to check that we need to call `autoload?`. If it returns `nil`, it's loaded.
|
|
@@ -21,8 +21,9 @@ module Datadog
|
|
|
21
21
|
module InstanceMethods
|
|
22
22
|
def query(sql)
|
|
23
23
|
service = Datadog.configuration_for(self, :service_name) || datadog_configuration[:service_name]
|
|
24
|
+
on_error = Datadog.configuration_for(self, :on_error) || datadog_configuration[:on_error]
|
|
24
25
|
|
|
25
|
-
Tracing.trace(Ext::SPAN_QUERY, service: service) do |span, trace_op|
|
|
26
|
+
Tracing.trace(Ext::SPAN_QUERY, service: service, on_error: on_error) do |span, trace_op|
|
|
26
27
|
span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
|
|
27
28
|
span.resource = sql
|
|
28
29
|
span.type = Tracing::Metadata::Ext::SQL::TYPE
|
|
@@ -11,17 +11,15 @@ module Datadog
|
|
|
11
11
|
module Patcher
|
|
12
12
|
include Contrib::Patcher
|
|
13
13
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
def target_version
|
|
14
|
+
def self.target_version
|
|
17
15
|
Integration.version
|
|
18
16
|
end
|
|
19
17
|
|
|
20
|
-
def patch
|
|
18
|
+
def self.patch
|
|
21
19
|
patch_trilogy_client
|
|
22
20
|
end
|
|
23
21
|
|
|
24
|
-
def patch_trilogy_client
|
|
22
|
+
def self.patch_trilogy_client
|
|
25
23
|
::Trilogy.include(Instrumentation)
|
|
26
24
|
end
|
|
27
25
|
end
|
|
@@ -18,22 +18,20 @@ module Datadog
|
|
|
18
18
|
placeholder: PLACEHOLDER,
|
|
19
19
|
}.freeze
|
|
20
20
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
def format(hash_obj, options = {})
|
|
21
|
+
def self.format(hash_obj, options = {})
|
|
24
22
|
options ||= {}
|
|
25
23
|
format!(hash_obj, options)
|
|
26
24
|
rescue
|
|
27
25
|
options[:placeholder] || PLACEHOLDER
|
|
28
26
|
end
|
|
29
27
|
|
|
30
|
-
def format!(hash_obj, options = {})
|
|
28
|
+
def self.format!(hash_obj, options = {})
|
|
31
29
|
options ||= {}
|
|
32
30
|
options = merge_options(DEFAULT_OPTIONS, options)
|
|
33
31
|
format_hash(hash_obj, options)
|
|
34
32
|
end
|
|
35
33
|
|
|
36
|
-
def format_hash(hash_obj, options = {})
|
|
34
|
+
def self.format_hash(hash_obj, options = {})
|
|
37
35
|
case hash_obj
|
|
38
36
|
when ::Hash
|
|
39
37
|
return {} if options[:exclude] == :all
|
|
@@ -51,7 +49,7 @@ module Datadog
|
|
|
51
49
|
end
|
|
52
50
|
end
|
|
53
51
|
|
|
54
|
-
def format_value(value, options = {})
|
|
52
|
+
def self.format_value(value, options = {})
|
|
55
53
|
return value if options[:show] == :all
|
|
56
54
|
|
|
57
55
|
case value
|
|
@@ -65,7 +63,7 @@ module Datadog
|
|
|
65
63
|
end
|
|
66
64
|
end
|
|
67
65
|
|
|
68
|
-
def format_array(value, options)
|
|
66
|
+
def self.format_array(value, options)
|
|
69
67
|
if value.any? { |v| v.class <= ::Hash || v.class <= Array }
|
|
70
68
|
first_entry = format_value(value.first, options)
|
|
71
69
|
(value.size > 1) ? [first_entry, options[:placeholder]] : [first_entry]
|
|
@@ -75,7 +73,7 @@ module Datadog
|
|
|
75
73
|
end
|
|
76
74
|
end
|
|
77
75
|
|
|
78
|
-
def merge_options(original, additional)
|
|
76
|
+
def self.merge_options(original, additional)
|
|
79
77
|
{}.tap do |options|
|
|
80
78
|
# Show
|
|
81
79
|
# If either is :all, value becomes :all
|
|
@@ -97,12 +95,12 @@ module Datadog
|
|
|
97
95
|
end
|
|
98
96
|
end
|
|
99
97
|
|
|
100
|
-
def indifferent_equals(value)
|
|
98
|
+
def self.indifferent_equals(value)
|
|
101
99
|
value = convert_value(value)
|
|
102
100
|
->(compared_value) { value == convert_value(compared_value) }
|
|
103
101
|
end
|
|
104
102
|
|
|
105
|
-
def convert_value(value)
|
|
103
|
+
def self.convert_value(value)
|
|
106
104
|
value.is_a?(Symbol) ? value.to_s : value
|
|
107
105
|
end
|
|
108
106
|
end
|
|
@@ -18,9 +18,7 @@ module Datadog
|
|
|
18
18
|
# and fragment components
|
|
19
19
|
RFC3986_URL_BASE = /\A(?<URI>(?<scheme>[A-Za-z][+\-.0-9A-Za-z]*+):(?<hier-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*+)@)?(?<host>(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h++\.[!$&-.0-;=A-Z_a-z~]++))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])*+))(?::(?<port>\d*+))?)))(?:\/|\z)/.freeze # rubocop:disable Layout/LineLength
|
|
20
20
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
def client_resource(method, path, enabled:)
|
|
21
|
+
def self.client_resource(method, path, enabled:)
|
|
24
22
|
return method unless enabled && path
|
|
25
23
|
|
|
26
24
|
resource = method.dup
|
|
@@ -29,7 +27,7 @@ module Datadog
|
|
|
29
27
|
resource << quantized_path.force_encoding(resource.encoding)
|
|
30
28
|
end
|
|
31
29
|
|
|
32
|
-
def decode_path(path)
|
|
30
|
+
def self.decode_path(path)
|
|
33
31
|
decoded = String.new(encoding: Encoding::BINARY)
|
|
34
32
|
index = 0
|
|
35
33
|
|
|
@@ -58,7 +56,7 @@ module Datadog
|
|
|
58
56
|
decoded.force_encoding(path.encoding)
|
|
59
57
|
end
|
|
60
58
|
|
|
61
|
-
def quantize_path(path)
|
|
59
|
+
def self.quantize_path(path)
|
|
62
60
|
slash = (+"/").force_encoding(path.encoding)
|
|
63
61
|
normalized = if path.getbyte(0) == 47
|
|
64
62
|
path
|
|
@@ -110,7 +108,7 @@ module Datadog
|
|
|
110
108
|
output
|
|
111
109
|
end
|
|
112
110
|
|
|
113
|
-
def url(url, options = {})
|
|
111
|
+
def self.url(url, options = {})
|
|
114
112
|
url!(url, options)
|
|
115
113
|
rescue
|
|
116
114
|
placeholder = options[:placeholder] || PLACEHOLDER
|
|
@@ -118,7 +116,7 @@ module Datadog
|
|
|
118
116
|
(options[:base] == :exclude) ? placeholder : "#{base_url(url)}/#{placeholder}"
|
|
119
117
|
end
|
|
120
118
|
|
|
121
|
-
def base_url(url, options = {})
|
|
119
|
+
def self.base_url(url, options = {})
|
|
122
120
|
if (m = RFC3986_URL_BASE.match(url))
|
|
123
121
|
m[1]
|
|
124
122
|
else
|
|
@@ -126,7 +124,7 @@ module Datadog
|
|
|
126
124
|
end
|
|
127
125
|
end
|
|
128
126
|
|
|
129
|
-
def url!(url, options = {})
|
|
127
|
+
def self.url!(url, options = {})
|
|
130
128
|
options ||= {}
|
|
131
129
|
|
|
132
130
|
URI.parse(url).tap do |uri|
|
|
@@ -147,7 +145,7 @@ module Datadog
|
|
|
147
145
|
end.to_s
|
|
148
146
|
end
|
|
149
147
|
|
|
150
|
-
def query(query, options = {})
|
|
148
|
+
def self.query(query, options = {})
|
|
151
149
|
query!(query, options)
|
|
152
150
|
rescue
|
|
153
151
|
return "" if options && options[:obfuscate]
|
|
@@ -155,7 +153,7 @@ module Datadog
|
|
|
155
153
|
options[:placeholder] || PLACEHOLDER
|
|
156
154
|
end
|
|
157
155
|
|
|
158
|
-
def query!(query, options = {})
|
|
156
|
+
def self.query!(query, options = {})
|
|
159
157
|
options ||= {}
|
|
160
158
|
options[:obfuscate] = {} if options[:obfuscate] == :internal
|
|
161
159
|
options[:show] = options[:show] || (options[:obfuscate] ? :all : [])
|
|
@@ -182,7 +180,7 @@ module Datadog
|
|
|
182
180
|
# Iterate over each key value pair, yielding to the block given.
|
|
183
181
|
# Accepts :uniq option, which keeps uniq copies of keys without values.
|
|
184
182
|
# e.g. Reduces "foo&bar=bar&bar=bar&foo" to "foo&bar=bar&bar=bar"
|
|
185
|
-
def collect_query(query, options = {})
|
|
183
|
+
def self.collect_query(query, options = {})
|
|
186
184
|
return query unless block_given?
|
|
187
185
|
|
|
188
186
|
uniq = options[:uniq].nil? ? false : options[:uniq]
|
|
@@ -208,7 +206,7 @@ module Datadog
|
|
|
208
206
|
|
|
209
207
|
private_class_method :collect_query
|
|
210
208
|
|
|
211
|
-
def decode_hex_byte(byte)
|
|
209
|
+
def self.decode_hex_byte(byte)
|
|
212
210
|
if byte.between?(48, 57)
|
|
213
211
|
byte - 48
|
|
214
212
|
elsif byte.between?(65, 70)
|
|
@@ -222,7 +220,7 @@ module Datadog
|
|
|
222
220
|
|
|
223
221
|
# Scans over the query string and obfuscates sensitive data by
|
|
224
222
|
# replacing matches with an opaque value
|
|
225
|
-
def obfuscate_query(query, options = {})
|
|
223
|
+
def self.obfuscate_query(query, options = {})
|
|
226
224
|
options[:regex] = nil if options[:regex] == :internal
|
|
227
225
|
re = options[:regex] || OBFUSCATOR_REGEX
|
|
228
226
|
with = options[:with] || OBFUSCATOR_WITH
|
|
@@ -12,13 +12,11 @@ module Datadog
|
|
|
12
12
|
module Patcher
|
|
13
13
|
include Contrib::Patcher
|
|
14
14
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
def target_version
|
|
15
|
+
def self.target_version
|
|
18
16
|
Integration.version
|
|
19
17
|
end
|
|
20
18
|
|
|
21
|
-
def patch
|
|
19
|
+
def self.patch
|
|
22
20
|
require_relative "producer"
|
|
23
21
|
require_relative "middleware"
|
|
24
22
|
|
|
@@ -38,7 +36,7 @@ module Datadog
|
|
|
38
36
|
end
|
|
39
37
|
end
|
|
40
38
|
|
|
41
|
-
def add_middleware(producer)
|
|
39
|
+
def self.add_middleware(producer)
|
|
42
40
|
included_middlewares = producer.middleware.instance_variable_get(:@steps)
|
|
43
41
|
producer.middleware.append(Middleware) unless included_middlewares.include?(Middleware)
|
|
44
42
|
end
|
|
@@ -77,14 +77,12 @@ module Datadog
|
|
|
77
77
|
end
|
|
78
78
|
end
|
|
79
79
|
|
|
80
|
-
module_function
|
|
81
|
-
|
|
82
80
|
# Produces a CorrelationIdentifier from the TraceDigest provided
|
|
83
81
|
#
|
|
84
82
|
# DEV: can we memoize this object, give it can be common to
|
|
85
83
|
# use a correlation multiple times, specially in the context of logging?
|
|
86
84
|
# @!visibility private
|
|
87
|
-
def identifier_from_digest(digest)
|
|
85
|
+
def self.identifier_from_digest(digest)
|
|
88
86
|
return Identifier.new unless digest
|
|
89
87
|
|
|
90
88
|
Identifier.new(
|
|
@@ -93,7 +91,7 @@ module Datadog
|
|
|
93
91
|
)
|
|
94
92
|
end
|
|
95
93
|
|
|
96
|
-
def format_trace_id(trace_id)
|
|
94
|
+
def self.format_trace_id(trace_id)
|
|
97
95
|
if Datadog.configuration.tracing.trace_id_128_bit_logging_enabled
|
|
98
96
|
format_trace_id_128(trace_id)
|
|
99
97
|
else
|
|
@@ -101,7 +99,7 @@ module Datadog
|
|
|
101
99
|
end
|
|
102
100
|
end
|
|
103
101
|
|
|
104
|
-
def format_trace_id_128(trace_id)
|
|
102
|
+
def self.format_trace_id_128(trace_id)
|
|
105
103
|
if !Tracing::Utils::TraceId.to_high_order(trace_id).zero?
|
|
106
104
|
Kernel.format("%032x", trace_id)
|
|
107
105
|
else
|
|
@@ -32,8 +32,8 @@ module Datadog
|
|
|
32
32
|
@propagation_styles = propagation_styles
|
|
33
33
|
@propagation_behavior_extract = propagation_behavior_extract
|
|
34
34
|
@propagation_extract_first = propagation_extract_first
|
|
35
|
-
@propagation_style_inject = propagation_style_inject.map { |style| propagation_styles[style] }
|
|
36
|
-
@propagation_style_extract = propagation_style_extract.map { |style| propagation_styles[style] }
|
|
35
|
+
@propagation_style_inject = propagation_style_inject.map { |style| propagation_styles[style] }.compact
|
|
36
|
+
@propagation_style_extract = propagation_style_extract.map { |style| propagation_styles[style] }.compact
|
|
37
37
|
|
|
38
38
|
# The baggage propagator is unique in that baggage should always be extracted, if present.
|
|
39
39
|
# Therefore we remove it from the `propagation_style_extract` list.
|
|
@@ -5,15 +5,13 @@ module Datadog
|
|
|
5
5
|
module Distributed
|
|
6
6
|
# Helper method to decide when to skip distributed tracing
|
|
7
7
|
module PropagationPolicy
|
|
8
|
-
module_function
|
|
9
|
-
|
|
10
8
|
# Skips distributed tracing if disabled for this instrumentation
|
|
11
9
|
# or if APM is disabled unless there is an AppSec event (from upstream distributed trace or local)
|
|
12
10
|
#
|
|
13
11
|
# Both pin_config and global_config are configuration for integrations.
|
|
14
12
|
# pin_config is a Datadog::Core::Pin object, which gives the configuration of a single instance of an integration.
|
|
15
13
|
# global_config is the config for all instances of an integration.
|
|
16
|
-
def enabled?(pin_config: nil, global_config: nil, trace: nil)
|
|
14
|
+
def self.enabled?(pin_config: nil, global_config: nil, trace: nil)
|
|
17
15
|
return false unless Tracing.enabled?
|
|
18
16
|
|
|
19
17
|
unless ::Datadog.configuration.apm.tracing.enabled
|
|
@@ -28,11 +28,11 @@ module Datadog
|
|
|
28
28
|
def from_tracestate_member(value)
|
|
29
29
|
return new unless value
|
|
30
30
|
|
|
31
|
-
# @type var sampling_priority:
|
|
32
|
-
# @type var origin:
|
|
33
|
-
# @type var ts_parent_id:
|
|
34
|
-
# @type var tags:
|
|
35
|
-
# @type var unknown_fields:
|
|
31
|
+
# @type var sampling_priority: Integer?
|
|
32
|
+
# @type var origin: String?
|
|
33
|
+
# @type var ts_parent_id: String?
|
|
34
|
+
# @type var tags: Hash[String, String]?
|
|
35
|
+
# @type var unknown_fields: String?
|
|
36
36
|
sampling_priority = nil
|
|
37
37
|
origin = nil
|
|
38
38
|
ts_parent_id = nil
|
|
@@ -23,8 +23,8 @@ module Datadog
|
|
|
23
23
|
def from_tracestate_member(value)
|
|
24
24
|
return new unless value
|
|
25
25
|
|
|
26
|
-
# @type var random_value:
|
|
27
|
-
# @type var threshold:
|
|
26
|
+
# @type var random_value: String?
|
|
27
|
+
# @type var threshold: String?
|
|
28
28
|
random_value = nil
|
|
29
29
|
threshold = nil
|
|
30
30
|
unknown = []
|
|
@@ -128,15 +128,13 @@ module Datadog
|
|
|
128
128
|
|
|
129
129
|
# General header functionality
|
|
130
130
|
module Headers
|
|
131
|
-
module_function
|
|
132
|
-
|
|
133
131
|
INVALID_TAG_CHARACTERS = %r{[^a-z0-9_\-:./]}.freeze
|
|
134
132
|
|
|
135
133
|
# Normalizes an HTTP header string into a valid tag string.
|
|
136
134
|
#
|
|
137
135
|
# By default, tags cannot create nested span tag levels:
|
|
138
136
|
# `allow_nested` allows you to override this behavior.
|
|
139
|
-
def to_tag(name, allow_nested: false)
|
|
137
|
+
def self.to_tag(name, allow_nested: false)
|
|
140
138
|
# Tag normalization based on: https://docs.datadoghq.com/getting_started/tagging/#defining-tags.
|
|
141
139
|
#
|
|
142
140
|
# Only the following characters are accepted.
|
|
@@ -164,9 +162,7 @@ module Datadog
|
|
|
164
162
|
module RequestHeaders
|
|
165
163
|
PREFIX = "http.request.headers"
|
|
166
164
|
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
def to_tag(name)
|
|
165
|
+
def self.to_tag(name)
|
|
170
166
|
"#{PREFIX}.#{Headers.to_tag(name)}"
|
|
171
167
|
end
|
|
172
168
|
end
|
|
@@ -175,9 +171,7 @@ module Datadog
|
|
|
175
171
|
module ResponseHeaders
|
|
176
172
|
PREFIX = "http.response.headers"
|
|
177
173
|
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
def to_tag(name)
|
|
174
|
+
def self.to_tag(name)
|
|
181
175
|
"#{PREFIX}.#{Headers.to_tag(name)}"
|
|
182
176
|
end
|
|
183
177
|
end
|
|
@@ -60,7 +60,7 @@ module Datadog
|
|
|
60
60
|
service = Datadog.configuration.remote.service || Datadog.configuration.service
|
|
61
61
|
env = Datadog.configuration.env
|
|
62
62
|
|
|
63
|
-
# @type var parsed: Array[[
|
|
63
|
+
# @type var parsed: Array[[Core::Remote::Configuration::Content, Hash[String, untyped]]]
|
|
64
64
|
parsed = []
|
|
65
65
|
# @type var unparseable_contents: Array[Datadog::Core::Remote::Configuration::Content]
|
|
66
66
|
unparseable_contents = []
|
|
@@ -30,6 +30,7 @@ module Datadog
|
|
|
30
30
|
DEFAULT_MAX_LENGTH = 100_000
|
|
31
31
|
AUTO_SAMPLING_PRIORITIES = [Sampling::Ext::Priority::AUTO_KEEP, Sampling::Ext::Priority::AUTO_REJECT].freeze
|
|
32
32
|
RECONSIDERABLE_DECISIONS = [Sampling::Ext::Decision::DEFAULT, Sampling::Ext::Decision::AGENT_RATE].freeze
|
|
33
|
+
DEFER_ASYNC_INTERRUPTS = {Exception => :never}.freeze
|
|
33
34
|
|
|
34
35
|
attr_accessor \
|
|
35
36
|
:agent_sample_rate,
|
|
@@ -565,10 +566,17 @@ module Datadog
|
|
|
565
566
|
end
|
|
566
567
|
|
|
567
568
|
def start_span(span_op)
|
|
568
|
-
|
|
569
|
+
# A span interrupted mid-start is started again when it stops.
|
|
570
|
+
# Re-activating it would make it its own parent.
|
|
571
|
+
return if span_op.equal?(@active_span)
|
|
569
572
|
|
|
570
|
-
#
|
|
571
|
-
|
|
573
|
+
# Defer asynchronous exceptions (`Thread#raise`, e.g. from Rack::Timeout) until the
|
|
574
|
+
# activation bookkeeping is complete, so the check above never sees a half-activated span.
|
|
575
|
+
Thread.handle_interrupt(DEFER_ASYNC_INTERRUPTS) do
|
|
576
|
+
activate_span!(span_op)
|
|
577
|
+
|
|
578
|
+
@active_span_count += 1
|
|
579
|
+
end
|
|
572
580
|
|
|
573
581
|
# Publish :span_before_start event
|
|
574
582
|
events.span_before_start.publish(span_op, self)
|
|
@@ -76,6 +76,7 @@ module Datadog
|
|
|
76
76
|
@span_sampler = span_sampler
|
|
77
77
|
@tags = tags
|
|
78
78
|
@writer = writer
|
|
79
|
+
@profiling_enabled = nil
|
|
79
80
|
|
|
80
81
|
@otel_thread_context = otel_thread_context
|
|
81
82
|
|
|
@@ -351,6 +352,11 @@ module Datadog
|
|
|
351
352
|
@otel_thread_context&.after_fork
|
|
352
353
|
end
|
|
353
354
|
|
|
355
|
+
# For when the profiler is replaced, as it can be enabled or disabled after the tracer is built.
|
|
356
|
+
def reset_profiling_enabled
|
|
357
|
+
@profiling_enabled = nil
|
|
358
|
+
end
|
|
359
|
+
|
|
354
360
|
# Shorthand that calls the `shutdown!` method of a registered worker.
|
|
355
361
|
# It's useful to ensure that the Trace Buffer is properly flushed before
|
|
356
362
|
# shutting down the application.
|
|
@@ -651,7 +657,9 @@ module Datadog
|
|
|
651
657
|
end
|
|
652
658
|
|
|
653
659
|
def profiling_enabled
|
|
654
|
-
@profiling_enabled
|
|
660
|
+
return @profiling_enabled unless @profiling_enabled.nil?
|
|
661
|
+
|
|
662
|
+
@profiling_enabled =
|
|
655
663
|
!!(defined?(Datadog::Profiling) && Datadog::Profiling.respond_to?(:enabled?) && Datadog::Profiling.enabled?)
|
|
656
664
|
end
|
|
657
665
|
|
|
@@ -23,11 +23,9 @@ module Datadog
|
|
|
23
23
|
Core::Encoding::MsgpackEncoder,
|
|
24
24
|
)
|
|
25
25
|
|
|
26
|
-
module_function
|
|
27
|
-
|
|
28
26
|
# Builds a new Transport::HTTP::Client with default settings
|
|
29
27
|
# Pass a block to override any settings.
|
|
30
|
-
def default(
|
|
28
|
+
def self.default(
|
|
31
29
|
agent_settings:,
|
|
32
30
|
logger: Datadog.logger,
|
|
33
31
|
headers: nil
|
|
@@ -9,16 +9,14 @@ module Datadog
|
|
|
9
9
|
module Transport
|
|
10
10
|
# Namespace for IO transport components
|
|
11
11
|
module IO
|
|
12
|
-
module_function
|
|
13
|
-
|
|
14
12
|
# Builds a new Transport::IO::Client
|
|
15
|
-
def new(out, encoder)
|
|
13
|
+
def self.new(out, encoder)
|
|
16
14
|
Client.new(out, encoder)
|
|
17
15
|
end
|
|
18
16
|
|
|
19
17
|
# Builds a new Transport::IO::Client with default settings
|
|
20
18
|
# Pass options to override any settings.
|
|
21
|
-
def default(options = {})
|
|
19
|
+
def self.default(options = {})
|
|
22
20
|
new(
|
|
23
21
|
options.fetch(:out, $stdout),
|
|
24
22
|
options.fetch(:encoder, Core::Encoding::JSONEncoder),
|