newrelic_rpm 9.0.0 → 9.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/.rubocop.yml +7 -81
- data/.rubocop_todo.yml +4 -43
- data/.simplecov +2 -1
- data/Brewfile +1 -0
- data/CHANGELOG.md +74 -2
- data/Gemfile +1 -1
- data/Guardfile +8 -7
- data/README.md +1 -2
- data/Rakefile +8 -8
- data/Thorfile +1 -1
- data/bin/newrelic +1 -0
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +20 -20
- data/init.rb +1 -1
- data/lib/new_relic/agent/agent.rb +3 -16
- data/lib/new_relic/agent/agent_helpers/connect.rb +4 -9
- data/lib/new_relic/agent/agent_helpers/harvest.rb +4 -4
- data/lib/new_relic/agent/agent_helpers/shutdown.rb +5 -5
- data/lib/new_relic/agent/agent_helpers/special_startup.rb +2 -2
- data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +47 -39
- data/lib/new_relic/agent/agent_helpers/startup.rb +13 -13
- data/lib/new_relic/agent/agent_helpers/transmit.rb +6 -6
- data/lib/new_relic/agent/agent_logger.rb +9 -9
- data/lib/new_relic/agent/attribute_filter.rb +2 -2
- data/lib/new_relic/agent/attribute_processing.rb +2 -2
- data/lib/new_relic/agent/audit_logger.rb +5 -5
- data/lib/new_relic/agent/autostart.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +2 -2
- data/lib/new_relic/agent/commands/agent_command_router.rb +5 -4
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +5 -5
- data/lib/new_relic/agent/configuration/default_source.rb +57 -80
- data/lib/new_relic/agent/configuration/environment_source.rb +2 -2
- data/lib/new_relic/agent/configuration/high_security_source.rb +3 -3
- data/lib/new_relic/agent/configuration/manager.rb +2 -2
- data/lib/new_relic/agent/configuration/security_policy_source.rb +10 -10
- data/lib/new_relic/agent/configuration/server_source.rb +24 -24
- data/lib/new_relic/agent/configuration/yaml_source.rb +4 -4
- data/lib/new_relic/agent/connect/request_builder.rb +1 -1
- data/lib/new_relic/agent/connect/response_handler.rb +1 -1
- data/lib/new_relic/agent/custom_event_aggregator.rb +4 -4
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
- data/lib/new_relic/agent/database/obfuscator.rb +2 -2
- data/lib/new_relic/agent/database.rb +4 -4
- data/lib/new_relic/agent/datastores/metric_helper.rb +5 -5
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +11 -11
- data/lib/new_relic/agent/datastores/redis.rb +6 -6
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +7 -8
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +10 -10
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +7 -7
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +6 -6
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +7 -7
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +4 -4
- data/lib/new_relic/agent/distributed_tracing.rb +5 -5
- data/lib/new_relic/agent/error_collector.rb +35 -7
- data/lib/new_relic/agent/error_filter.rb +2 -2
- data/lib/new_relic/agent/error_trace_aggregator.rb +5 -4
- data/lib/new_relic/agent/event_loop.rb +3 -3
- data/lib/new_relic/agent/external.rb +1 -1
- data/lib/new_relic/agent/harvester.rb +1 -3
- data/lib/new_relic/agent/heap.rb +2 -1
- data/lib/new_relic/agent/hostname.rb +1 -1
- data/lib/new_relic/agent/http_clients/abstract.rb +9 -21
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +7 -3
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +7 -5
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -0
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +6 -2
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +5 -1
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +8 -5
- data/lib/new_relic/agent/http_clients/uri_util.rb +2 -2
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +5 -2
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +3 -2
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +3 -3
- data/lib/new_relic/agent/instrumentation/active_job.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +3 -3
- data/lib/new_relic/agent/instrumentation/active_record.rb +3 -2
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +38 -35
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +3 -3
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +2 -2
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +3 -2
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +3 -3
- data/lib/new_relic/agent/instrumentation/bunny.rb +1 -1
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +5 -3
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +5 -5
- data/lib/new_relic/agent/instrumentation/curb.rb +1 -1
- data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +2 -1
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +2 -1
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +2 -2
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +4 -3
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +2 -2
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +2 -1
- data/lib/new_relic/agent/instrumentation/excon.rb +3 -3
- data/lib/new_relic/agent/instrumentation/fiber/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/fiber.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +4 -4
- data/lib/new_relic/agent/instrumentation/grape.rb +3 -3
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +3 -2
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +4 -4
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +1 -1
- data/lib/new_relic/agent/instrumentation/httprb.rb +1 -1
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
- data/lib/new_relic/agent/instrumentation/logger.rb +1 -1
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +3 -1
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +2 -2
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +3 -1
- data/lib/new_relic/agent/instrumentation/memcache.rb +8 -8
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +3 -3
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +1 -1
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +6 -6
- data/lib/new_relic/agent/instrumentation/net_http.rb +1 -1
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +1 -1
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +3 -3
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +2 -2
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +3 -2
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +7 -7
- data/lib/new_relic/agent/instrumentation/rake.rb +2 -2
- data/lib/new_relic/agent/instrumentation/redis/constants.rb +1 -1
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +2 -1
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sequel.rb +4 -4
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +10 -10
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +1 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +6 -5
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +2 -1
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +5 -5
- data/lib/new_relic/agent/javascript_instrumentor.rb +29 -24
- data/lib/new_relic/agent/linking_metadata.rb +2 -2
- data/lib/new_relic/agent/log_event_aggregator.rb +15 -15
- data/lib/new_relic/agent/logging.rb +73 -33
- data/lib/new_relic/agent/messaging.rb +7 -5
- data/lib/new_relic/agent/method_tracer.rb +7 -7
- data/lib/new_relic/agent/method_tracer_helpers.rb +1 -1
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +4 -4
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +2 -2
- data/lib/new_relic/agent/new_relic_service.rb +14 -15
- data/lib/new_relic/agent/obfuscator.rb +1 -1
- data/lib/new_relic/agent/parameter_filtering.rb +6 -6
- data/lib/new_relic/agent/pipe_channel_manager.rb +7 -6
- data/lib/new_relic/agent/pipe_service.rb +5 -3
- data/lib/new_relic/agent/priority_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/sampler.rb +2 -1
- data/lib/new_relic/agent/sampler_collection.rb +1 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +5 -5
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +9 -9
- data/lib/new_relic/agent/samplers/memory_sampler.rb +9 -9
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +4 -4
- data/lib/new_relic/agent/span_event_primitive.rb +2 -2
- data/lib/new_relic/agent/sql_sampler.rb +2 -2
- data/lib/new_relic/agent/stats.rb +1 -1
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/system_info.rb +10 -10
- data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
- data/lib/new_relic/agent/threading/backtrace_node.rb +3 -3
- data/lib/new_relic/agent/threading/backtrace_service.rb +3 -7
- data/lib/new_relic/agent/threading/thread_profile.rb +5 -5
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +8 -7
- data/lib/new_relic/agent/transaction/abstract_segment.rb +52 -46
- data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +7 -6
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +13 -14
- data/lib/new_relic/agent/transaction/external_request_segment.rb +11 -11
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/request_attributes.rb +2 -2
- data/lib/new_relic/agent/transaction/segment.rb +1 -1
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/trace.rb +1 -1
- data/lib/new_relic/agent/transaction/trace_context.rb +4 -4
- data/lib/new_relic/agent/transaction/trace_node.rb +8 -7
- data/lib/new_relic/agent/transaction/tracing.rb +2 -2
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction.rb +39 -36
- data/lib/new_relic/agent/transaction_error_primitive.rb +5 -5
- data/lib/new_relic/agent/transaction_event_aggregator.rb +4 -4
- data/lib/new_relic/agent/transaction_event_primitive.rb +3 -3
- data/lib/new_relic/agent/transaction_sampler.rb +3 -3
- data/lib/new_relic/agent/transaction_time_aggregator.rb +7 -3
- data/lib/new_relic/agent/utilization/aws.rb +1 -1
- data/lib/new_relic/agent/utilization/azure.rb +3 -3
- data/lib/new_relic/agent/utilization/gcp.rb +3 -3
- data/lib/new_relic/agent/utilization/pcf.rb +1 -1
- data/lib/new_relic/agent/utilization/vendor.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
- data/lib/new_relic/agent/vm/mri_vm.rb +9 -8
- data/lib/new_relic/agent/worker_loop.rb +1 -1
- data/lib/new_relic/agent.rb +78 -16
- data/lib/new_relic/cli/command.rb +3 -3
- data/lib/new_relic/cli/commands/deployments.rb +26 -25
- data/lib/new_relic/cli/commands/install.rb +14 -14
- data/lib/new_relic/collection_helper.rb +2 -2
- data/lib/new_relic/constants.rb +7 -8
- data/lib/new_relic/control/class_methods.rb +3 -3
- data/lib/new_relic/control/frameworks/rails.rb +30 -18
- data/lib/new_relic/control/instance_methods.rb +5 -5
- data/lib/new_relic/control/instrumentation.rb +1 -1
- data/lib/new_relic/control/private_instance_methods.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +4 -17
- data/lib/new_relic/environment_report.rb +4 -4
- data/lib/new_relic/helper.rb +2 -1
- data/lib/new_relic/language_support.rb +1 -1
- data/lib/new_relic/latest_changes.rb +5 -5
- data/lib/new_relic/noticed_error.rb +20 -18
- data/lib/new_relic/rack/browser_monitoring.rb +20 -16
- data/lib/new_relic/recipes/capistrano3.rb +1 -1
- data/lib/new_relic/recipes/capistrano_legacy.rb +6 -6
- data/lib/new_relic/recipes/helpers/send_deployment.rb +5 -5
- data/lib/new_relic/supportability_helper.rb +2 -0
- data/lib/new_relic/version.rb +1 -1
- data/lib/newrelic_rpm.rb +3 -3
- data/lib/sequel/extensions/new_relic_instrumentation.rb +3 -3
- data/lib/sequel/plugins/new_relic_instrumentation.rb +1 -1
- data/lib/tasks/config.rake +12 -12
- data/lib/tasks/coverage_report.rake +4 -4
- data/lib/tasks/helpers/format.rb +9 -9
- data/lib/tasks/helpers/removers.rb +5 -5
- data/lib/tasks/install.rake +4 -4
- data/lib/tasks/instrumentation_generator/instrumentation.thor +8 -8
- data/lib/tasks/instrumentation_generator/templates/chain.tt +1 -1
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +1 -1
- data/lib/tasks/multiverse.rb +13 -6
- data/lib/tasks/newrelic.rb +1 -0
- data/lib/tasks/tests.rake +6 -6
- data/newrelic.yml +3 -3
- data/newrelic_rpm.gemspec +13 -13
- data/test/agent_helper.rb +25 -24
- metadata +73 -4
- data/lib/new_relic/agent/range_extensions.rb +0 -27
@@ -21,21 +21,21 @@ module NewRelic
|
|
21
21
|
# DelayedJob supports multiple backends, only some of which we can
|
22
22
|
# handle. Check whether we think we've got what we need here.
|
23
23
|
def self.supported_backend?
|
24
|
-
::Delayed::Worker.backend.to_s ==
|
24
|
+
::Delayed::Worker.backend.to_s == 'Delayed::Backend::ActiveRecord::Job'
|
25
25
|
end
|
26
26
|
|
27
27
|
def initialize
|
28
|
-
raise Unsupported,
|
28
|
+
raise Unsupported, 'DJ queue sampler disabled' if Agent.config[:'instrumentation.delayed_job'] == 'disabled'
|
29
29
|
raise Unsupported, "DJ queue sampling unsupported with backend '#{::Delayed::Worker.backend}'" unless self.class.supported_backend?
|
30
|
-
raise Unsupported,
|
30
|
+
raise Unsupported, 'No DJ worker present. Skipping DJ queue sampler' unless NewRelic::DelayedJobInjection.worker_name
|
31
31
|
end
|
32
32
|
|
33
33
|
def record_failed_jobs(value)
|
34
|
-
NewRelic::Agent.record_metric(
|
34
|
+
NewRelic::Agent.record_metric('Workers/DelayedJob/failed_jobs', value)
|
35
35
|
end
|
36
36
|
|
37
37
|
def record_locked_jobs(value)
|
38
|
-
NewRelic::Agent.record_metric(
|
38
|
+
NewRelic::Agent.record_metric('Workers/DelayedJob/locked_jobs', value)
|
39
39
|
end
|
40
40
|
|
41
41
|
FAILED_QUERY = 'failed_at is not NULL'.freeze
|
@@ -74,10 +74,10 @@ module NewRelic
|
|
74
74
|
|
75
75
|
def record_queue_length_metrics
|
76
76
|
counts = []
|
77
|
-
counts << record_counts_by(
|
78
|
-
counts << record_counts_by(
|
77
|
+
counts << record_counts_by('queue', 'name') if ::Delayed::Job.instance_methods.include?(:queue)
|
78
|
+
counts << record_counts_by('priority')
|
79
79
|
|
80
|
-
all_metric =
|
80
|
+
all_metric = 'Workers/DelayedJob/queue_length/all'
|
81
81
|
NewRelic::Agent.record_metric(all_metric, counts.max)
|
82
82
|
end
|
83
83
|
|
@@ -87,7 +87,7 @@ module NewRelic
|
|
87
87
|
all_count = 0
|
88
88
|
queue_counts(column_name).each do |column_val, count|
|
89
89
|
all_count += count
|
90
|
-
column_val =
|
90
|
+
column_val = 'default' if column_val.nil? || column_val == NewRelic::EMPTY_STR
|
91
91
|
metric = "Workers/DelayedJob/queue_length/#{metric_node}/#{column_val}"
|
92
92
|
NewRelic::Agent.record_metric(metric, count)
|
93
93
|
end
|
@@ -23,18 +23,18 @@ module NewRelic
|
|
23
23
|
@sampler = ProcStatus.new
|
24
24
|
if !@sampler.can_run?
|
25
25
|
::NewRelic::Agent.logger.debug("Error attempting to use /proc/#{$$}/status file for reading memory. Using ps command instead.")
|
26
|
-
@sampler = ShellPS.new(
|
26
|
+
@sampler = ShellPS.new('ps -o rsz')
|
27
27
|
else
|
28
28
|
::NewRelic::Agent.logger.debug("Using /proc/#{$$}/status for reading process memory.")
|
29
29
|
end
|
30
30
|
elsif platform.include?('darwin9') # 10.5
|
31
|
-
@sampler = ShellPS.new(
|
32
|
-
elsif
|
33
|
-
@sampler = ShellPS.new(
|
31
|
+
@sampler = ShellPS.new('ps -o rsz')
|
32
|
+
elsif /darwin(1|2)\d+/.match?(platform) # >= 10.6
|
33
|
+
@sampler = ShellPS.new('ps -o rss')
|
34
34
|
elsif platform.include?('freebsd')
|
35
|
-
@sampler = ShellPS.new(
|
35
|
+
@sampler = ShellPS.new('ps -o rss')
|
36
36
|
elsif platform.include?('solaris')
|
37
|
-
@sampler = ShellPS.new(
|
37
|
+
@sampler = ShellPS.new('/usr/bin/ps -o rss -p')
|
38
38
|
end
|
39
39
|
|
40
40
|
raise Unsupported, "Unsupported platform for getting memory: #{platform}" if @sampler.nil?
|
@@ -64,7 +64,7 @@ module NewRelic
|
|
64
64
|
def poll
|
65
65
|
sample = @sampler.get_sample
|
66
66
|
if sample
|
67
|
-
NewRelic::Agent.record_metric(
|
67
|
+
NewRelic::Agent.record_metric('Memory/Physical', sample)
|
68
68
|
end
|
69
69
|
end
|
70
70
|
|
@@ -106,7 +106,7 @@ module NewRelic
|
|
106
106
|
end
|
107
107
|
|
108
108
|
def to_s
|
109
|
-
|
109
|
+
'JRuby Java heap sampler'
|
110
110
|
end
|
111
111
|
end
|
112
112
|
|
@@ -140,7 +140,7 @@ module NewRelic
|
|
140
140
|
class ProcStatus < Base
|
141
141
|
# Returns the amount of resident memory this process is using in MB
|
142
142
|
def get_memory
|
143
|
-
proc_status = File.open(proc_status_file,
|
143
|
+
proc_status = File.open(proc_status_file, 'r') { |f| f.read_nonblock(4096).strip }
|
144
144
|
if proc_status =~ /RSS:\s*(\d+) kB/i
|
145
145
|
return $1.to_f / 1024.0
|
146
146
|
end
|
@@ -18,7 +18,7 @@ module NewRelic
|
|
18
18
|
|
19
19
|
def record(priority: nil, event: nil, &blk)
|
20
20
|
unless event || priority && blk
|
21
|
-
raise ArgumentError,
|
21
|
+
raise ArgumentError, 'Expected priority and block, or event'
|
22
22
|
end
|
23
23
|
|
24
24
|
return unless enabled?
|
@@ -29,9 +29,9 @@ module NewRelic
|
|
29
29
|
end
|
30
30
|
end
|
31
31
|
|
32
|
-
SUPPORTABILITY_TOTAL_SEEN =
|
33
|
-
SUPPORTABILITY_TOTAL_SENT =
|
34
|
-
SUPPORTABILITY_DISCARDED =
|
32
|
+
SUPPORTABILITY_TOTAL_SEEN = 'Supportability/SpanEvent/TotalEventsSeen'.freeze
|
33
|
+
SUPPORTABILITY_TOTAL_SENT = 'Supportability/SpanEvent/TotalEventsSent'.freeze
|
34
|
+
SUPPORTABILITY_DISCARDED = 'Supportability/SpanEvent/Discarded'.freeze
|
35
35
|
|
36
36
|
def after_harvest(metadata)
|
37
37
|
seen = metadata[:seen]
|
@@ -37,8 +37,8 @@ module NewRelic
|
|
37
37
|
PEER_HOSTNAME_KEY = 'peer.hostname'
|
38
38
|
SPAN_KIND_KEY = 'span.kind'
|
39
39
|
ENTRY_POINT_KEY = 'nr.entryPoint'
|
40
|
-
TRUSTED_PARENT_KEY =
|
41
|
-
TRACING_VENDORS_KEY =
|
40
|
+
TRUSTED_PARENT_KEY = 'trustedParentId'
|
41
|
+
TRACING_VENDORS_KEY = 'tracingVendors'
|
42
42
|
TRANSACTION_NAME_KEY = 'transaction.name'
|
43
43
|
|
44
44
|
# Strings for static values of the event structure
|
@@ -154,12 +154,12 @@ module NewRelic
|
|
154
154
|
end
|
155
155
|
end
|
156
156
|
|
157
|
-
PRIORITY =
|
157
|
+
PRIORITY = 'priority'.freeze
|
158
158
|
|
159
159
|
def distributed_trace_attributes(state)
|
160
160
|
transaction = state.current_transaction
|
161
161
|
params = nil
|
162
|
-
if transaction
|
162
|
+
if transaction&.distributed_tracer&.distributed_trace_payload
|
163
163
|
params = {}
|
164
164
|
payload = transaction.distributed_tracer.distributed_trace_payload
|
165
165
|
DistributedTraceAttributes.copy_from_transaction(transaction, payload, params)
|
@@ -37,7 +37,7 @@ module NewRelic
|
|
37
37
|
NewRelic::Agent.logger.debug("Synthetics transaction event limit (#{metadata[:capacity]}) reached. Further synthetics events this harvest period dropped.")
|
38
38
|
|
39
39
|
engine = NewRelic::Agent.instance.stats_engine
|
40
|
-
engine.tl_record_supportability_metric_count(
|
40
|
+
engine.tl_record_supportability_metric_count('SyntheticsEventAggregator/synthetics_events_dropped', num_dropped)
|
41
41
|
end
|
42
42
|
end
|
43
43
|
end
|
@@ -128,7 +128,7 @@ module NewRelic
|
|
128
128
|
|
129
129
|
num_physical_packages = cores.keys.map(&:first).uniq.size
|
130
130
|
num_physical_cores = cores.size
|
131
|
-
num_logical_processors = cores.values.
|
131
|
+
num_logical_processors = cores.values.sum
|
132
132
|
|
133
133
|
if num_physical_cores == 0
|
134
134
|
num_logical_processors = total_processors
|
@@ -202,7 +202,7 @@ module NewRelic
|
|
202
202
|
return
|
203
203
|
when /docker/
|
204
204
|
::NewRelic::Agent.logger.debug("Cgroup indicates docker but container_id unrecognized: '#{cpu_cgroup}'")
|
205
|
-
::NewRelic::Agent.increment_metric(
|
205
|
+
::NewRelic::Agent.increment_metric('Supportability/utilization/docker/error')
|
206
206
|
return
|
207
207
|
else
|
208
208
|
::NewRelic::Agent.logger.debug("Ignoring unrecognized cgroup ID format: '#{cpu_cgroup}'")
|
@@ -211,7 +211,7 @@ module NewRelic
|
|
211
211
|
|
212
212
|
if container_id && container_id.size != 64
|
213
213
|
::NewRelic::Agent.logger.debug("Found docker container_id with invalid length: #{container_id}")
|
214
|
-
::NewRelic::Agent.increment_metric(
|
214
|
+
::NewRelic::Agent.increment_metric('Supportability/utilization/docker/error')
|
215
215
|
nil
|
216
216
|
else
|
217
217
|
container_id
|
@@ -242,7 +242,7 @@ module NewRelic
|
|
242
242
|
def self.proc_try_read(path)
|
243
243
|
return nil unless File.exist?(path)
|
244
244
|
|
245
|
-
content =
|
245
|
+
content = +''
|
246
246
|
File.open(path) do |f|
|
247
247
|
loop do
|
248
248
|
begin
|
@@ -289,8 +289,8 @@ module NewRelic
|
|
289
289
|
|
290
290
|
if bid.ascii_only?
|
291
291
|
if bid.empty?
|
292
|
-
::NewRelic::Agent.logger.debug(
|
293
|
-
::NewRelic::Agent.increment_metric(
|
292
|
+
::NewRelic::Agent.logger.debug('boot_id not found in /proc/sys/kernel/random/boot_id')
|
293
|
+
::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
|
294
294
|
nil
|
295
295
|
|
296
296
|
elsif bid.bytesize == 36
|
@@ -298,19 +298,19 @@ module NewRelic
|
|
298
298
|
|
299
299
|
else
|
300
300
|
::NewRelic::Agent.logger.debug("Found boot_id with invalid length: #{bid}")
|
301
|
-
::NewRelic::Agent.increment_metric(
|
301
|
+
::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
|
302
302
|
bid[0, 128]
|
303
303
|
|
304
304
|
end
|
305
305
|
else
|
306
306
|
::NewRelic::Agent.logger.debug("Found boot_id with non-ASCII characters: #{bid}")
|
307
|
-
::NewRelic::Agent.increment_metric(
|
307
|
+
::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
|
308
308
|
nil
|
309
309
|
|
310
310
|
end
|
311
311
|
else
|
312
|
-
::NewRelic::Agent.logger.debug(
|
313
|
-
::NewRelic::Agent.increment_metric(
|
312
|
+
::NewRelic::Agent.logger.debug('boot_id not found in /proc/sys/kernel/random/boot_id')
|
313
|
+
::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
|
314
314
|
nil
|
315
315
|
|
316
316
|
end
|
@@ -70,7 +70,7 @@ module NewRelic
|
|
70
70
|
end
|
71
71
|
|
72
72
|
def dump_string
|
73
|
-
result =
|
73
|
+
result = +"#<BacktraceRoot:#{object_id}>"
|
74
74
|
child_results = @children.map { |c| c.dump_string(2) }.join("\n")
|
75
75
|
result << "\n" unless child_results.empty?
|
76
76
|
result << child_results
|
@@ -116,8 +116,8 @@ module NewRelic
|
|
116
116
|
def dump_string(indent = 0)
|
117
117
|
@file, @method, @line_no = parse_backtrace_frame(@raw_line)
|
118
118
|
indentation = ' ' * indent
|
119
|
-
result =
|
120
|
-
[#{@runnable_count}] #{@file}:#{@line_no} in #{@method}>"
|
119
|
+
result = +"#{indentation}#<BacktraceNode:#{object_id} ) + \
|
120
|
+
[#{@runnable_count}] #{@file}:#{@line_no} in #{@method}>"
|
121
121
|
child_results = @children.map { |c| c.dump_string(indent + 2) }.join("\n")
|
122
122
|
result << "\n" unless child_results.empty?
|
123
123
|
result << child_results
|
@@ -6,7 +6,7 @@ module NewRelic
|
|
6
6
|
module Agent
|
7
7
|
module Threading
|
8
8
|
class BacktraceService
|
9
|
-
ALL_TRANSACTIONS =
|
9
|
+
ALL_TRANSACTIONS = '**ALL**'.freeze
|
10
10
|
|
11
11
|
def self.is_supported?
|
12
12
|
!is_resque?
|
@@ -41,9 +41,7 @@ module NewRelic
|
|
41
41
|
@overhead_percent_threshold = new_value
|
42
42
|
end
|
43
43
|
|
44
|
-
|
45
|
-
event_listener.subscribe(:transaction_finished, &method(:on_transaction_finished))
|
46
|
-
end
|
44
|
+
event_listener&.subscribe(:transaction_finished, &method(:on_transaction_finished))
|
47
45
|
end
|
48
46
|
|
49
47
|
# Public interface
|
@@ -221,9 +219,7 @@ module NewRelic
|
|
221
219
|
|
222
220
|
# This method is expected to be called with @lock held.
|
223
221
|
def aggregate_global_backtrace(backtrace, bucket, thread)
|
224
|
-
|
225
|
-
@profiles[ALL_TRANSACTIONS].aggregate(backtrace, bucket, thread)
|
226
|
-
end
|
222
|
+
@profiles[ALL_TRANSACTIONS]&.aggregate(backtrace, bucket, thread)
|
227
223
|
end
|
228
224
|
|
229
225
|
# This method is expected to be called with @lock held.
|
@@ -72,7 +72,7 @@ module NewRelic
|
|
72
72
|
all_nodes = @traces.values.map { |n| n.flattened }.flatten
|
73
73
|
|
74
74
|
NewRelic::Agent.instance.stats_engine
|
75
|
-
.tl_record_supportability_metric_count(
|
75
|
+
.tl_record_supportability_metric_count('ThreadProfiler/NodeCount', all_nodes.size)
|
76
76
|
|
77
77
|
all_nodes.sort! do |a, b|
|
78
78
|
# we primarily prefer higher runnable_count
|
@@ -103,10 +103,10 @@ module NewRelic
|
|
103
103
|
convert_N_trace_nodes_to_arrays(THREAD_PROFILER_NODES)
|
104
104
|
|
105
105
|
{
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
106
|
+
'OTHER' => @traces[:other].as_array,
|
107
|
+
'REQUEST' => @traces[:request].as_array,
|
108
|
+
'AGENT' => @traces[:agent].as_array,
|
109
|
+
'BACKGROUND' => @traces[:background].as_array
|
110
110
|
}
|
111
111
|
end
|
112
112
|
|
@@ -107,7 +107,7 @@ module NewRelic
|
|
107
107
|
current_transaction.notice_error(exception)
|
108
108
|
raise
|
109
109
|
ensure
|
110
|
-
finishable
|
110
|
+
finishable&.finish
|
111
111
|
end
|
112
112
|
end
|
113
113
|
|
@@ -246,8 +246,8 @@ module NewRelic
|
|
246
246
|
log_error('start_segment', exception)
|
247
247
|
end
|
248
248
|
|
249
|
-
UNKNOWN =
|
250
|
-
OTHER =
|
249
|
+
UNKNOWN = 'Unknown'.freeze
|
250
|
+
OTHER = 'other'.freeze
|
251
251
|
|
252
252
|
# Creates and starts a datastore segment used to time
|
253
253
|
# datastore operations.
|
@@ -355,7 +355,8 @@ module NewRelic
|
|
355
355
|
|
356
356
|
yield
|
357
357
|
rescue => exception
|
358
|
-
|
358
|
+
# needs else branch coverage
|
359
|
+
if segment && segment.is_a?(Transaction::AbstractSegment) # rubocop:disable Style/SafeNavigation
|
359
360
|
segment.notice_error(exception)
|
360
361
|
end
|
361
362
|
raise
|
@@ -425,6 +426,7 @@ module NewRelic
|
|
425
426
|
begin
|
426
427
|
if current_txn
|
427
428
|
NewRelic::Agent::Tracer.state.current_transaction = current_txn
|
429
|
+
current_txn.async = true
|
428
430
|
segment_name += "/Thread#{::Thread.current.object_id}/Fiber#{::Fiber.current.object_id}" if NewRelic::Agent.config[:'thread_ids_enabled']
|
429
431
|
segment = NewRelic::Agent::Tracer.start_segment(name: segment_name, parent: parent)
|
430
432
|
end
|
@@ -487,7 +489,8 @@ module NewRelic
|
|
487
489
|
end
|
488
490
|
|
489
491
|
def pop_traced
|
490
|
-
|
492
|
+
# needs else branch coverage
|
493
|
+
@untraced.pop if @untraced # rubocop:disable Style/SafeNavigation
|
491
494
|
end
|
492
495
|
|
493
496
|
def is_execution_traced?
|
@@ -507,7 +510,5 @@ module NewRelic
|
|
507
510
|
attr_accessor :sql_sampler_transaction_data
|
508
511
|
end
|
509
512
|
end
|
510
|
-
|
511
|
-
TransactionState = Tracer
|
512
513
|
end
|
513
514
|
end
|
@@ -2,7 +2,6 @@
|
|
2
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
3
|
# frozen_string_literal: true
|
4
4
|
|
5
|
-
require 'new_relic/agent/range_extensions'
|
6
5
|
require 'new_relic/agent/guid_generator'
|
7
6
|
|
8
7
|
module NewRelic
|
@@ -56,7 +55,7 @@ module NewRelic
|
|
56
55
|
@start_time ||= Process.clock_gettime(Process::CLOCK_REALTIME)
|
57
56
|
return unless transaction
|
58
57
|
|
59
|
-
parent
|
58
|
+
parent&.child_start(self)
|
60
59
|
end
|
61
60
|
|
62
61
|
def finish
|
@@ -105,38 +104,6 @@ module NewRelic
|
|
105
104
|
@start_time.to_f..@end_time.to_f
|
106
105
|
end
|
107
106
|
|
108
|
-
def timings_overlap?(timing1, timing2)
|
109
|
-
(timing1.first >= timing2.first && timing1.first <= timing2.last) ||
|
110
|
-
(timing2.first >= timing1.first && timing2.first <= timing1.last)
|
111
|
-
end
|
112
|
-
|
113
|
-
def merge_timings(timing1, timing2)
|
114
|
-
[([timing1.first, timing2.first].min),
|
115
|
-
([timing1.last, timing2.last].max)]
|
116
|
-
end
|
117
|
-
|
118
|
-
# @children_timings is an array of array, with each inner array
|
119
|
-
# holding exactly 2 values, a child segment's start time and finish
|
120
|
-
# time (in that order). When it's time to record, these timings are
|
121
|
-
# converted into an array of range objects (using the same start and
|
122
|
-
# end values as the original array). Any two range objects that
|
123
|
-
# intersect and merged into a larger range. This checking for a
|
124
|
-
# intersections and merging of ranges is expensive, so the operation
|
125
|
-
# is only done at recording time.
|
126
|
-
def children_time_ranges
|
127
|
-
@children_time_ranges ||= begin
|
128
|
-
overlapped = @children_timings.each_with_object([]) do |timing, timings|
|
129
|
-
i = timings.index { |t| timings_overlap?(t, timing) }
|
130
|
-
if i
|
131
|
-
timings[i] = merge_timings(timing, timings[i])
|
132
|
-
else
|
133
|
-
timings << timing
|
134
|
-
end
|
135
|
-
end
|
136
|
-
overlapped.map { |t| Range.new(t.first, t.last) }
|
137
|
-
end
|
138
|
-
end
|
139
|
-
|
140
107
|
def children_time_ranges?
|
141
108
|
!@children_timings.empty?
|
142
109
|
end
|
@@ -228,7 +195,7 @@ module NewRelic
|
|
228
195
|
|
229
196
|
if finished?
|
230
197
|
transaction.async = true
|
231
|
-
parent
|
198
|
+
parent&.descendant_complete(self, segment)
|
232
199
|
end
|
233
200
|
end
|
234
201
|
|
@@ -262,19 +229,19 @@ module NewRelic
|
|
262
229
|
|
263
230
|
def force_finish
|
264
231
|
finish
|
265
|
-
NewRelic::Agent.logger.warn
|
266
|
-
"the end of transaction. Timing information for this segment's" \
|
267
|
-
"parent #{parent
|
232
|
+
NewRelic::Agent.logger.send(transaction.async? ? :debug : :warn, "Segment: #{name} was unfinished at " \
|
233
|
+
"the end of transaction. Timing information for this segment's " \
|
234
|
+
"parent #{parent&.name} in #{transaction.best_name} may be inaccurate.")
|
268
235
|
end
|
269
236
|
|
270
237
|
def run_complete_callbacks
|
271
238
|
segment_complete
|
272
|
-
parent
|
239
|
+
parent&.child_complete(self)
|
273
240
|
transaction.segment_complete(self)
|
274
241
|
end
|
275
242
|
|
276
243
|
def record_metrics
|
277
|
-
raise NotImplementedError,
|
244
|
+
raise NotImplementedError, 'Subclasses must implement record_metrics'
|
278
245
|
end
|
279
246
|
|
280
247
|
# callback for subclasses to override
|
@@ -299,12 +266,6 @@ module NewRelic
|
|
299
266
|
end
|
300
267
|
|
301
268
|
def record_exclusive_duration
|
302
|
-
overlapping_duration = if children_time_ranges?
|
303
|
-
RangeExtensions.compute_overlap(time_range, children_time_ranges)
|
304
|
-
else
|
305
|
-
0.0
|
306
|
-
end
|
307
|
-
|
308
269
|
@exclusive_duration = duration - children_time - overlapping_duration
|
309
270
|
transaction.total_time += @exclusive_duration
|
310
271
|
params[:exclusive_duration_millis] = @exclusive_duration * 1000 if transaction.async?
|
@@ -314,6 +275,51 @@ module NewRelic
|
|
314
275
|
transaction.metrics
|
315
276
|
end
|
316
277
|
|
278
|
+
def ranges_intersect?(r1, r2)
|
279
|
+
r1.begin > r2.begin ? r2.cover?(r1.begin) : r1.cover?(r2.begin)
|
280
|
+
end
|
281
|
+
|
282
|
+
def range_overlap(range)
|
283
|
+
return 0.0 unless ranges_intersect?(range, time_range)
|
284
|
+
|
285
|
+
[range.end, time_range.end].min - [range.begin, time_range.begin].max
|
286
|
+
end
|
287
|
+
|
288
|
+
# Child segments operating concurrently with this segment may have
|
289
|
+
# start and end times that overlap with this segment's own times. The
|
290
|
+
# amount of overlap needs to be removed from the `children_time` total
|
291
|
+
# when calculating an `@exclusive_duration` value to be added to the
|
292
|
+
# transaction's total time.
|
293
|
+
#
|
294
|
+
# If there aren't any child segments, return 0.0. Otherwise, take the
|
295
|
+
# `@children_timings` array of arrays (each array holds a child
|
296
|
+
# segment's start time and end time), sort it by the first elements
|
297
|
+
# (start times), and use the start and finish times to create Range
|
298
|
+
# objects. Combine all of the child segment ranges that overlap with
|
299
|
+
# one another into new bigger ranges. Then take those bigger ranges
|
300
|
+
# and calculate how much overlap there is between them and this
|
301
|
+
# segment's own time range. Keep a running sum of all of the overlap
|
302
|
+
# amounts and then return it.
|
303
|
+
def overlapping_duration
|
304
|
+
sum = 0.0
|
305
|
+
return sum unless children_time_ranges?
|
306
|
+
|
307
|
+
@children_timings.sort_by!(&:first)
|
308
|
+
range = Range.new(*@children_timings.first)
|
309
|
+
(1..(@children_timings.size - 1)).each do |i|
|
310
|
+
possible = Range.new(*@children_timings[i])
|
311
|
+
|
312
|
+
if ranges_intersect?(range, possible)
|
313
|
+
range = range.begin..possible.end
|
314
|
+
else
|
315
|
+
sum += range_overlap(range)
|
316
|
+
range = possible
|
317
|
+
end
|
318
|
+
end
|
319
|
+
|
320
|
+
sum += range_overlap(range)
|
321
|
+
end
|
322
|
+
|
317
323
|
def transaction_state
|
318
324
|
@transaction_state ||= if @transaction
|
319
325
|
transaction.state
|
@@ -24,7 +24,7 @@ module NewRelic
|
|
24
24
|
@nosql_statement = nil
|
25
25
|
@record_sql = true
|
26
26
|
set_instance_info(host, port_path_or_id)
|
27
|
-
@database_name = database_name
|
27
|
+
@database_name = database_name&.to_s
|
28
28
|
super(Datastores::MetricHelper.scoped_metric_for(product, operation, collection),
|
29
29
|
nil,
|
30
30
|
start_time)
|
@@ -35,7 +35,7 @@ module NewRelic
|
|
35
35
|
end
|
36
36
|
|
37
37
|
def caller_transport_type
|
38
|
-
@caller_transport_type ||=
|
38
|
+
@caller_transport_type ||= 'Unknown'
|
39
39
|
end
|
40
40
|
|
41
41
|
def accept_transport_type_from_api(value)
|
@@ -68,8 +68,9 @@ module NewRelic
|
|
68
68
|
)
|
69
69
|
end
|
70
70
|
|
71
|
-
def log_request_headers(headers, direction =
|
72
|
-
NewRelic::Agent.
|
71
|
+
def log_request_headers(headers, direction = 'OUTGOING')
|
72
|
+
printed_headers = headers.is_a?(NewRelic::Agent::HTTPClients::AbstractRequest) ? headers.headers : headers
|
73
|
+
NewRelic::Agent.logger.debug("#{direction} REQUEST HEADERS: #{printed_headers}")
|
73
74
|
end
|
74
75
|
|
75
76
|
def insert_headers(headers)
|
@@ -82,12 +83,12 @@ module NewRelic
|
|
82
83
|
end
|
83
84
|
|
84
85
|
def consume_message_headers(headers, tracer_state, transport_type)
|
85
|
-
log_request_headers(headers,
|
86
|
+
log_request_headers(headers, 'INCOMING')
|
86
87
|
consume_message_distributed_tracing_headers(headers, transport_type)
|
87
88
|
consume_message_cross_app_tracing_headers(headers, tracer_state)
|
88
89
|
consume_message_synthetics_headers(headers)
|
89
90
|
rescue => e
|
90
|
-
NewRelic::Agent.logger.error(
|
91
|
+
NewRelic::Agent.logger.error('Error in consume_message_headers', e)
|
91
92
|
end
|
92
93
|
|
93
94
|
def assign_intrinsics
|
@@ -135,7 +136,7 @@ module NewRelic
|
|
135
136
|
transaction.synthetics_payload = incoming_payload
|
136
137
|
end
|
137
138
|
rescue => e
|
138
|
-
NewRelic::Agent.logger.error(
|
139
|
+
NewRelic::Agent.logger.error('Error in consume_message_synthetics_header', e)
|
139
140
|
end
|
140
141
|
|
141
142
|
def consume_message_distributed_tracing_headers(headers, transport_type)
|