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
|
@@ -39,21 +39,19 @@ module Datadog
|
|
|
39
39
|
|
|
40
40
|
CONTENT_TYPE = "application/json"
|
|
41
41
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
def content_type
|
|
42
|
+
def self.content_type
|
|
45
43
|
CONTENT_TYPE
|
|
46
44
|
end
|
|
47
45
|
|
|
48
|
-
def encode(obj)
|
|
46
|
+
def self.encode(obj)
|
|
49
47
|
JSON.dump(obj)
|
|
50
48
|
end
|
|
51
49
|
|
|
52
|
-
def decode(obj)
|
|
50
|
+
def self.decode(obj)
|
|
53
51
|
JSON.parse(obj)
|
|
54
52
|
end
|
|
55
53
|
|
|
56
|
-
def join(encoded_data)
|
|
54
|
+
def self.join(encoded_data)
|
|
57
55
|
"[#{encoded_data.join(",")}]"
|
|
58
56
|
end
|
|
59
57
|
end
|
|
@@ -62,23 +60,21 @@ module Datadog
|
|
|
62
60
|
module MsgpackEncoder
|
|
63
61
|
extend Encoder
|
|
64
62
|
|
|
65
|
-
module_function
|
|
66
|
-
|
|
67
63
|
CONTENT_TYPE = "application/msgpack"
|
|
68
64
|
|
|
69
|
-
def content_type
|
|
65
|
+
def self.content_type
|
|
70
66
|
CONTENT_TYPE
|
|
71
67
|
end
|
|
72
68
|
|
|
73
|
-
def encode(obj)
|
|
69
|
+
def self.encode(obj)
|
|
74
70
|
MessagePack.pack(obj)
|
|
75
71
|
end
|
|
76
72
|
|
|
77
|
-
def decode(obj)
|
|
73
|
+
def self.decode(obj)
|
|
78
74
|
MessagePack.unpack(obj)
|
|
79
75
|
end
|
|
80
76
|
|
|
81
|
-
def join(encoded_data)
|
|
77
|
+
def self.join(encoded_data)
|
|
82
78
|
packer = MessagePack::Packer.new
|
|
83
79
|
packer.write_array_header(encoded_data.size)
|
|
84
80
|
|
|
@@ -18,11 +18,9 @@ module Datadog
|
|
|
18
18
|
:inode,
|
|
19
19
|
)
|
|
20
20
|
|
|
21
|
-
module_function
|
|
22
|
-
|
|
23
21
|
# Parses the /proc/self/cgroup file,
|
|
24
22
|
# @return [Array<Entry>] one entry for each valid cgroup line
|
|
25
|
-
def entries
|
|
23
|
+
def self.entries
|
|
26
24
|
filepath = "/proc/self/cgroup"
|
|
27
25
|
return [] unless File.exist?(filepath)
|
|
28
26
|
|
|
@@ -45,7 +43,7 @@ module Datadog
|
|
|
45
43
|
#
|
|
46
44
|
# @see https://man7.org/linux/man-pages/man7/cgroups.7.html#:~:text=%2Fproc%2Fpid%2Fcgroup
|
|
47
45
|
# @return [Entry]
|
|
48
|
-
def parse(entry_line)
|
|
46
|
+
def self.parse(entry_line)
|
|
49
47
|
hierarchy, controllers, path = entry_line.split(":", 3)
|
|
50
48
|
|
|
51
49
|
Entry.new(
|
|
@@ -60,7 +58,7 @@ module Datadog
|
|
|
60
58
|
# Example:
|
|
61
59
|
# For the entry `0:cpu:/docker/abc123`,
|
|
62
60
|
# we read `stat -c '%i' /sys/fs/cgroup/cpu/docker/abc123`
|
|
63
|
-
def inode_for(controllers, path)
|
|
61
|
+
def self.inode_for(controllers, path)
|
|
64
62
|
return if controllers.nil? || path.nil?
|
|
65
63
|
|
|
66
64
|
# In cgroup v1, when multiple controllers are co-mounted, the controllers
|
|
@@ -30,12 +30,10 @@ module Datadog
|
|
|
30
30
|
:inode,
|
|
31
31
|
)
|
|
32
32
|
|
|
33
|
-
module_function
|
|
34
|
-
|
|
35
33
|
# Returns HTTP headers representing container information.
|
|
36
34
|
# These can used in any Datadog request that requires origin detection.
|
|
37
35
|
# This is the recommended method to call to get container information.
|
|
38
|
-
def to_headers
|
|
36
|
+
def self.to_headers
|
|
39
37
|
headers = {}
|
|
40
38
|
headers["Datadog-Container-ID"] = container_id if container_id
|
|
41
39
|
headers["Datadog-Entity-ID"] = entity_id if entity_id
|
|
@@ -44,7 +42,7 @@ module Datadog
|
|
|
44
42
|
end
|
|
45
43
|
|
|
46
44
|
# Container ID, prefixed with "ci-" or Inode, prefixed with "in-".
|
|
47
|
-
def entity_id
|
|
45
|
+
def self.entity_id
|
|
48
46
|
if container_id
|
|
49
47
|
"ci-#{container_id}"
|
|
50
48
|
elsif inode
|
|
@@ -54,7 +52,7 @@ module Datadog
|
|
|
54
52
|
|
|
55
53
|
# External data supplied by the Datadog Cluster Agent Admission Controller.
|
|
56
54
|
# @see {Ext::ENV_EXTERNAL_ENV} for more details.
|
|
57
|
-
def external_env
|
|
55
|
+
def self.external_env
|
|
58
56
|
Datadog.configuration.container.external_env
|
|
59
57
|
end
|
|
60
58
|
|
|
@@ -63,14 +61,14 @@ module Datadog
|
|
|
63
61
|
# Examples: Docker, Kubernetes, AWS Fargate, LXC, etc.
|
|
64
62
|
#
|
|
65
63
|
# @return [String, nil] The platform name (e.g., "docker", "kubepods", "fargate"), or nil if not containerized
|
|
66
|
-
def platform
|
|
64
|
+
def self.platform
|
|
67
65
|
entry.platform
|
|
68
66
|
end
|
|
69
67
|
|
|
70
68
|
# The unique identifier of the current container in the container environment.
|
|
71
69
|
#
|
|
72
70
|
# @return [String, nil] The container ID, or nil if not running in a containerized environment
|
|
73
|
-
def container_id
|
|
71
|
+
def self.container_id
|
|
74
72
|
entry.container_id
|
|
75
73
|
end
|
|
76
74
|
|
|
@@ -81,7 +79,7 @@ module Datadog
|
|
|
81
79
|
# enabling correlation across container restarts and multi-container applications.
|
|
82
80
|
#
|
|
83
81
|
# @return [String, nil] The task/pod UID, or nil if not available in the current environment
|
|
84
|
-
def task_uid
|
|
82
|
+
def self.task_uid
|
|
85
83
|
entry.task_uid
|
|
86
84
|
end
|
|
87
85
|
|
|
@@ -90,14 +88,14 @@ module Datadog
|
|
|
90
88
|
# Used as a fallback identifier when {#container_id} is unavailable.
|
|
91
89
|
#
|
|
92
90
|
# @return [Integer, nil] The namespace inode, or nil if unavailable
|
|
93
|
-
def inode
|
|
91
|
+
def self.inode
|
|
94
92
|
entry.inode
|
|
95
93
|
end
|
|
96
94
|
|
|
97
95
|
# Checks if the current process is running on the host cgroup namespace.
|
|
98
96
|
# This indicates that the process is not running inside a container.
|
|
99
97
|
# When unsure, we return `false` (not running on host).
|
|
100
|
-
def running_on_host?
|
|
98
|
+
def self.running_on_host?
|
|
101
99
|
return @running_on_host if defined?(@running_on_host)
|
|
102
100
|
|
|
103
101
|
@running_on_host = begin
|
|
@@ -117,7 +115,7 @@ module Datadog
|
|
|
117
115
|
# All cgroup entries have the same container identity.
|
|
118
116
|
# The first valid one is sufficient.
|
|
119
117
|
# v2 entries are preferred over v1.
|
|
120
|
-
def entry
|
|
118
|
+
def self.entry
|
|
121
119
|
return @entry if defined?(@entry)
|
|
122
120
|
|
|
123
121
|
# Scan all v2 entries first, only then falling back to v1 entries.
|
|
@@ -8,12 +8,7 @@ module Datadog
|
|
|
8
8
|
# @public_api Changing resource names, tag names, or environment variables creates breaking changes.
|
|
9
9
|
module Ext
|
|
10
10
|
# e.g for CRuby '3.0.1', for JRuby '9.2.19.0', for TruffleRuby '21.1.0'
|
|
11
|
-
ENGINE_VERSION =
|
|
12
|
-
RUBY_ENGINE_VERSION
|
|
13
|
-
else
|
|
14
|
-
# CRuby < 2.3 doesn't support RUBY_ENGINE_VERSION
|
|
15
|
-
RUBY_VERSION
|
|
16
|
-
end
|
|
11
|
+
ENGINE_VERSION = RUBY_ENGINE_VERSION
|
|
17
12
|
|
|
18
13
|
ENV_API_KEY = "DD_API_KEY"
|
|
19
14
|
ENV_ENVIRONMENT = "DD_ENV"
|
|
@@ -5,13 +5,11 @@ module Datadog
|
|
|
5
5
|
module Environment
|
|
6
6
|
# Retrieves garbage collection statistics
|
|
7
7
|
module GC
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
def stat
|
|
8
|
+
def self.stat
|
|
11
9
|
::GC.stat
|
|
12
10
|
end
|
|
13
11
|
|
|
14
|
-
def available?
|
|
12
|
+
def self.available?
|
|
15
13
|
!!(defined?(::GC) && ::GC.respond_to?(:stat))
|
|
16
14
|
end
|
|
17
15
|
end
|
|
@@ -17,12 +17,10 @@ module Datadog
|
|
|
17
17
|
ENV_ROOT_SESSION_ID = "_DD_ROOT_RB_SESSION_ID"
|
|
18
18
|
ENV_PARENT_SESSION_ID = "_DD_PARENT_RB_SESSION_ID"
|
|
19
19
|
|
|
20
|
-
module_function
|
|
21
|
-
|
|
22
20
|
@root_runtime_id = DATADOG_ENV[ENV_ROOT_SESSION_ID]&.freeze
|
|
23
21
|
@parent_runtime_id = DATADOG_ENV[ENV_PARENT_SESSION_ID]&.freeze
|
|
24
22
|
|
|
25
|
-
def id
|
|
23
|
+
def self.id
|
|
26
24
|
@id ||= ::SecureRandom.uuid.freeze
|
|
27
25
|
|
|
28
26
|
after_fork! do
|
|
@@ -32,47 +30,47 @@ module Datadog
|
|
|
32
30
|
@id = ::SecureRandom.uuid.freeze
|
|
33
31
|
end
|
|
34
32
|
|
|
35
|
-
@id
|
|
33
|
+
@id #: String
|
|
36
34
|
end
|
|
37
35
|
|
|
38
|
-
def root_runtime_id
|
|
36
|
+
def self.root_runtime_id
|
|
39
37
|
@root_runtime_id
|
|
40
38
|
end
|
|
41
39
|
|
|
42
|
-
def parent_runtime_id
|
|
40
|
+
def self.parent_runtime_id
|
|
43
41
|
@parent_runtime_id
|
|
44
42
|
end
|
|
45
43
|
|
|
46
|
-
def runtime_propagation_envs
|
|
44
|
+
def self.runtime_propagation_envs
|
|
47
45
|
{ENV_ROOT_SESSION_ID => root_runtime_id || id, ENV_PARENT_SESSION_ID => id}.freeze
|
|
48
46
|
end
|
|
49
47
|
|
|
50
|
-
def pid
|
|
48
|
+
def self.pid
|
|
51
49
|
::Process.pid
|
|
52
50
|
end
|
|
53
51
|
|
|
54
|
-
def lang
|
|
52
|
+
def self.lang
|
|
55
53
|
Core::Environment::Ext::LANG
|
|
56
54
|
end
|
|
57
55
|
|
|
58
|
-
def lang_engine
|
|
56
|
+
def self.lang_engine
|
|
59
57
|
Core::Environment::Ext::LANG_ENGINE
|
|
60
58
|
end
|
|
61
59
|
|
|
62
|
-
def lang_interpreter
|
|
60
|
+
def self.lang_interpreter
|
|
63
61
|
Core::Environment::Ext::LANG_INTERPRETER
|
|
64
62
|
end
|
|
65
63
|
|
|
66
|
-
def lang_platform
|
|
64
|
+
def self.lang_platform
|
|
67
65
|
Core::Environment::Ext::LANG_PLATFORM
|
|
68
66
|
end
|
|
69
67
|
|
|
70
|
-
def lang_version
|
|
68
|
+
def self.lang_version
|
|
71
69
|
Core::Environment::Ext::LANG_VERSION
|
|
72
70
|
end
|
|
73
71
|
|
|
74
72
|
# Returns datadog gem version, rubygems-style
|
|
75
|
-
def gem_datadog_version
|
|
73
|
+
def self.gem_datadog_version
|
|
76
74
|
Core::Environment::Ext::GEM_DATADOG_VERSION
|
|
77
75
|
end
|
|
78
76
|
|
|
@@ -91,7 +89,7 @@ module Datadog
|
|
|
91
89
|
#
|
|
92
90
|
# Use {.gem_datadog_version} (not this method) when a RubyGems-style string is
|
|
93
91
|
# required (e.g. gem-internal contexts, gemspec interop).
|
|
94
|
-
def gem_datadog_version_semver2
|
|
92
|
+
def self.gem_datadog_version_semver2
|
|
95
93
|
major, minor, patch, rest = gem_datadog_version.split(".", 4)
|
|
96
94
|
|
|
97
95
|
semver = "#{major}.#{minor}.#{patch}"
|
|
@@ -9,36 +9,34 @@ module Datadog
|
|
|
9
9
|
module Environment
|
|
10
10
|
# For gathering information about the platform
|
|
11
11
|
module Platform
|
|
12
|
-
module_function
|
|
13
|
-
|
|
14
12
|
# @return [String] ISA of host; `uname -m`
|
|
15
|
-
def architecture
|
|
16
|
-
|
|
13
|
+
def self.architecture
|
|
14
|
+
Etc.uname[:machine]
|
|
17
15
|
end
|
|
18
16
|
|
|
19
17
|
# @return [String] name of host; `uname -n`
|
|
20
|
-
def hostname
|
|
21
|
-
|
|
18
|
+
def self.hostname
|
|
19
|
+
Etc.uname[:nodename]
|
|
22
20
|
end
|
|
23
21
|
|
|
24
22
|
# System name, normally `Linux` or `Darwin` (but 'Mac OS X' on JRuby);
|
|
25
23
|
# @return [String] name of kernel; `uname -s`.
|
|
26
|
-
def kernel_name
|
|
27
|
-
|
|
24
|
+
def self.kernel_name
|
|
25
|
+
Etc.uname[:sysname]
|
|
28
26
|
end
|
|
29
27
|
|
|
30
28
|
# @return [String] kernel release; `uname -r`
|
|
31
|
-
def kernel_release
|
|
29
|
+
def self.kernel_release
|
|
32
30
|
if Identity.lang_engine == "jruby"
|
|
33
31
|
Etc.uname[:version] # Java's `os.version` maps to `uname -r`
|
|
34
|
-
|
|
32
|
+
else
|
|
35
33
|
Etc.uname[:release]
|
|
36
34
|
end
|
|
37
35
|
end
|
|
38
36
|
|
|
39
37
|
# @return [String] kernel version; `uname -v`
|
|
40
|
-
def kernel_version
|
|
41
|
-
Etc.uname[:version] if Identity.lang_engine != "jruby"
|
|
38
|
+
def self.kernel_version
|
|
39
|
+
Etc.uname[:version] if Identity.lang_engine != "jruby"
|
|
42
40
|
end
|
|
43
41
|
end
|
|
44
42
|
end
|
|
@@ -10,10 +10,8 @@ module Datadog
|
|
|
10
10
|
module Socket
|
|
11
11
|
extend Core::Utils::Forking
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
def hostname
|
|
16
|
-
# Check if runtime has changed, e.g. forked.
|
|
13
|
+
def self.hostname
|
|
14
|
+
# Refresh the hostname after a fork.
|
|
17
15
|
after_fork! { @hostname = ::Socket.gethostname.freeze }
|
|
18
16
|
|
|
19
17
|
@hostname ||= ::Socket.gethostname.freeze
|
|
@@ -22,7 +20,7 @@ module Datadog
|
|
|
22
20
|
# Returns the resolved hostname when `report_hostname` is enabled:
|
|
23
21
|
# the configured DD_HOSTNAME if set, otherwise the system hostname.
|
|
24
22
|
# Returns nil when `report_hostname` is disabled or no hostname is available.
|
|
25
|
-
def resolved_hostname(settings)
|
|
23
|
+
def self.resolved_hostname(settings)
|
|
26
24
|
return nil unless settings.tracing.report_hostname
|
|
27
25
|
|
|
28
26
|
configured = settings.hostname
|
|
@@ -5,13 +5,11 @@ module Datadog
|
|
|
5
5
|
module Environment
|
|
6
6
|
# Retrieves number of threads from runtime
|
|
7
7
|
module ThreadCount
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
def value
|
|
8
|
+
def self.value
|
|
11
9
|
Thread.list.count
|
|
12
10
|
end
|
|
13
11
|
|
|
14
|
-
def available?
|
|
12
|
+
def self.available?
|
|
15
13
|
Thread.respond_to?(:list)
|
|
16
14
|
end
|
|
17
15
|
end
|
|
@@ -7,8 +7,6 @@ module Datadog
|
|
|
7
7
|
# Defines helper methods for environment
|
|
8
8
|
# @public_api
|
|
9
9
|
module VariableHelpers
|
|
10
|
-
extend self
|
|
11
|
-
|
|
12
10
|
# Reads an environment variable as a Boolean.
|
|
13
11
|
#
|
|
14
12
|
# @param [String] var environment variable
|
|
@@ -18,7 +16,7 @@ module Datadog
|
|
|
18
16
|
# the first key in `var` is not used.
|
|
19
17
|
# @return [Boolean] if the environment value is the string `true` or `1`
|
|
20
18
|
# @return [default] if the environment value is not found
|
|
21
|
-
def env_to_bool(var, default = nil, deprecation_warning: true)
|
|
19
|
+
def self.env_to_bool(var, default = nil, deprecation_warning: true)
|
|
22
20
|
var = decode_array(var, deprecation_warning)
|
|
23
21
|
if var && DATADOG_ENV.key?(var)
|
|
24
22
|
value = DATADOG_ENV[var].to_s.strip
|
|
@@ -29,9 +27,7 @@ module Datadog
|
|
|
29
27
|
end
|
|
30
28
|
end
|
|
31
29
|
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
def decode_array(var, deprecation_warning)
|
|
30
|
+
private_class_method def self.decode_array(var, deprecation_warning)
|
|
35
31
|
if var.is_a?(Array)
|
|
36
32
|
var.find.with_index do |env_var, i|
|
|
37
33
|
found = DATADOG_ENV.key?(env_var)
|
|
@@ -13,8 +13,6 @@ module Datadog
|
|
|
13
13
|
# TruffleRuby does not have a global runtime cache invalidation cache.
|
|
14
14
|
# @see http://archive.today/2021.09.10-205702/https://medium.com/graalvm/precise-method-and-constant-invalidation-in-truffleruby-4dd56c6bac1a
|
|
15
15
|
module VMCache
|
|
16
|
-
module_function
|
|
17
|
-
|
|
18
16
|
# Global constant cache "generation" counter.
|
|
19
17
|
#
|
|
20
18
|
# Whenever a constant creation busts the global constant cache
|
|
@@ -23,7 +21,7 @@ module Datadog
|
|
|
23
21
|
#
|
|
24
22
|
# This was removed in Ruby 3.2.
|
|
25
23
|
# @see https://github.com/ruby/ruby/blob/master/doc/NEWS/NEWS-3.2.0.md#implementation-improvements
|
|
26
|
-
def global_constant_state
|
|
24
|
+
def self.global_constant_state
|
|
27
25
|
::RubyVM.stat[:global_constant_state]
|
|
28
26
|
end
|
|
29
27
|
|
|
@@ -37,25 +35,25 @@ module Datadog
|
|
|
37
35
|
# largely mitigating global method cache busting. `global_method_state`
|
|
38
36
|
# is thus not available since Ruby 3.0.
|
|
39
37
|
# @see https://bugs.ruby-lang.org/issues/16614
|
|
40
|
-
def global_method_state
|
|
38
|
+
def self.global_method_state
|
|
41
39
|
::RubyVM.stat[:global_method_state]
|
|
42
40
|
end
|
|
43
41
|
|
|
44
42
|
# Introduced in Ruby 3.2 to match an improved cache implementation.
|
|
45
43
|
#
|
|
46
44
|
# @see https://bugs.ruby-lang.org/issues/18589
|
|
47
|
-
def constant_cache_invalidations
|
|
45
|
+
def self.constant_cache_invalidations
|
|
48
46
|
::RubyVM.stat[:constant_cache_invalidations]
|
|
49
47
|
end
|
|
50
48
|
|
|
51
49
|
# Introduced in Ruby 3.2 to match an improved cache implementation.
|
|
52
50
|
#
|
|
53
51
|
# @see https://bugs.ruby-lang.org/issues/18589
|
|
54
|
-
def constant_cache_misses
|
|
52
|
+
def self.constant_cache_misses
|
|
55
53
|
::RubyVM.stat[:constant_cache_misses]
|
|
56
54
|
end
|
|
57
55
|
|
|
58
|
-
def available?
|
|
56
|
+
def self.available?
|
|
59
57
|
!!(defined?(::RubyVM) && ::RubyVM.respond_to?(:stat))
|
|
60
58
|
end
|
|
61
59
|
end
|
|
@@ -5,64 +5,65 @@ module Datadog
|
|
|
5
5
|
module Environment
|
|
6
6
|
# Reports YJIT primitive runtime statistics.
|
|
7
7
|
module YJIT
|
|
8
|
-
module_function
|
|
9
|
-
|
|
10
8
|
# Inline code size
|
|
11
|
-
def inline_code_size
|
|
12
|
-
|
|
9
|
+
def self.inline_code_size
|
|
10
|
+
runtime_stats[:inline_code_size]
|
|
13
11
|
end
|
|
14
12
|
|
|
15
13
|
# Outlined code size
|
|
16
|
-
def outlined_code_size
|
|
17
|
-
|
|
14
|
+
def self.outlined_code_size
|
|
15
|
+
runtime_stats[:outlined_code_size]
|
|
18
16
|
end
|
|
19
17
|
|
|
20
18
|
# GCed pages
|
|
21
|
-
def freed_page_count
|
|
22
|
-
|
|
19
|
+
def self.freed_page_count
|
|
20
|
+
runtime_stats[:freed_page_count]
|
|
23
21
|
end
|
|
24
22
|
|
|
25
23
|
# GCed code size
|
|
26
|
-
def freed_code_size
|
|
27
|
-
|
|
24
|
+
def self.freed_code_size
|
|
25
|
+
runtime_stats[:freed_code_size]
|
|
28
26
|
end
|
|
29
27
|
|
|
30
28
|
# Live pages
|
|
31
|
-
def live_page_count
|
|
32
|
-
|
|
29
|
+
def self.live_page_count
|
|
30
|
+
runtime_stats[:live_page_count]
|
|
33
31
|
end
|
|
34
32
|
|
|
35
33
|
# Code GC count
|
|
36
|
-
def code_gc_count
|
|
37
|
-
|
|
34
|
+
def self.code_gc_count
|
|
35
|
+
runtime_stats[:code_gc_count]
|
|
38
36
|
end
|
|
39
37
|
|
|
40
38
|
# Size of memory region allocated for JIT code
|
|
41
|
-
def code_region_size
|
|
42
|
-
|
|
39
|
+
def self.code_region_size
|
|
40
|
+
runtime_stats[:code_region_size]
|
|
43
41
|
end
|
|
44
42
|
|
|
45
43
|
# Total number of object shapes
|
|
46
|
-
def object_shape_count
|
|
47
|
-
|
|
44
|
+
def self.object_shape_count
|
|
45
|
+
runtime_stats[:object_shape_count]
|
|
48
46
|
end
|
|
49
47
|
|
|
50
48
|
# Size of memory Rust allocated for metadata
|
|
51
|
-
def yjit_alloc_size
|
|
52
|
-
|
|
49
|
+
def self.yjit_alloc_size
|
|
50
|
+
runtime_stats[:yjit_alloc_size]
|
|
53
51
|
end
|
|
54
52
|
|
|
55
53
|
# Ratio of YJIT-executed instructions
|
|
56
|
-
def ratio_in_yjit
|
|
57
|
-
|
|
58
|
-
stats[:ratio_in_yjit] if stats.key?(:ratio_in_yjit)
|
|
54
|
+
def self.ratio_in_yjit
|
|
55
|
+
runtime_stats[:ratio_in_yjit]
|
|
59
56
|
end
|
|
60
57
|
|
|
61
|
-
def available?
|
|
58
|
+
def self.available?
|
|
62
59
|
!!(defined?(::RubyVM::YJIT) \
|
|
63
60
|
&& ::RubyVM::YJIT.enabled? \
|
|
64
61
|
&& ::RubyVM::YJIT.respond_to?(:runtime_stats))
|
|
65
62
|
end
|
|
63
|
+
|
|
64
|
+
def self.runtime_stats
|
|
65
|
+
::RubyVM::YJIT.runtime_stats || {}
|
|
66
|
+
end
|
|
66
67
|
end
|
|
67
68
|
end
|
|
68
69
|
end
|
data/lib/datadog/core/logger.rb
CHANGED
|
@@ -10,6 +10,9 @@ module Datadog
|
|
|
10
10
|
# @public_api
|
|
11
11
|
class Logger < ::Logger
|
|
12
12
|
PREFIX = "datadog"
|
|
13
|
+
# Not `__dir__`: it resolves symlinks, unlike the paths in `caller_locations`.
|
|
14
|
+
LIB_DATADOG_DIR = File.dirname(File.dirname(__FILE__)) + "/"
|
|
15
|
+
private_constant :LIB_DATADOG_DIR
|
|
13
16
|
|
|
14
17
|
def initialize(*args, &block)
|
|
15
18
|
super
|
|
@@ -22,8 +25,8 @@ module Datadog
|
|
|
22
25
|
|
|
23
26
|
# We are in debug mode, or this is an error, add stack trace to help debugging
|
|
24
27
|
if debug? || severity >= ::Logger::ERROR
|
|
25
|
-
|
|
26
|
-
where = "(#{
|
|
28
|
+
location = caller_locations(2, 1)&.first
|
|
29
|
+
where = "(#{location.path.to_s.delete_prefix(LIB_DATADOG_DIR)}:#{location.lineno}) " if location
|
|
27
30
|
end
|
|
28
31
|
|
|
29
32
|
if message.nil?
|
|
@@ -40,8 +40,8 @@ module Datadog
|
|
|
40
40
|
version = dogstatsd_version
|
|
41
41
|
|
|
42
42
|
!version.nil? && version >= Gem::Version.new("3.3.0") &&
|
|
43
|
-
# dogstatsd-ruby >= 5.0 & < 5.2.0
|
|
44
|
-
#
|
|
43
|
+
# dogstatsd-ruby >= 5.0 & < 5.2.0 broke process forks and
|
|
44
|
+
# does not support the single thread mode we use to avoid this problem.
|
|
45
45
|
!(version >= Gem::Version.new("5.0") && version < Gem::Version.new("5.3"))
|
|
46
46
|
end
|
|
47
47
|
|
|
@@ -67,14 +67,15 @@ module Datadog
|
|
|
67
67
|
# Create a StatsD client that points to the agent.
|
|
68
68
|
#
|
|
69
69
|
# We use `single_thread: true`, as dogstatsd-ruby >= 5.0 creates a background thread
|
|
70
|
-
# by default
|
|
70
|
+
# by default but does not handle forks correctly, so it leaks resources.
|
|
71
71
|
#
|
|
72
72
|
# Using dogstatsd-ruby >= 5.0 is still valuable, as it supports
|
|
73
73
|
# transparent batch metric submission, which reduces submission
|
|
74
74
|
# overhead.
|
|
75
75
|
#
|
|
76
76
|
# Versions < 5.0 are always single-threaded, but do not have the kwarg option.
|
|
77
|
-
|
|
77
|
+
version = dogstatsd_version
|
|
78
|
+
options = if version && version >= Gem::Version.new("5.2")
|
|
78
79
|
{single_thread: true}
|
|
79
80
|
else
|
|
80
81
|
{}
|
|
@@ -152,19 +153,10 @@ module Datadog
|
|
|
152
153
|
|
|
153
154
|
# Calculate time, send it as a distribution.
|
|
154
155
|
start = Utils::Time.get_time
|
|
155
|
-
yield
|
|
156
|
-
ensure
|
|
157
156
|
begin
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
end
|
|
162
|
-
rescue => e
|
|
163
|
-
# TODO: Likely to be redundant, since `distribution` handles its own errors.
|
|
164
|
-
logger.error(
|
|
165
|
-
"Failed to send time stat. Cause: #{e.class}: #{e.message} Source: #{Array(e.backtrace).first}",
|
|
166
|
-
)
|
|
167
|
-
telemetry.report(e, description: "Failed to send time stat")
|
|
157
|
+
yield
|
|
158
|
+
ensure
|
|
159
|
+
distribution(stat, (Utils::Time.get_time - start) * 1000, options) if send_stats?
|
|
168
160
|
end
|
|
169
161
|
end
|
|
170
162
|
|
|
@@ -13,10 +13,13 @@ module Datadog
|
|
|
13
13
|
:time,
|
|
14
14
|
].each do |metric_type|
|
|
15
15
|
define_method(metric_type) do |name, stat|
|
|
16
|
+
# @type self: singleton(Client)
|
|
16
17
|
name = name.to_sym
|
|
17
18
|
define_method(name) do |*args, &block|
|
|
19
|
+
# @type self: Client
|
|
18
20
|
send(metric_type, stat, *args, &block)
|
|
19
21
|
end
|
|
22
|
+
nil
|
|
20
23
|
end
|
|
21
24
|
end
|
|
22
25
|
end
|