newrelic_rpm 8.16.0 → 9.1.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 +3 -41
- data/.rubocop_todo.yml +13 -14
- data/.simplecov +1 -1
- data/CHANGELOG.md +184 -0
- data/CONTRIBUTING.md +1 -1
- data/Gemfile +1 -1
- data/Guardfile +7 -7
- data/README.md +3 -2
- data/Rakefile +8 -8
- data/Thorfile +1 -1
- 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 +155 -530
- 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 +2 -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_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/instrumentation.rb +3 -3
- 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/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 +1 -1
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +3 -3
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +1 -1
- 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/instrumentation.rb +2 -1
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +3 -3
- 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/instrumentation.rb +2 -2
- 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 +5 -5
- 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/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 +6 -6
- 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 -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/rules_engine/segment_terms_rule.rb +0 -1
- data/lib/new_relic/agent/sampler.rb +1 -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 +18 -8
- data/lib/new_relic/agent/transaction/abstract_segment.rb +9 -9
- 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 +6 -6
- 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 +4 -4
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction.rb +56 -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 -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/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 +2 -2
- 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 +3 -3
- 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 +7 -10
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +1 -1
- data/lib/tasks/multiverse.rb +12 -6
- data/lib/tasks/tests.rake +6 -6
- data/newrelic.yml +5 -8
- data/newrelic_rpm.gemspec +29 -26
- data/test/agent_helper.rb +25 -24
- metadata +13 -14
- 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
@@ -142,20 +142,16 @@ module NewRelic
|
|
142
142
|
# the transaction sampler that handles recording transactions
|
143
143
|
attr_reader :transaction_sampler
|
144
144
|
attr_reader :sql_sampler
|
145
|
-
# manages agent commands we receive from the collector, and the handlers
|
146
|
-
attr_reader :agent_command_router
|
147
145
|
# error collector is a simple collection of recorded errors
|
148
146
|
attr_reader :error_collector
|
149
|
-
attr_reader :harvest_samplers
|
150
147
|
# whether we should record raw, obfuscated, or no sql
|
151
148
|
attr_reader :record_sql
|
152
149
|
# builder for JS agent scripts to inject
|
153
150
|
attr_reader :javascript_instrumentor
|
154
151
|
# cross application tracing ids and encoding
|
155
152
|
attr_reader :cross_process_id
|
156
|
-
attr_reader :cross_app_encoding_bytes
|
157
153
|
# service for communicating with collector
|
158
|
-
|
154
|
+
attr_reader :service
|
159
155
|
# Global events dispatcher. This will provides our primary mechanism
|
160
156
|
# for agent-wide events, such as finishing configuration, error notification
|
161
157
|
# and request before/after from Rack.
|
@@ -168,8 +164,6 @@ module NewRelic
|
|
168
164
|
# collector on connect. The former are applied during txns,
|
169
165
|
# the latter during harvest.
|
170
166
|
attr_accessor :transaction_rules
|
171
|
-
# Responsible for restarting the harvest thread
|
172
|
-
attr_reader :harvester
|
173
167
|
# GC::Profiler.total_time is not monotonic so we wrap it.
|
174
168
|
attr_reader :monotonic_gc_profiler
|
175
169
|
attr_reader :custom_event_aggregator
|
@@ -178,7 +172,6 @@ module NewRelic
|
|
178
172
|
attr_reader :transaction_event_recorder
|
179
173
|
attr_reader :attribute_filter
|
180
174
|
attr_reader :adaptive_sampler
|
181
|
-
attr_reader :environment_report
|
182
175
|
|
183
176
|
def transaction_event_aggregator
|
184
177
|
@transaction_event_recorder.transaction_event_aggregator
|
@@ -262,8 +255,8 @@ module NewRelic
|
|
262
255
|
# if litespeed, then ignore all future SIGUSR1 - it's
|
263
256
|
# litespeed trying to shut us down
|
264
257
|
if Agent.config[:dispatcher] == :litespeed
|
265
|
-
Signal.trap(
|
266
|
-
Signal.trap(
|
258
|
+
Signal.trap('SIGUSR1', 'IGNORE')
|
259
|
+
Signal.trap('SIGTERM', 'IGNORE')
|
267
260
|
end
|
268
261
|
end
|
269
262
|
|
@@ -355,12 +348,6 @@ module NewRelic
|
|
355
348
|
end
|
356
349
|
|
357
350
|
public :merge_data_for_endpoint
|
358
|
-
|
359
|
-
# Delegates to the control class to determine the root
|
360
|
-
# directory of this project
|
361
|
-
def determine_home_directory
|
362
|
-
control.root
|
363
|
-
end
|
364
351
|
end
|
365
352
|
|
366
353
|
extend ClassMethods
|
@@ -64,7 +64,7 @@ module NewRelic
|
|
64
64
|
def handle_license_error(error)
|
65
65
|
::NewRelic::Agent.logger.error( \
|
66
66
|
error.message, \
|
67
|
-
|
67
|
+
'Visit NewRelic.com to obtain a valid license key, or to upgrade your account.'
|
68
68
|
)
|
69
69
|
disconnect
|
70
70
|
end
|
@@ -115,7 +115,7 @@ module NewRelic
|
|
115
115
|
::NewRelic::Agent.logger.debug("Connected to NewRelic Service at #{@service.collector.name}")
|
116
116
|
::NewRelic::Agent.logger.debug("Agent Run = #{@service.agent_id}.")
|
117
117
|
::NewRelic::Agent.logger.debug("Connection data = #{config_data.inspect}")
|
118
|
-
if config_data['messages']
|
118
|
+
if config_data['messages']&.any?
|
119
119
|
log_collector_messages(config_data['messages'])
|
120
120
|
end
|
121
121
|
end
|
@@ -126,11 +126,6 @@ module NewRelic
|
|
126
126
|
end
|
127
127
|
end
|
128
128
|
|
129
|
-
# apdex_f is always 4 times the apdex_t
|
130
|
-
def apdex_f
|
131
|
-
(Agent.config[:apdex_t] * 4).to_f
|
132
|
-
end
|
133
|
-
|
134
129
|
class WaitOnConnectTimeout < StandardError
|
135
130
|
end
|
136
131
|
|
@@ -149,7 +144,7 @@ module NewRelic
|
|
149
144
|
return if connected?
|
150
145
|
|
151
146
|
@waited_on_connect = true
|
152
|
-
NewRelic::Agent.logger.debug(
|
147
|
+
NewRelic::Agent.logger.debug('Waiting on connect to complete.')
|
153
148
|
|
154
149
|
@wait_on_connect_mutex.synchronize do
|
155
150
|
@wait_on_connect_condition.wait(@wait_on_connect_mutex, timeout)
|
@@ -162,7 +157,7 @@ module NewRelic
|
|
162
157
|
|
163
158
|
def connect_options(options)
|
164
159
|
{
|
165
|
-
keep_retrying:
|
160
|
+
keep_retrying: true,
|
166
161
|
force_reconnect: Agent.config[:force_reconnect]
|
167
162
|
}.merge(options)
|
168
163
|
end
|
@@ -203,7 +198,7 @@ module NewRelic
|
|
203
198
|
rescue StandardError, Timeout::Error, NewRelic::Agent::ServerConnectionException => e
|
204
199
|
retry if retry_from_error?(e, opts)
|
205
200
|
rescue Exception => e
|
206
|
-
::NewRelic::Agent.logger.error(
|
201
|
+
::NewRelic::Agent.logger.error('Exception of unexpected type during Agent#connect():', e)
|
207
202
|
|
208
203
|
raise
|
209
204
|
end
|
@@ -133,18 +133,18 @@ module NewRelic
|
|
133
133
|
rescue ForceRestartException, ForceDisconnectException
|
134
134
|
raise
|
135
135
|
rescue UnrecoverableServerException => e
|
136
|
-
NewRelic::Agent.logger.warn(
|
137
|
-
|
136
|
+
NewRelic::Agent.logger.warn('get_agent_commands message was rejected by remote service, discarding. ' \
|
137
|
+
'Error: ', e)
|
138
138
|
rescue ServerConnectionException => e
|
139
139
|
log_remote_unavailable(:get_agent_commands, e)
|
140
140
|
rescue => e
|
141
|
-
NewRelic::Agent.logger.info(
|
141
|
+
NewRelic::Agent.logger.info('Error during check_for_and_handle_agent_commands, will retry later: ', e)
|
142
142
|
end
|
143
143
|
end
|
144
144
|
|
145
145
|
def log_remote_unavailable(endpoint, e)
|
146
146
|
NewRelic::Agent.logger.debug("Unable to send #{endpoint} data, will try again later. Error: ", e)
|
147
|
-
NewRelic::Agent.record_metric(
|
147
|
+
NewRelic::Agent.record_metric('Supportability/remote_unavailable', 0.0)
|
148
148
|
NewRelic::Agent.record_metric("Supportability/remote_unavailable/#{endpoint.to_s}", 0.0)
|
149
149
|
end
|
150
150
|
end
|
@@ -11,7 +11,7 @@ module NewRelic
|
|
11
11
|
def shutdown
|
12
12
|
return unless started?
|
13
13
|
|
14
|
-
::NewRelic::Agent.logger.info(
|
14
|
+
::NewRelic::Agent.logger.info('Starting Agent shutdown')
|
15
15
|
|
16
16
|
stop_event_loop
|
17
17
|
trap_signals_for_litespeed
|
@@ -48,22 +48,22 @@ module NewRelic
|
|
48
48
|
transmit_data_types
|
49
49
|
shutdown_service
|
50
50
|
|
51
|
-
::NewRelic::Agent.logger.debug(
|
51
|
+
::NewRelic::Agent.logger.debug('Graceful disconnect complete')
|
52
52
|
rescue Timeout::Error, StandardError => e
|
53
53
|
::NewRelic::Agent.logger.debug("Error when disconnecting #{e.class.name}: #{e.message}")
|
54
54
|
end
|
55
55
|
else
|
56
|
-
::NewRelic::Agent.logger.debug(
|
56
|
+
::NewRelic::Agent.logger.debug('Bypassing graceful disconnect - agent not connected')
|
57
57
|
end
|
58
58
|
end
|
59
59
|
|
60
60
|
def shutdown_service
|
61
61
|
if @connected_pid == $$ && !@service.kind_of?(NewRelic::Agent::NewRelicService)
|
62
|
-
::NewRelic::Agent.logger.debug(
|
62
|
+
::NewRelic::Agent.logger.debug('Sending New Relic service agent run shutdown message')
|
63
63
|
@service.shutdown
|
64
64
|
else
|
65
65
|
::NewRelic::Agent.logger.debug("This agent connected from parent process #{@connected_pid}--not sending " \
|
66
|
-
|
66
|
+
'shutdown')
|
67
67
|
end
|
68
68
|
end
|
69
69
|
end
|
@@ -10,9 +10,8 @@ module NewRelic
|
|
10
10
|
# requests, we need to wait until the children are forked
|
11
11
|
# before connecting, otherwise the parent process sends useless data
|
12
12
|
def using_forking_dispatcher?
|
13
|
-
|
14
|
-
|
15
|
-
::NewRelic::Agent.logger.info("Deferring startup of agent reporting thread because " \
|
13
|
+
if [:puma, :passenger, :unicorn].include?(Agent.config[:dispatcher])
|
14
|
+
::NewRelic::Agent.logger.info('Deferring startup of agent reporting thread because ' \
|
16
15
|
"#{Agent.config[:dispatcher]} may fork.")
|
17
16
|
true
|
18
17
|
else
|
@@ -66,7 +65,7 @@ module NewRelic
|
|
66
65
|
def install_exit_handler
|
67
66
|
return unless should_install_exit_handler?
|
68
67
|
|
69
|
-
NewRelic::Agent.logger.debug(
|
68
|
+
NewRelic::Agent.logger.debug('Installing at_exit handler')
|
70
69
|
at_exit { shutdown }
|
71
70
|
end
|
72
71
|
end
|
@@ -8,23 +8,23 @@ module NewRelic
|
|
8
8
|
module StartWorkerThread
|
9
9
|
LOG_ONCE_KEYS_RESET_PERIOD = 60.0
|
10
10
|
|
11
|
-
TRANSACTION_EVENT_DATA =
|
12
|
-
CUSTOM_EVENT_DATA =
|
13
|
-
ERROR_EVENT_DATA =
|
14
|
-
SPAN_EVENT_DATA =
|
15
|
-
LOG_EVENT_DATA =
|
11
|
+
TRANSACTION_EVENT_DATA = 'transaction_event_data'.freeze
|
12
|
+
CUSTOM_EVENT_DATA = 'custom_event_data'.freeze
|
13
|
+
ERROR_EVENT_DATA = 'error_event_data'.freeze
|
14
|
+
SPAN_EVENT_DATA = 'span_event_data'.freeze
|
15
|
+
LOG_EVENT_DATA = 'log_event_data'.freeze
|
16
16
|
|
17
17
|
# Try to launch the worker thread and connect to the server.
|
18
18
|
#
|
19
19
|
# See #connect for a description of connection_options.
|
20
20
|
def start_worker_thread(connection_options = {})
|
21
21
|
if disable = NewRelic::Agent.config[:disable_harvest_thread]
|
22
|
-
NewRelic::Agent.logger.info(
|
22
|
+
NewRelic::Agent.logger.info('Not starting Ruby Agent worker thread because :disable_harvest_thread is ' \
|
23
23
|
"#{disable}")
|
24
24
|
return
|
25
25
|
end
|
26
26
|
|
27
|
-
::NewRelic::Agent.logger.debug(
|
27
|
+
::NewRelic::Agent.logger.debug('Creating Ruby Agent worker thread.')
|
28
28
|
@worker_thread = Threading::AgentThread.create('Worker Loop') do
|
29
29
|
deferred_work!(connection_options)
|
30
30
|
end
|
@@ -42,11 +42,11 @@ module NewRelic
|
|
42
42
|
# The use-case where this typically arises is in cronjob scheduled rake tasks where there's
|
43
43
|
# also some network stability/latency issues happening.
|
44
44
|
def stop_event_loop
|
45
|
-
@event_loop
|
45
|
+
@event_loop&.stop
|
46
46
|
# Wait the end of the event loop thread.
|
47
47
|
if @worker_thread
|
48
48
|
unless @worker_thread.join(3)
|
49
|
-
::NewRelic::Agent.logger.debug(
|
49
|
+
::NewRelic::Agent.logger.debug('Event loop thread did not stop within 3 seconds')
|
50
50
|
end
|
51
51
|
end
|
52
52
|
end
|
@@ -60,36 +60,13 @@ module NewRelic
|
|
60
60
|
end
|
61
61
|
|
62
62
|
def create_and_run_event_loop
|
63
|
-
data_harvest = :"#{Agent.config[:data_report_period]}_second_harvest"
|
64
|
-
event_harvest = :"#{Agent.config[:event_report_period]}_second_harvest"
|
65
|
-
|
66
63
|
@event_loop = create_event_loop
|
64
|
+
data_harvest = :"#{Agent.config[:data_report_period]}_second_harvest"
|
67
65
|
@event_loop.on(data_harvest) do
|
68
66
|
transmit_data
|
69
67
|
end
|
70
|
-
|
71
|
-
|
72
|
-
transmit_analytic_event_data
|
73
|
-
end
|
74
|
-
@event_loop.on(interval_for(CUSTOM_EVENT_DATA)) do
|
75
|
-
transmit_custom_event_data
|
76
|
-
end
|
77
|
-
@event_loop.on(interval_for(ERROR_EVENT_DATA)) do
|
78
|
-
transmit_error_event_data
|
79
|
-
end
|
80
|
-
@event_loop.on(interval_for(SPAN_EVENT_DATA)) do
|
81
|
-
transmit_span_event_data
|
82
|
-
end
|
83
|
-
@event_loop.on(interval_for(LOG_EVENT_DATA)) do
|
84
|
-
transmit_log_event_data
|
85
|
-
end
|
86
|
-
|
87
|
-
@event_loop.on(:reset_log_once_keys) do
|
88
|
-
::NewRelic::Agent.logger.clear_already_logged
|
89
|
-
end
|
90
|
-
@event_loop.fire_every(Agent.config[:data_report_period], data_harvest)
|
91
|
-
@event_loop.fire_every(Agent.config[:event_report_period], event_harvest)
|
92
|
-
@event_loop.fire_every(LOG_ONCE_KEYS_RESET_PERIOD, :reset_log_once_keys)
|
68
|
+
establish_interval_transmissions
|
69
|
+
establish_fire_everies(data_harvest)
|
93
70
|
|
94
71
|
@event_loop.run
|
95
72
|
end
|
@@ -100,7 +77,7 @@ module NewRelic
|
|
100
77
|
def handle_force_restart(error)
|
101
78
|
::NewRelic::Agent.logger.debug(error.message)
|
102
79
|
drop_buffered_data
|
103
|
-
@service
|
80
|
+
@service&.force_restart
|
104
81
|
@connect_state = :pending
|
105
82
|
sleep(30)
|
106
83
|
end
|
@@ -109,7 +86,7 @@ module NewRelic
|
|
109
86
|
# is the worker thread that gathers data and talks to the
|
110
87
|
# server.
|
111
88
|
def handle_force_disconnect(error)
|
112
|
-
::NewRelic::Agent.logger.warn(
|
89
|
+
::NewRelic::Agent.logger.warn('Agent received a ForceDisconnectException from the server, disconnecting. ' \
|
113
90
|
"(#{error.message})")
|
114
91
|
disconnect
|
115
92
|
end
|
@@ -118,7 +95,7 @@ module NewRelic
|
|
118
95
|
# it and disconnecting the agent, since we are now in an
|
119
96
|
# unknown state.
|
120
97
|
def handle_other_error(error)
|
121
|
-
::NewRelic::Agent.logger.error(
|
98
|
+
::NewRelic::Agent.logger.error('Unhandled error in worker thread, disconnecting.')
|
122
99
|
# These errors are fatal (that is, they will prevent the agent from
|
123
100
|
# reporting entirely), so we really want backtraces when they happen
|
124
101
|
::NewRelic::Agent.logger.log_exception(:error, error)
|
@@ -156,11 +133,42 @@ module NewRelic
|
|
156
133
|
# never reaches here unless there is a problem or
|
157
134
|
# the agent is exiting
|
158
135
|
else
|
159
|
-
::NewRelic::Agent.logger.debug(
|
136
|
+
::NewRelic::Agent.logger.debug('No connection. Worker thread ending.')
|
160
137
|
end
|
161
138
|
end
|
162
139
|
end
|
163
140
|
end
|
141
|
+
|
142
|
+
private
|
143
|
+
|
144
|
+
def establish_interval_transmissions
|
145
|
+
@event_loop.on(interval_for(TRANSACTION_EVENT_DATA)) do
|
146
|
+
transmit_analytic_event_data
|
147
|
+
end
|
148
|
+
@event_loop.on(interval_for(CUSTOM_EVENT_DATA)) do
|
149
|
+
transmit_custom_event_data
|
150
|
+
end
|
151
|
+
@event_loop.on(interval_for(ERROR_EVENT_DATA)) do
|
152
|
+
transmit_error_event_data
|
153
|
+
end
|
154
|
+
@event_loop.on(interval_for(SPAN_EVENT_DATA)) do
|
155
|
+
transmit_span_event_data
|
156
|
+
end
|
157
|
+
@event_loop.on(interval_for(LOG_EVENT_DATA)) do
|
158
|
+
transmit_log_event_data
|
159
|
+
end
|
160
|
+
end
|
161
|
+
|
162
|
+
def establish_fire_everies(data_harvest)
|
163
|
+
@event_loop.on(:reset_log_once_keys) do
|
164
|
+
::NewRelic::Agent.logger.clear_already_logged
|
165
|
+
end
|
166
|
+
|
167
|
+
event_harvest = :"#{Agent.config[:event_report_period]}_second_harvest"
|
168
|
+
@event_loop.fire_every(Agent.config[:data_report_period], data_harvest)
|
169
|
+
@event_loop.fire_every(Agent.config[:event_report_period], event_harvest)
|
170
|
+
@event_loop.fire_every(LOG_ONCE_KEYS_RESET_PERIOD, :reset_log_once_keys)
|
171
|
+
end
|
164
172
|
end
|
165
173
|
end
|
166
174
|
end
|
@@ -14,7 +14,7 @@ module NewRelic
|
|
14
14
|
# Check whether we have already started, which is an error condition
|
15
15
|
def already_started?
|
16
16
|
if started?
|
17
|
-
::NewRelic::Agent.logger.error(
|
17
|
+
::NewRelic::Agent.logger.error('Agent Started Already!')
|
18
18
|
true
|
19
19
|
end
|
20
20
|
end
|
@@ -87,15 +87,15 @@ module NewRelic
|
|
87
87
|
end
|
88
88
|
|
89
89
|
def log_app_name
|
90
|
-
::NewRelic::Agent.logger.info("Application: #{Agent.config[:app_name].join(
|
90
|
+
::NewRelic::Agent.logger.info("Application: #{Agent.config[:app_name].join(', ')}")
|
91
91
|
end
|
92
92
|
|
93
93
|
def log_ignore_url_regexes
|
94
94
|
regexes = NewRelic::Agent.config[:'rules.ignore_url_regexes']
|
95
95
|
|
96
96
|
unless regexes.empty?
|
97
|
-
::NewRelic::Agent.logger.info(
|
98
|
-
"#{regexes.map(&:inspect).join(
|
97
|
+
::NewRelic::Agent.logger.info('Ignoring URLs that match the following regexes: ' \
|
98
|
+
"#{regexes.map(&:inspect).join(', ')}.")
|
99
99
|
end
|
100
100
|
end
|
101
101
|
|
@@ -138,10 +138,10 @@ module NewRelic
|
|
138
138
|
if Agent.config[:license_key] && Agent.config[:license_key].length > 0
|
139
139
|
true
|
140
140
|
else
|
141
|
-
::NewRelic::Agent.logger.warn(
|
142
|
-
|
141
|
+
::NewRelic::Agent.logger.warn('No license key found. ' +
|
142
|
+
'This often means your newrelic.yml file was not found, or it lacks a section for the running ' \
|
143
143
|
"environment, '#{NewRelic::Control.instance.env}'. You may also want to try linting your newrelic.yml " \
|
144
|
-
|
144
|
+
'to ensure it is valid YML.')
|
145
145
|
false
|
146
146
|
end
|
147
147
|
end
|
@@ -169,21 +169,21 @@ module NewRelic
|
|
169
169
|
return false if already_started? || disabled?
|
170
170
|
|
171
171
|
if defer_for_delayed_job?
|
172
|
-
::NewRelic::Agent.logger.debug(
|
172
|
+
::NewRelic::Agent.logger.debug('Deferring startup for DelayedJob')
|
173
173
|
return false
|
174
174
|
end
|
175
175
|
|
176
176
|
if defer_for_resque?
|
177
|
-
::NewRelic::Agent.logger.debug(
|
177
|
+
::NewRelic::Agent.logger.debug('Deferring startup for Resque in case it daemonizes')
|
178
178
|
return false
|
179
179
|
end
|
180
180
|
|
181
181
|
unless app_name_configured?
|
182
|
-
NewRelic::Agent.logger.error(
|
183
|
-
|
184
|
-
|
182
|
+
NewRelic::Agent.logger.error('No application name configured.',
|
183
|
+
'The Agent cannot start without at least one. Please check your ',
|
184
|
+
'newrelic.yml and ensure that it is valid and has at least one ',
|
185
185
|
"value set for app_name in the #{NewRelic::Control.instance.env} ",
|
186
|
-
|
186
|
+
'environment.')
|
187
187
|
return false
|
188
188
|
end
|
189
189
|
|
@@ -6,27 +6,27 @@ module NewRelic
|
|
6
6
|
module Agent
|
7
7
|
module AgentHelpers
|
8
8
|
module Transmit
|
9
|
-
TRANSACTION_EVENT =
|
9
|
+
TRANSACTION_EVENT = 'TransactionEvent'.freeze
|
10
10
|
def transmit_analytic_event_data
|
11
11
|
transmit_single_data_type(:harvest_and_send_analytic_event_data, TRANSACTION_EVENT)
|
12
12
|
end
|
13
13
|
|
14
|
-
CUSTOM_EVENT =
|
14
|
+
CUSTOM_EVENT = 'CustomEvent'.freeze
|
15
15
|
def transmit_custom_event_data
|
16
16
|
transmit_single_data_type(:harvest_and_send_custom_event_data, CUSTOM_EVENT)
|
17
17
|
end
|
18
18
|
|
19
|
-
ERROR_EVENT =
|
19
|
+
ERROR_EVENT = 'ErrorEvent'.freeze
|
20
20
|
def transmit_error_event_data
|
21
21
|
transmit_single_data_type(:harvest_and_send_error_event_data, ERROR_EVENT)
|
22
22
|
end
|
23
23
|
|
24
|
-
SPAN_EVENT =
|
24
|
+
SPAN_EVENT = 'SpanEvent'.freeze
|
25
25
|
def transmit_span_event_data
|
26
26
|
transmit_single_data_type(:harvest_and_send_span_event_data, SPAN_EVENT)
|
27
27
|
end
|
28
28
|
|
29
|
-
LOG_EVENT =
|
29
|
+
LOG_EVENT = 'LogEvent'.freeze
|
30
30
|
def transmit_log_event_data
|
31
31
|
transmit_single_data_type(:harvest_and_send_log_event_data, LOG_EVENT)
|
32
32
|
end
|
@@ -47,7 +47,7 @@ module NewRelic
|
|
47
47
|
|
48
48
|
def transmit_data
|
49
49
|
now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
50
|
-
::NewRelic::Agent.logger.debug(
|
50
|
+
::NewRelic::Agent.logger.debug('Sending data to New Relic Service')
|
51
51
|
|
52
52
|
@events.notify(:before_harvest)
|
53
53
|
@service.session do # use http keep-alive
|
@@ -13,7 +13,7 @@ module NewRelic
|
|
13
13
|
class AgentLogger
|
14
14
|
include LogOnce
|
15
15
|
|
16
|
-
def initialize(root =
|
16
|
+
def initialize(root = '', override_logger = nil)
|
17
17
|
@already_logged_lock = Mutex.new
|
18
18
|
clear_already_logged
|
19
19
|
create_log(root, override_logger)
|
@@ -53,13 +53,13 @@ module NewRelic
|
|
53
53
|
# default behavior of backtraces logged at debug, use one of the methods
|
54
54
|
# above and pass an Exception as one of the args.
|
55
55
|
def log_exception(level, e, backtrace_level = level)
|
56
|
-
@log.send(level,
|
56
|
+
@log.send(level, '%p: %s' % [e.class, e.message])
|
57
57
|
@log.send(backtrace_level) do
|
58
58
|
backtrace = backtrace_from_exception(e)
|
59
59
|
if backtrace
|
60
60
|
"Debugging backtrace:\n" + backtrace.join("\n ")
|
61
61
|
else
|
62
|
-
|
62
|
+
'No backtrace available.'
|
63
63
|
end
|
64
64
|
end
|
65
65
|
end
|
@@ -150,11 +150,11 @@ module NewRelic
|
|
150
150
|
end
|
151
151
|
|
152
152
|
LOG_LEVELS = {
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
153
|
+
'debug' => ::Logger::DEBUG,
|
154
|
+
'info' => ::Logger::INFO,
|
155
|
+
'warn' => ::Logger::WARN,
|
156
|
+
'error' => ::Logger::ERROR,
|
157
|
+
'fatal' => ::Logger::FATAL
|
158
158
|
}
|
159
159
|
|
160
160
|
def self.log_level_for(level)
|
@@ -165,7 +165,7 @@ module NewRelic
|
|
165
165
|
@hostname = NewRelic::Agent::Hostname.get
|
166
166
|
@prefix = wants_stdout? ? '** [NewRelic]' : ''
|
167
167
|
@log.formatter = proc do |severity, timestamp, progname, msg|
|
168
|
-
"#{@prefix}[#{timestamp.strftime(
|
168
|
+
"#{@prefix}[#{timestamp.strftime('%F %H:%M:%S %z')} #{@hostname} (#{$$})] #{severity} : #{msg}\n"
|
169
169
|
end
|
170
170
|
end
|
171
171
|
|
@@ -124,8 +124,6 @@ module NewRelic
|
|
124
124
|
|
125
125
|
def prep_capture_params_rules(config)
|
126
126
|
build_rule(['request.parameters.*'], include_destinations_for_capture_params(config[:capture_params]), true)
|
127
|
-
build_rule(['job.resque.args.*'], include_destinations_for_capture_params(config[:'resque.capture_params']), true)
|
128
|
-
build_rule(['job.sidekiq.args.*'], include_destinations_for_capture_params(config[:'sidekiq.capture_params']), true)
|
129
127
|
end
|
130
128
|
|
131
129
|
def prep_datastore_rules(config)
|
@@ -275,8 +273,8 @@ module NewRelic
|
|
275
273
|
attr_reader :attribute_name, :destinations, :is_include, :wildcard
|
276
274
|
|
277
275
|
def initialize(attribute_name, destinations, is_include)
|
278
|
-
@attribute_name = attribute_name.sub(/\*$/,
|
279
|
-
@wildcard = attribute_name.end_with?(
|
276
|
+
@attribute_name = attribute_name.sub(/\*$/, '')
|
277
|
+
@wildcard = attribute_name.end_with?('*')
|
280
278
|
@is_include = is_include
|
281
279
|
@destinations = is_include ? destinations : ~destinations
|
282
280
|
end
|
@@ -7,8 +7,8 @@ module NewRelic
|
|
7
7
|
module AttributeProcessing
|
8
8
|
module_function
|
9
9
|
|
10
|
-
EMPTY_HASH_STRING_LITERAL =
|
11
|
-
EMPTY_ARRAY_STRING_LITERAL =
|
10
|
+
EMPTY_HASH_STRING_LITERAL = '{}'.freeze
|
11
|
+
EMPTY_ARRAY_STRING_LITERAL = '[]'.freeze
|
12
12
|
|
13
13
|
def flatten_and_coerce(object, prefix = nil, result = {}, &blk)
|
14
14
|
if object.is_a?(Hash)
|
@@ -32,9 +32,9 @@ module NewRelic
|
|
32
32
|
|
33
33
|
@log.info("REQUEST HEADERS: #{headers}")
|
34
34
|
rescue StandardError, SystemStackError, SystemCallError => e
|
35
|
-
::NewRelic::Agent.logger.warn(
|
35
|
+
::NewRelic::Agent.logger.warn('Failed writing request headers to audit log', e)
|
36
36
|
rescue Exception => e
|
37
|
-
::NewRelic::Agent.logger.warn(
|
37
|
+
::NewRelic::Agent.logger.warn('Failed writing request headers to audit log with exception. Re-raising in case of interrupt.', e)
|
38
38
|
raise
|
39
39
|
end
|
40
40
|
|
@@ -50,9 +50,9 @@ module NewRelic
|
|
50
50
|
@log.info("REQUEST: #{uri}")
|
51
51
|
@log.info("REQUEST BODY: #{request_body}")
|
52
52
|
rescue StandardError, SystemStackError, SystemCallError => e
|
53
|
-
::NewRelic::Agent.logger.warn(
|
53
|
+
::NewRelic::Agent.logger.warn('Failed writing to audit log', e)
|
54
54
|
rescue Exception => e
|
55
|
-
::NewRelic::Agent.logger.warn(
|
55
|
+
::NewRelic::Agent.logger.warn('Failed writing to audit log with exception. Re-raising in case of interrupt.', e)
|
56
56
|
raise
|
57
57
|
end
|
58
58
|
|
@@ -64,7 +64,7 @@ module NewRelic
|
|
64
64
|
if wants_stdout?
|
65
65
|
# Using $stdout global for easier reassignment in testing
|
66
66
|
@log = ::Logger.new($stdout)
|
67
|
-
::NewRelic::Agent.logger.info(
|
67
|
+
::NewRelic::Agent.logger.info('Audit log enabled to STDOUT')
|
68
68
|
elsif path = ensure_log_path
|
69
69
|
@log = ::Logger.new(path)
|
70
70
|
::NewRelic::Agent.logger.info("Audit log enabled at '#{path}'")
|
@@ -10,8 +10,8 @@ module NewRelic
|
|
10
10
|
|
11
11
|
def initialize(raw_collector_command)
|
12
12
|
@id = raw_collector_command[0]
|
13
|
-
@name = raw_collector_command[1][
|
14
|
-
@arguments = raw_collector_command[1][
|
13
|
+
@name = raw_collector_command[1]['name']
|
14
|
+
@arguments = raw_collector_command[1]['arguments']
|
15
15
|
end
|
16
16
|
end
|
17
17
|
end
|
@@ -29,7 +29,8 @@ module NewRelic
|
|
29
29
|
@handlers['start_profiler'] = proc { |cmd| thread_profiler_session.handle_start_command(cmd) }
|
30
30
|
@handlers['stop_profiler'] = proc { |cmd| thread_profiler_session.handle_stop_command(cmd) }
|
31
31
|
|
32
|
-
|
32
|
+
# the following statement needs else branch coverage
|
33
|
+
if event_listener # rubocop:disable Style/SafeNavigation
|
33
34
|
event_listener.subscribe(:before_shutdown, &method(:on_before_shutdown))
|
34
35
|
end
|
35
36
|
end
|
@@ -77,10 +78,10 @@ module NewRelic
|
|
77
78
|
|
78
79
|
def log_profiles(profiles)
|
79
80
|
if profiles.empty?
|
80
|
-
::NewRelic::Agent.logger.debug(
|
81
|
+
::NewRelic::Agent.logger.debug('No thread profiles with data found to send.')
|
81
82
|
else
|
82
83
|
profile_descriptions = profiles.map { |p| p.to_log_description }
|
83
|
-
::NewRelic::Agent.logger.debug("Sending thread profiles [#{profile_descriptions.join(
|
84
|
+
::NewRelic::Agent.logger.debug("Sending thread profiles [#{profile_descriptions.join(', ')}]")
|
84
85
|
end
|
85
86
|
end
|
86
87
|
|
@@ -114,7 +115,7 @@ module NewRelic
|
|
114
115
|
end
|
115
116
|
|
116
117
|
SUCCESS_RESULT = NewRelic::EMPTY_HASH
|
117
|
-
ERROR_KEY =
|
118
|
+
ERROR_KEY = 'error'
|
118
119
|
|
119
120
|
def success
|
120
121
|
SUCCESS_RESULT
|