newrelic_rpm 8.16.0 → 9.2.2
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 +4 -106
- data/.rubocop_todo.yml +13 -14
- data/.simplecov +2 -1
- data/Brewfile +1 -0
- data/CHANGELOG.md +225 -0
- data/CONTRIBUTING.md +1 -1
- data/Gemfile +1 -1
- data/Guardfile +8 -7
- data/README.md +3 -2
- data/Rakefile +8 -8
- data/Thorfile +1 -1
- data/bin/newrelic +1 -0
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +36 -36
- data/init.rb +1 -1
- data/lib/new_relic/agent/agent.rb +3 -16
- data/lib/new_relic/agent/agent_helpers/connect.rb +5 -10
- 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 +3 -4
- 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 -4
- 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 +8 -8
- data/lib/new_relic/agent/configuration/default_source.rb +200 -588
- data/lib/new_relic/agent/configuration/environment_source.rb +2 -2
- data/lib/new_relic/agent/configuration/high_security_source.rb +3 -5
- data/lib/new_relic/agent/configuration/manager.rb +15 -2
- data/lib/new_relic/agent/configuration/security_policy_source.rb +10 -26
- 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 -18
- 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 +8 -10
- 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 +36 -8
- data/lib/new_relic/agent/error_filter.rb +5 -5
- 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 +2 -2
- 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 +6 -4
- 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 +20 -0
- data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
- data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
- data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +4 -4
- data/lib/new_relic/agent/instrumentation/grape.rb +4 -4
- 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 +10 -10
- 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 +2 -2
- 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 +8 -15
- data/lib/new_relic/agent/instrumentation/rake.rb +3 -3
- 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/redis.rb +1 -1
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/resque.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sequel.rb +8 -9
- 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/thread/instrumentation.rb +3 -7
- 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 -5
- 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/security_policy_settings.rb +0 -1
- data/lib/new_relic/agent/new_relic_service.rb +15 -16
- 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/rules_engine/segment_terms_rule.rb +0 -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 +19 -9
- data/lib/new_relic/agent/transaction/abstract_segment.rb +54 -48
- 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 +10 -4
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction.rb +60 -52
- 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 +79 -35
- 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 +23 -23
- 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 +6 -6
- data/lib/new_relic/control/instrumentation.rb +1 -15
- data/lib/new_relic/control/private_instance_methods.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +14 -18
- 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/local_environment.rb +0 -10
- 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 -1
- data/lib/new_relic/version.rb +3 -3
- data/lib/newrelic_rpm.rb +4 -4
- data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +5 -5
- data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +4 -4
- data/lib/tasks/config.rake +12 -12
- data/lib/tasks/coverage_report.rake +4 -4
- data/lib/tasks/helpers/format.rb +10 -10
- data/lib/tasks/helpers/removers.rb +5 -5
- data/lib/tasks/install.rake +4 -4
- data/lib/tasks/instrumentation_generator/instrumentation.thor +15 -18
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +1 -1
- 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 +10 -13
- data/newrelic_rpm.gemspec +29 -26
- data/test/agent_helper.rb +25 -24
- metadata +84 -16
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -83
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -33
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -215
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -36
- data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -41
- data/lib/new_relic/agent/range_extensions.rb +0 -27
@@ -20,7 +20,7 @@ module NewRelic
|
|
20
20
|
end
|
21
21
|
end
|
22
22
|
|
23
|
-
SUPPORTABILITY_PREFIX =
|
23
|
+
SUPPORTABILITY_PREFIX = 'Supportability/TraceContext'
|
24
24
|
CREATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/Create"
|
25
25
|
ACCEPT_PREFIX = "#{SUPPORTABILITY_PREFIX}/Accept"
|
26
26
|
TRACESTATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/TraceState"
|
@@ -73,7 +73,7 @@ module NewRelic
|
|
73
73
|
true
|
74
74
|
rescue Exception => e
|
75
75
|
NewRelic::Agent.increment_metric(CREATE_EXCEPTION_METRIC)
|
76
|
-
NewRelic::Agent.logger.warn(
|
76
|
+
NewRelic::Agent.logger.warn('Failed to create trace context payload', e)
|
77
77
|
false
|
78
78
|
end
|
79
79
|
|
@@ -95,7 +95,7 @@ module NewRelic
|
|
95
95
|
|
96
96
|
def create_trace_state_payload
|
97
97
|
unless Agent.config[:'distributed_tracing.enabled']
|
98
|
-
NewRelic::Agent.logger.warn(
|
98
|
+
NewRelic::Agent.logger.warn('Not configured to create WC3 trace context payload')
|
99
99
|
return
|
100
100
|
end
|
101
101
|
|
@@ -144,7 +144,7 @@ module NewRelic
|
|
144
144
|
true
|
145
145
|
rescue => e
|
146
146
|
NewRelic::Agent.increment_metric(ACCEPT_EXCEPTION_METRIC)
|
147
|
-
NewRelic::Agent.logger.warn(
|
147
|
+
NewRelic::Agent.logger.warn('Failed to accept trace context payload', e)
|
148
148
|
false
|
149
149
|
end
|
150
150
|
|
@@ -58,7 +58,7 @@ module NewRelic
|
|
58
58
|
end
|
59
59
|
|
60
60
|
def to_s_compact
|
61
|
-
str =
|
61
|
+
str = +''
|
62
62
|
str << metric_name
|
63
63
|
if children.any?
|
64
64
|
str << "{#{children.map { |cs| cs.to_s_compact }.join(',')}}"
|
@@ -67,9 +67,9 @@ module NewRelic
|
|
67
67
|
end
|
68
68
|
|
69
69
|
def to_debug_str(depth)
|
70
|
-
tab =
|
70
|
+
tab = (+' ') * depth
|
71
71
|
s = tab.clone
|
72
|
-
s << ">> #{'%3i ms' % (@entry_timestamp * 1000)} [#{self.class.name.split(
|
72
|
+
s << ">> #{'%3i ms' % (@entry_timestamp * 1000)} [#{self.class.name.split('::').last}] #{metric_name} \n"
|
73
73
|
unless params.empty?
|
74
74
|
params.each do |k, v|
|
75
75
|
s << "#{tab} -#{'%-16s' % k}: #{v.to_s[0..80]}\n"
|
@@ -136,10 +136,8 @@ module NewRelic
|
|
136
136
|
def each_node(&block)
|
137
137
|
yield(self)
|
138
138
|
|
139
|
-
|
140
|
-
|
141
|
-
node.each_node(&block)
|
142
|
-
end
|
139
|
+
@children&.each do |node|
|
140
|
+
node.each_node(&block)
|
143
141
|
end
|
144
142
|
end
|
145
143
|
|
@@ -149,11 +147,14 @@ module NewRelic
|
|
149
147
|
summary = yield(self)
|
150
148
|
summary.current_nest_count += 1 if summary
|
151
149
|
|
150
|
+
# no then branch coverage
|
151
|
+
# rubocop:disable Style/SafeNavigation
|
152
152
|
if @children
|
153
153
|
@children.each do |node|
|
154
154
|
node.each_node_with_nest_tracking(&block)
|
155
155
|
end
|
156
156
|
end
|
157
|
+
# rubocop:enable Style/SafeNavigation
|
157
158
|
|
158
159
|
summary.current_nest_count -= 1 if summary
|
159
160
|
end
|
@@ -29,14 +29,20 @@ module NewRelic
|
|
29
29
|
else
|
30
30
|
segment.record_on_finish = true
|
31
31
|
::NewRelic::Agent.logger.debug("Segment limit of #{segment_limit} reached, ceasing collection.")
|
32
|
+
|
33
|
+
if finished?
|
34
|
+
::NewRelic::Agent.logger.debug("Transaction #{best_name} has finished but segments still being created, resetting state.")
|
35
|
+
NewRelic::Agent::Tracer.state.reset
|
36
|
+
NewRelic::Agent.record_metric('Supportability/Transaction/SegmentLimitReachedAfterFinished/ResetState', 1)
|
37
|
+
end
|
32
38
|
end
|
33
39
|
segment.transaction_assigned
|
34
40
|
end
|
35
41
|
|
36
42
|
def segment_complete(segment)
|
37
43
|
# if parent was in another thread, remove the current_segment entry for this thread
|
38
|
-
if segment.parent && segment.parent.
|
39
|
-
remove_current_segment_by_thread_id(::
|
44
|
+
if segment.parent && segment.parent.starting_segment_key != NewRelic::Agent::Tracer.current_segment_key
|
45
|
+
remove_current_segment_by_thread_id(NewRelic::Agent::Tracer.current_segment_key)
|
40
46
|
else
|
41
47
|
set_current_segment(segment.parent)
|
42
48
|
end
|
@@ -52,8 +58,8 @@ module NewRelic
|
|
52
58
|
segments.each { |s| s.finalize }
|
53
59
|
end
|
54
60
|
|
55
|
-
WEB_TRANSACTION_TOTAL_TIME =
|
56
|
-
OTHER_TRANSACTION_TOTAL_TIME =
|
61
|
+
WEB_TRANSACTION_TOTAL_TIME = 'WebTransactionTotalTime'.freeze
|
62
|
+
OTHER_TRANSACTION_TOTAL_TIME = 'OtherTransactionTotalTime'.freeze
|
57
63
|
|
58
64
|
def record_total_time_metrics
|
59
65
|
total_time_metric = if recording_web_transaction?
|
@@ -63,7 +63,7 @@ module NewRelic
|
|
63
63
|
#
|
64
64
|
# This value will be forcibly capped by the max_capacity
|
65
65
|
def capacity
|
66
|
-
raise NotImplementedError.new(
|
66
|
+
raise NotImplementedError.new('TransactionSampleBuffer subclasses must provide a capacity override')
|
67
67
|
end
|
68
68
|
|
69
69
|
# Apply hard upper limit to the capacity to prevent users from
|
@@ -23,10 +23,10 @@ module NewRelic
|
|
23
23
|
include Tracing
|
24
24
|
|
25
25
|
# for nested transactions
|
26
|
-
NESTED_TRANSACTION_PREFIX =
|
27
|
-
CONTROLLER_PREFIX =
|
28
|
-
MIDDLEWARE_PREFIX =
|
29
|
-
OTHER_TRANSACTION_PREFIX =
|
26
|
+
NESTED_TRANSACTION_PREFIX = 'Nested/'
|
27
|
+
CONTROLLER_PREFIX = 'Controller/'
|
28
|
+
MIDDLEWARE_PREFIX = 'Middleware/Rack/'
|
29
|
+
OTHER_TRANSACTION_PREFIX = 'OtherTransaction/'
|
30
30
|
TASK_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Background/"
|
31
31
|
RAKE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Rake/"
|
32
32
|
MESSAGE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Message/"
|
@@ -37,24 +37,21 @@ module NewRelic
|
|
37
37
|
|
38
38
|
WEB_TRANSACTION_CATEGORIES = [:web, :controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
|
39
39
|
|
40
|
-
MIDDLEWARE_SUMMARY_METRICS = [
|
41
|
-
WEB_SUMMARY_METRIC =
|
40
|
+
MIDDLEWARE_SUMMARY_METRICS = ['Middleware/all'].freeze
|
41
|
+
WEB_SUMMARY_METRIC = 'HttpDispatcher'
|
42
42
|
OTHER_SUMMARY_METRIC = "#{OTHER_TRANSACTION_PREFIX}all"
|
43
|
-
QUEUE_TIME_METRIC =
|
43
|
+
QUEUE_TIME_METRIC = 'WebFrontend/QueueTime'
|
44
44
|
|
45
|
-
APDEX_S =
|
46
|
-
APDEX_T =
|
47
|
-
APDEX_F =
|
48
|
-
APDEX_ALL_METRIC =
|
49
|
-
APDEX_METRIC =
|
50
|
-
APDEX_OTHER_METRIC =
|
51
|
-
APDEX_TXN_METRIC_PREFIX =
|
52
|
-
APDEX_OTHER_TXN_METRIC_PREFIX =
|
45
|
+
APDEX_S = 'S'
|
46
|
+
APDEX_T = 'T'
|
47
|
+
APDEX_F = 'F'
|
48
|
+
APDEX_ALL_METRIC = 'ApdexAll'
|
49
|
+
APDEX_METRIC = 'Apdex'
|
50
|
+
APDEX_OTHER_METRIC = 'ApdexOther'
|
51
|
+
APDEX_TXN_METRIC_PREFIX = 'Apdex/'
|
52
|
+
APDEX_OTHER_TXN_METRIC_PREFIX = 'ApdexOther/Transaction/'
|
53
53
|
|
54
|
-
JRUBY_CPU_TIME_ERROR =
|
55
|
-
|
56
|
-
# reference to the transaction state managing this transaction
|
57
|
-
attr_accessor :state
|
54
|
+
JRUBY_CPU_TIME_ERROR = 'Error calculating JRuby CPU Time'
|
58
55
|
|
59
56
|
# A Time instance for the start time, never nil
|
60
57
|
attr_accessor :start_time
|
@@ -121,7 +118,6 @@ module NewRelic
|
|
121
118
|
def self.start_new_transaction(state, category, options)
|
122
119
|
txn = Transaction.new(category, options)
|
123
120
|
state.reset(txn)
|
124
|
-
txn.state = state
|
125
121
|
txn.start(options)
|
126
122
|
txn
|
127
123
|
end
|
@@ -159,7 +155,7 @@ module NewRelic
|
|
159
155
|
NewRelic::Agent.record_api_supportability_metric(:recording_web_transaction?)
|
160
156
|
|
161
157
|
txn = tl_current
|
162
|
-
txn
|
158
|
+
txn&.recording_web_transaction?
|
163
159
|
end
|
164
160
|
|
165
161
|
def self.apdex_bucket(duration, failed, apdex_t)
|
@@ -185,20 +181,21 @@ module NewRelic
|
|
185
181
|
|
186
182
|
def add_agent_attribute(key, value, default_destinations)
|
187
183
|
@attributes.add_agent_attribute(key, value, default_destinations)
|
188
|
-
|
184
|
+
# the following line needs else branch coverage
|
185
|
+
current_segment.add_agent_attribute(key, value) if current_segment # rubocop:disable Style/SafeNavigation
|
189
186
|
end
|
190
187
|
|
191
188
|
def self.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
|
192
189
|
if txn = tl_current
|
193
190
|
txn.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
|
194
191
|
else
|
195
|
-
NewRelic::Agent.logger.debug(
|
192
|
+
NewRelic::Agent.logger.debug('Attempted to merge untrusted attributes without transaction')
|
196
193
|
end
|
197
194
|
end
|
198
195
|
|
199
196
|
def merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
|
200
197
|
@attributes.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
|
201
|
-
current_segment
|
198
|
+
current_segment&.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
|
202
199
|
end
|
203
200
|
|
204
201
|
@@java_classes_loaded = false
|
@@ -213,7 +210,7 @@ module NewRelic
|
|
213
210
|
end
|
214
211
|
end
|
215
212
|
|
216
|
-
def initialize(category, options)
|
213
|
+
def initialize(category, options) # rubocop:disable Metrics/AbcSize
|
217
214
|
@nesting_max_depth = 0
|
218
215
|
@current_segment_by_thread = {}
|
219
216
|
@current_segment_lock = Mutex.new
|
@@ -248,6 +245,7 @@ module NewRelic
|
|
248
245
|
@priority = nil
|
249
246
|
|
250
247
|
@starting_thread_id = Thread.current.object_id
|
248
|
+
@starting_segment_key = current_segment_key
|
251
249
|
|
252
250
|
@attributes = Attributes.new(NewRelic::Agent.instance.attribute_filter)
|
253
251
|
|
@@ -260,20 +258,26 @@ module NewRelic
|
|
260
258
|
end
|
261
259
|
end
|
262
260
|
|
263
|
-
def
|
264
|
-
::
|
261
|
+
def state
|
262
|
+
NewRelic::Agent::Tracer.state
|
265
263
|
end
|
266
264
|
|
267
|
-
def
|
268
|
-
|
269
|
-
|
270
|
-
|
265
|
+
def current_segment_key
|
266
|
+
Tracer.current_segment_key
|
267
|
+
end
|
268
|
+
|
269
|
+
def parent_segment_key
|
270
|
+
(::Fiber.current.nr_parent_key if ::Fiber.current.respond_to?(:nr_parent_key)) || (::Thread.current.nr_parent_key if ::Thread.current.respond_to?(:nr_parent_key))
|
271
|
+
end
|
271
272
|
|
272
|
-
|
273
|
+
def current_segment
|
274
|
+
current_segment_by_thread[current_segment_key] ||
|
275
|
+
current_segment_by_thread[parent_segment_key] ||
|
276
|
+
current_segment_by_thread[@starting_segment_key]
|
273
277
|
end
|
274
278
|
|
275
279
|
def set_current_segment(new_segment)
|
276
|
-
@current_segment_lock.synchronize { current_segment_by_thread[
|
280
|
+
@current_segment_lock.synchronize { current_segment_by_thread[current_segment_key] = new_segment }
|
277
281
|
end
|
278
282
|
|
279
283
|
def remove_current_segment_by_thread_id(id)
|
@@ -306,15 +310,15 @@ module NewRelic
|
|
306
310
|
end
|
307
311
|
|
308
312
|
def referer
|
309
|
-
@request_attributes
|
313
|
+
@request_attributes&.referer
|
310
314
|
end
|
311
315
|
|
312
316
|
def request_path
|
313
|
-
@request_attributes
|
317
|
+
@request_attributes&.request_path
|
314
318
|
end
|
315
319
|
|
316
320
|
def request_port
|
317
|
-
@request_attributes
|
321
|
+
@request_attributes&.port
|
318
322
|
end
|
319
323
|
|
320
324
|
# This transaction-local hash may be used as temporary storage by
|
@@ -359,10 +363,8 @@ module NewRelic
|
|
359
363
|
def set_overriding_transaction_name(name, category)
|
360
364
|
return log_frozen_name(name) if name_frozen?
|
361
365
|
|
362
|
-
|
363
|
-
|
364
|
-
@category = category if category
|
365
|
-
end
|
366
|
+
self.overridden_name = name
|
367
|
+
@category = category if category
|
366
368
|
end
|
367
369
|
|
368
370
|
def log_frozen_name(name)
|
@@ -437,6 +439,10 @@ module NewRelic
|
|
437
439
|
segments.first
|
438
440
|
end
|
439
441
|
|
442
|
+
def finished?
|
443
|
+
initial_segment&.finished?
|
444
|
+
end
|
445
|
+
|
440
446
|
def create_initial_segment(options = {})
|
441
447
|
segment = create_segment(@default_name, options)
|
442
448
|
segment.record_scoped_metric = false
|
@@ -532,7 +538,7 @@ module NewRelic
|
|
532
538
|
|
533
539
|
commit!(initial_segment.name) unless @ignore_this_transaction
|
534
540
|
rescue => e
|
535
|
-
NewRelic::Agent.logger.error(
|
541
|
+
NewRelic::Agent.logger.error('Exception during Transaction#finish', e)
|
536
542
|
nil
|
537
543
|
ensure
|
538
544
|
state.reset
|
@@ -593,9 +599,7 @@ module NewRelic
|
|
593
599
|
add_agent_attribute(:'response.headers.contentType', response_content_type, default_destinations)
|
594
600
|
end
|
595
601
|
|
596
|
-
|
597
|
-
@request_attributes.assign_agent_attributes(self)
|
598
|
-
end
|
602
|
+
@request_attributes&.assign_agent_attributes(self)
|
599
603
|
|
600
604
|
display_host = Agent.config[:'process_host.display_name']
|
601
605
|
unless display_host == NewRelic::Agent::Hostname.get
|
@@ -734,15 +738,19 @@ module NewRelic
|
|
734
738
|
def record_exceptions
|
735
739
|
error_recorded = false
|
736
740
|
@exceptions.each do |exception, options|
|
737
|
-
|
738
|
-
options[:port] = request_port if request_port
|
739
|
-
options[:metric] = best_name
|
740
|
-
options[:attributes] = @attributes
|
741
|
-
|
742
|
-
span_id = options.delete(:span_id)
|
743
|
-
error_recorded = !!agent.error_collector.notice_error(exception, options, span_id) || error_recorded
|
741
|
+
error_recorded = record_exception(exception, options, error_recorded)
|
744
742
|
end
|
745
|
-
payload[:error
|
743
|
+
payload&.[]=(:error, error_recorded)
|
744
|
+
end
|
745
|
+
|
746
|
+
def record_exception(exception, options, error_recorded)
|
747
|
+
options[:uri] ||= request_path if request_path
|
748
|
+
options[:port] = request_port if request_port
|
749
|
+
options[:metric] = best_name
|
750
|
+
options[:attributes] = @attributes
|
751
|
+
|
752
|
+
span_id = options.delete(:span_id)
|
753
|
+
!!agent.error_collector.notice_error(exception, options, span_id) || error_recorded
|
746
754
|
end
|
747
755
|
|
748
756
|
# Do not call this. Invoke the class method instead.
|
@@ -28,11 +28,11 @@ module NewRelic
|
|
28
28
|
SAMPLED_KEY = 'sampled'.freeze
|
29
29
|
GUID_KEY = 'nr.transactionGuid'.freeze
|
30
30
|
REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
|
31
|
-
SYNTHETICS_RESOURCE_ID_KEY =
|
32
|
-
SYNTHETICS_JOB_ID_KEY =
|
33
|
-
SYNTHETICS_MONITOR_ID_KEY =
|
34
|
-
PRIORITY_KEY =
|
35
|
-
SPAN_ID_KEY =
|
31
|
+
SYNTHETICS_RESOURCE_ID_KEY = 'nr.syntheticsResourceId'.freeze
|
32
|
+
SYNTHETICS_JOB_ID_KEY = 'nr.syntheticsJobId'.freeze
|
33
|
+
SYNTHETICS_MONITOR_ID_KEY = 'nr.syntheticsMonitorId'.freeze
|
34
|
+
PRIORITY_KEY = 'priority'.freeze
|
35
|
+
SPAN_ID_KEY = 'spanId'.freeze
|
36
36
|
|
37
37
|
def create(noticed_error, payload, span_id)
|
38
38
|
[
|
@@ -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?
|
@@ -38,7 +38,7 @@ module NewRelic
|
|
38
38
|
end
|
39
39
|
|
40
40
|
def record_sampling_rate(metadata) # THREAD_LOCAL_ACCESS
|
41
|
-
NewRelic::Agent.logger.debug(
|
41
|
+
NewRelic::Agent.logger.debug('Sampled %d / %d (%.1f %%) requests this cycle, %d / %d (%.1f %%) since startup' % [
|
42
42
|
metadata[:captured],
|
43
43
|
metadata[:seen],
|
44
44
|
(metadata[:captured].to_f / metadata[:seen] * 100.0),
|
@@ -48,8 +48,8 @@ module NewRelic
|
|
48
48
|
])
|
49
49
|
|
50
50
|
engine = NewRelic::Agent.instance.stats_engine
|
51
|
-
engine.tl_record_supportability_metric_count(
|
52
|
-
engine.tl_record_supportability_metric_count(
|
51
|
+
engine.tl_record_supportability_metric_count('TransactionEventAggregator/requests', metadata[:seen])
|
52
|
+
engine.tl_record_supportability_metric_count('TransactionEventAggregator/samples', metadata[:captured])
|
53
53
|
end
|
54
54
|
end
|
55
55
|
end
|
@@ -35,9 +35,9 @@ module NewRelic
|
|
35
35
|
CAT_REFERRING_PATH_HASH_KEY = 'nr.referringPathHash'
|
36
36
|
CAT_ALTERNATE_PATH_HASHES_KEY = 'nr.alternatePathHashes'
|
37
37
|
APDEX_PERF_ZONE_KEY = 'nr.apdexPerfZone'
|
38
|
-
SYNTHETICS_RESOURCE_ID_KEY =
|
39
|
-
SYNTHETICS_JOB_ID_KEY =
|
40
|
-
SYNTHETICS_MONITOR_ID_KEY =
|
38
|
+
SYNTHETICS_RESOURCE_ID_KEY = 'nr.syntheticsResourceId'
|
39
|
+
SYNTHETICS_JOB_ID_KEY = 'nr.syntheticsJobId'
|
40
|
+
SYNTHETICS_MONITOR_ID_KEY = 'nr.syntheticsMonitorId'
|
41
41
|
|
42
42
|
def create(payload)
|
43
43
|
intrinsics = {
|
@@ -34,13 +34,13 @@ module NewRelic
|
|
34
34
|
threshold = Agent.config[:'transaction_tracer.transaction_threshold']
|
35
35
|
::NewRelic::Agent.logger.debug("Transaction tracing threshold is #{threshold} seconds.")
|
36
36
|
else
|
37
|
-
::NewRelic::Agent.logger.debug(
|
37
|
+
::NewRelic::Agent.logger.debug('Transaction traces will not be sent to the New Relic service.')
|
38
38
|
end
|
39
39
|
end
|
40
40
|
|
41
41
|
Agent.config.register_callback(:'transaction_tracer.record_sql') do |config|
|
42
42
|
if config == 'raw'
|
43
|
-
::NewRelic::Agent.logger.warn(
|
43
|
+
::NewRelic::Agent.logger.warn('Agent is configured to send raw SQL to the service')
|
44
44
|
end
|
45
45
|
end
|
46
46
|
end
|
@@ -81,7 +81,7 @@ module NewRelic
|
|
81
81
|
begin
|
82
82
|
sample.prepare_to_send!
|
83
83
|
rescue => e
|
84
|
-
NewRelic::Agent.logger.error(
|
84
|
+
NewRelic::Agent.logger.error('Failed to prepare transaction trace. Error: ', e)
|
85
85
|
false
|
86
86
|
else
|
87
87
|
true
|
@@ -101,7 +101,8 @@ module NewRelic
|
|
101
101
|
|
102
102
|
def thread_is_alive?(thread_id)
|
103
103
|
thread = thread_by_id(thread_id)
|
104
|
-
|
104
|
+
# needs else branch coverage
|
105
|
+
thread && thread.alive? # rubocop:disable Style/SafeNavigation
|
105
106
|
rescue StandardError
|
106
107
|
false
|
107
108
|
end
|
@@ -144,10 +145,13 @@ module NewRelic
|
|
144
145
|
elapsed
|
145
146
|
end
|
146
147
|
|
148
|
+
# this method has no test coverage
|
147
149
|
def log_missing_elapsed_transaction_time
|
148
|
-
|
150
|
+
# rubocop:disable Style/SafeNavigation
|
151
|
+
transaction_name = transaction_name = Tracer.current_transaction &&
|
149
152
|
Tracer.current_transaction.best_name ||
|
150
|
-
|
153
|
+
'unknown'
|
154
|
+
# rubocop:enable Style/SafeNavigation
|
151
155
|
NewRelic::Agent.logger.warn("Unable to calculate elapsed transaction time for #{transaction_name}")
|
152
156
|
end
|
153
157
|
end
|
@@ -6,9 +6,9 @@ module NewRelic
|
|
6
6
|
module Agent
|
7
7
|
module Utilization
|
8
8
|
class Azure < Vendor
|
9
|
-
vendor_name
|
10
|
-
endpoint
|
11
|
-
headers
|
9
|
+
vendor_name 'azure'
|
10
|
+
endpoint 'http://169.254.169.254/metadata/instance/compute?api-version=2017-03-01'
|
11
|
+
headers 'Metadata' => 'true'
|
12
12
|
keys %w[vmId name vmSize location]
|
13
13
|
key_transforms :to_sym
|
14
14
|
end
|
@@ -8,9 +8,9 @@ module NewRelic
|
|
8
8
|
module Agent
|
9
9
|
module Utilization
|
10
10
|
class GCP < Vendor
|
11
|
-
vendor_name
|
12
|
-
endpoint
|
13
|
-
headers
|
11
|
+
vendor_name 'gcp'
|
12
|
+
endpoint 'http://metadata.google.internal/computeMetadata/v1/instance/?recursive=true'
|
13
|
+
headers 'Metadata-Flavor' => 'Google'
|
14
14
|
keys %w[id machineType name zone]
|
15
15
|
key_transforms :to_sym
|
16
16
|
|
@@ -82,18 +82,19 @@ module NewRelic
|
|
82
82
|
|
83
83
|
def supports?(key)
|
84
84
|
case key
|
85
|
-
when :gc_runs,
|
85
|
+
when :gc_runs,
|
86
|
+
:total_allocated_object,
|
87
|
+
:heap_live,
|
88
|
+
:heap_free,
|
89
|
+
:thread_count,
|
90
|
+
:major_gc_count,
|
91
|
+
:minor_gc_count,
|
92
|
+
:constant_cache_invalidations
|
86
93
|
true
|
87
94
|
when :gc_total_time
|
88
95
|
NewRelic::LanguageSupport.gc_profiler_enabled?
|
89
|
-
when :major_gc_count
|
90
|
-
RUBY_VERSION >= '2.1.0'
|
91
|
-
when :minor_gc_count
|
92
|
-
RUBY_VERSION >= '2.1.0'
|
93
96
|
when :method_cache_invalidations
|
94
|
-
RUBY_VERSION
|
95
|
-
when :constant_cache_invalidations
|
96
|
-
RUBY_VERSION >= '2.1.0'
|
97
|
+
RUBY_VERSION < '3.0.0'
|
97
98
|
when :constant_cache_misses
|
98
99
|
RUBY_VERSION >= '3.2.0'
|
99
100
|
else
|
@@ -88,7 +88,7 @@ module NewRelic
|
|
88
88
|
raise
|
89
89
|
rescue => e
|
90
90
|
# Don't blow out the stack for anything that hasn't already propagated
|
91
|
-
::NewRelic::Agent.logger.error(
|
91
|
+
::NewRelic::Agent.logger.error('Error running task in Agent Worker Loop:', e)
|
92
92
|
end
|
93
93
|
end
|
94
94
|
end
|