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
@@ -22,16 +22,21 @@ module NewRelic
|
|
22
22
|
#
|
23
23
|
# @api public
|
24
24
|
class DecoratingFormatter < ::Logger::Formatter
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
25
|
+
MESSAGE_ELEMENT = 'message'
|
26
|
+
LOG_LEVEL_ELEMENT = 'log_level'
|
27
|
+
PROG_NAME_ELEMENT = 'prog_name'
|
28
|
+
ELEMENTS = ['app_name', 'entity_type', 'hostname', 'entity_guid', 'trace_id', 'span_id', MESSAGE_ELEMENT,
|
29
|
+
LOG_LEVEL_ELEMENT, PROG_NAME_ELEMENT].freeze
|
30
|
+
TIMESTAMP_KEY = 'timestamp'
|
31
|
+
MESSAGE_KEY = 'message'
|
32
|
+
LOG_LEVEL_KEY = 'log.level'
|
33
|
+
LOG_NAME_KEY = 'logger.name'
|
34
|
+
NEWLINE = "\n"
|
35
|
+
|
36
|
+
QUOTE = '"'
|
37
|
+
COLON = ':'
|
38
|
+
COMMA = ','
|
39
|
+
CLOSING_BRACE = '}'
|
35
40
|
REPLACEMENT_CHAR = '�'
|
36
41
|
|
37
42
|
def initialize
|
@@ -41,41 +46,76 @@ module NewRelic
|
|
41
46
|
end
|
42
47
|
|
43
48
|
def call(severity, time, progname, msg)
|
44
|
-
message =
|
45
|
-
|
46
|
-
|
47
|
-
|
49
|
+
message = +'{'
|
50
|
+
ELEMENTS.each do |element|
|
51
|
+
args = case element
|
52
|
+
when MESSAGE_ELEMENT then [message, msg]
|
53
|
+
when LOG_LEVEL_ELEMENT then [message, severity]
|
54
|
+
when PROG_NAME_ELEMENT then [message, progname]
|
55
|
+
else [message]
|
56
|
+
end
|
57
|
+
|
58
|
+
send("add_#{element}", *args)
|
48
59
|
end
|
60
|
+
message << COMMA
|
61
|
+
message << QUOTE << TIMESTAMP_KEY << QUOTE << COLON << (time.to_f * 1000).round.to_s
|
62
|
+
message << CLOSING_BRACE << NEWLINE
|
63
|
+
end
|
64
|
+
|
65
|
+
private
|
66
|
+
|
67
|
+
def add_app_name(message)
|
68
|
+
return unless app_name
|
69
|
+
|
70
|
+
add_key_value(message, ENTITY_NAME_KEY, app_name)
|
71
|
+
message << COMMA
|
72
|
+
end
|
73
|
+
|
74
|
+
def add_entity_type(message)
|
49
75
|
add_key_value(message, ENTITY_TYPE_KEY, ENTITY_TYPE)
|
50
76
|
message << COMMA
|
77
|
+
end
|
78
|
+
|
79
|
+
def add_hostname(message)
|
51
80
|
add_key_value(message, HOSTNAME_KEY, Hostname.get)
|
81
|
+
end
|
52
82
|
|
53
|
-
|
54
|
-
|
55
|
-
add_key_value(message, ENTITY_GUID_KEY, entity_guid)
|
56
|
-
end
|
83
|
+
def add_entity_guid(message)
|
84
|
+
return unless entity_guid = Agent.config[:entity_guid]
|
57
85
|
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
add_key_value(message, SPAN_ID_KEY, span_id)
|
65
|
-
end
|
86
|
+
message << COMMA
|
87
|
+
add_key_value(message, ENTITY_GUID_KEY, entity_guid)
|
88
|
+
end
|
89
|
+
|
90
|
+
def add_trace_id(message)
|
91
|
+
return unless trace_id = Tracer.trace_id
|
66
92
|
|
93
|
+
message << COMMA
|
94
|
+
add_key_value(message, TRACE_ID_KEY, trace_id)
|
95
|
+
end
|
96
|
+
|
97
|
+
def add_span_id(message)
|
98
|
+
return unless span_id = Tracer.span_id
|
99
|
+
|
100
|
+
message << COMMA
|
101
|
+
add_key_value(message, SPAN_ID_KEY, span_id)
|
102
|
+
end
|
103
|
+
|
104
|
+
def add_message(message, msg)
|
67
105
|
message << COMMA
|
68
106
|
message << QUOTE << MESSAGE_KEY << QUOTE << COLON << escape(msg)
|
69
107
|
message << COMMA
|
108
|
+
end
|
109
|
+
|
110
|
+
def add_log_level(message, severity)
|
70
111
|
add_key_value(message, LOG_LEVEL_KEY, severity)
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
112
|
+
end
|
113
|
+
|
114
|
+
def add_prog_name(message, progname)
|
115
|
+
return unless progname
|
75
116
|
|
76
117
|
message << COMMA
|
77
|
-
message
|
78
|
-
message << CLOSING_BRACE << NEWLINE
|
118
|
+
add_key_value(message, LOG_NAME_KEY, progname)
|
79
119
|
end
|
80
120
|
|
81
121
|
def app_name
|
@@ -125,7 +165,7 @@ module NewRelic
|
|
125
165
|
# Positional and Keyword arguments are separated beginning with Ruby 2.7
|
126
166
|
# Signature of ::Logger constructor changes in Ruby 2.4 to have both positional and keyword args
|
127
167
|
# We pivot on Ruby 2.7 for widest supportability with least amount of hassle.
|
128
|
-
if RUBY_VERSION <
|
168
|
+
if RUBY_VERSION < '2.7.0'
|
129
169
|
def initialize(*args)
|
130
170
|
super(*args)
|
131
171
|
self.formatter = DecoratingFormatter.new
|
@@ -14,7 +14,7 @@ module NewRelic
|
|
14
14
|
module Messaging
|
15
15
|
extend self
|
16
16
|
|
17
|
-
RABBITMQ_TRANSPORT_TYPE =
|
17
|
+
RABBITMQ_TRANSPORT_TYPE = 'RabbitMQ'
|
18
18
|
|
19
19
|
ATTR_DESTINATION = AttributeFilter::DST_TRANSACTION_EVENTS |
|
20
20
|
AttributeFilter::DST_TRANSACTION_TRACER |
|
@@ -142,15 +142,16 @@ module NewRelic
|
|
142
142
|
txn.add_agent_attribute(:'message.queueName', queue_name, ATTR_DESTINATION) if queue_name
|
143
143
|
txn.add_agent_attribute(:'message.replyTo', reply_to, AttributeFilter::DST_NONE) if reply_to
|
144
144
|
rescue => e
|
145
|
-
NewRelic::Agent.logger.error(
|
145
|
+
NewRelic::Agent.logger.error('Error starting Message Broker consume transaction', e)
|
146
146
|
end
|
147
147
|
|
148
148
|
yield
|
149
149
|
ensure
|
150
150
|
begin
|
151
|
-
|
151
|
+
# the following line needs else branch coverage
|
152
|
+
txn.finish if txn # rubocop:disable Style/SafeNavigation
|
152
153
|
rescue => e
|
153
|
-
NewRelic::Agent.logger.error(
|
154
|
+
NewRelic::Agent.logger.error('Error stopping Message Broker consume transaction', e)
|
154
155
|
end
|
155
156
|
end
|
156
157
|
|
@@ -190,7 +191,8 @@ module NewRelic
|
|
190
191
|
|
191
192
|
raise ArgumentError, 'missing required argument: headers' if headers.nil? && CrossAppTracing.cross_app_enabled?
|
192
193
|
|
193
|
-
|
194
|
+
# The following line needs else branch coverage
|
195
|
+
original_headers = headers.nil? ? nil : headers.dup # rubocop:disable Style/SafeNavigation
|
194
196
|
|
195
197
|
segment = Tracer.start_message_broker_segment(
|
196
198
|
action: :produce,
|
@@ -103,7 +103,7 @@ module NewRelic
|
|
103
103
|
module AddMethodTracer
|
104
104
|
ALLOWED_KEYS = [:metric, :push_scope, :code_header, :code_information, :code_footer].freeze
|
105
105
|
|
106
|
-
DEFAULT_SETTINGS = {:push_scope => true, :metric => true, :code_header =>
|
106
|
+
DEFAULT_SETTINGS = {:push_scope => true, :metric => true, :code_header => '', :code_footer => ''}.freeze
|
107
107
|
|
108
108
|
# Checks the provided options to make sure that they make
|
109
109
|
# sense. Raises an error if the options are incorrect to
|
@@ -134,7 +134,7 @@ module NewRelic
|
|
134
134
|
# Foo._nr_default_metric_name_code('bar') #=> "Custom/#{Foo.name}/bar"
|
135
135
|
def _nr_default_metric_name(method_name)
|
136
136
|
class_name = _nr_derived_class_name
|
137
|
-
->
|
137
|
+
->(*) { "Custom/#{class_name}/#{method_name}" }
|
138
138
|
end
|
139
139
|
|
140
140
|
# Checks to see if the method we are attempting to trace
|
@@ -170,14 +170,14 @@ module NewRelic
|
|
170
170
|
|
171
171
|
def _nr_derived_class_name
|
172
172
|
return self.name if self.name && !self.name.empty?
|
173
|
-
return
|
173
|
+
return 'AnonymousModule' if self.to_s.start_with?('#<Module:')
|
174
174
|
|
175
175
|
# trying to get the "MyClass" portion of "#<Class:MyClass>"
|
176
176
|
name = self.to_s[/^#<Class:(.+)>$/, 1]
|
177
|
-
if name.start_with?(
|
178
|
-
|
179
|
-
elsif name.start_with?(
|
180
|
-
|
177
|
+
if name.start_with?('0x')
|
178
|
+
'AnonymousClass'
|
179
|
+
elsif name.start_with?('#<Class:')
|
180
|
+
'AnonymousClass/Class'
|
181
181
|
else
|
182
182
|
"#{name}/Class"
|
183
183
|
end
|
@@ -11,7 +11,7 @@ module NewRelic
|
|
11
11
|
# function: the name of the Ruby method
|
12
12
|
# namespace: the Ruby class' namespace as a string, ex: 'MyModule::MyClass'
|
13
13
|
SOURCE_CODE_INFORMATION_PARAMETERS = %i[filepath lineno function namespace].freeze
|
14
|
-
SOURCE_CODE_INFORMATION_FAILURE_METRIC =
|
14
|
+
SOURCE_CODE_INFORMATION_FAILURE_METRIC = 'Supportability/CodeLevelMetrics/Ruby/Failure'.freeze
|
15
15
|
MAX_ALLOWED_METRIC_DURATION = 1_000_000_000 # roughly 31 years
|
16
16
|
|
17
17
|
extend self
|
@@ -23,7 +23,7 @@ module NewRelic
|
|
23
23
|
if CrossAppTracing.cross_app_enabled?
|
24
24
|
Deprecator.deprecate('cross_application_tracer')
|
25
25
|
::NewRelic::Agent.logger.warn(
|
26
|
-
|
26
|
+
'[DEPRECATED] Cross application tracing is enabled. Distributed tracing is replacing cross application tracing as the default means of tracing between services. To continue using cross application tracing, enable it with `cross_application_tracer.enabled: true` and `distributed_tracing.enabled: false`'
|
27
27
|
)
|
28
28
|
end
|
29
29
|
|
@@ -34,7 +34,7 @@ module NewRelic
|
|
34
34
|
rotated = ((seed << 1) | (seed >> 31)) & 0xffffffff
|
35
35
|
app_name = NewRelic::Agent.config[:app_name].first
|
36
36
|
identifier = "#{app_name};#{txn_name}"
|
37
|
-
sprintf(
|
37
|
+
sprintf('%08x', rotated ^ hash_transaction_name(identifier))
|
38
38
|
end
|
39
39
|
|
40
40
|
private
|
@@ -44,7 +44,7 @@ module NewRelic
|
|
44
44
|
# :after_call will write our response headers/metrics and clean up the thread
|
45
45
|
def register_event_listeners(events)
|
46
46
|
NewRelic::Agent.logger
|
47
|
-
.debug(
|
47
|
+
.debug('Wiring up Cross Application Tracing to events after finished configuring')
|
48
48
|
|
49
49
|
events.subscribe(:before_call) do |env| # THREAD_LOCAL_ACCESS
|
50
50
|
if id = decoded_id(env) and should_process_request?(id)
|
@@ -109,7 +109,7 @@ module NewRelic
|
|
109
109
|
end
|
110
110
|
|
111
111
|
def hash_transaction_name(identifier)
|
112
|
-
Digest::MD5.digest(identifier).unpack(
|
112
|
+
Digest::MD5.digest(identifier).unpack('@12N').first & 0xffffffff
|
113
113
|
end
|
114
114
|
end
|
115
115
|
end
|
@@ -14,7 +14,7 @@ module NewRelic
|
|
14
14
|
|
15
15
|
def on_before_call(request)
|
16
16
|
unless NewRelic::Agent.config[:'distributed_tracing.enabled']
|
17
|
-
NewRelic::Agent.logger.warn(
|
17
|
+
NewRelic::Agent.logger.warn('Not configured to accept distributed trace headers')
|
18
18
|
return
|
19
19
|
end
|
20
20
|
|
@@ -14,7 +14,7 @@ module NewRelic
|
|
14
14
|
warn_for_yajl
|
15
15
|
end
|
16
16
|
|
17
|
-
OK_YAJL_VERSION = Gem::Version.new(
|
17
|
+
OK_YAJL_VERSION = Gem::Version.new('1.2.1')
|
18
18
|
|
19
19
|
def warn_for_yajl
|
20
20
|
if defined?(::Yajl)
|
@@ -24,7 +24,7 @@ module NewRelic
|
|
24
24
|
end
|
25
25
|
end
|
26
26
|
rescue => err
|
27
|
-
::NewRelic::Agent.logger.warn(
|
27
|
+
::NewRelic::Agent.logger.warn('Failed trying to watch for problematic yajl-ruby version.', err)
|
28
28
|
end
|
29
29
|
|
30
30
|
def dump(ruby, opts = {})
|
@@ -65,7 +65,7 @@ module NewRelic
|
|
65
65
|
Agent.config.register_callback(:marshaller) do |marshaller|
|
66
66
|
if marshaller != 'json'
|
67
67
|
::NewRelic::Agent.logger.warn("Non-JSON marshaller '#{marshaller}' requested but not supported, using " \
|
68
|
-
|
68
|
+
'JSON marshaller instead. pruby marshalling has been removed as of version 3.14.0.')
|
69
69
|
end
|
70
70
|
|
71
71
|
@marshaller = JsonMarshaller.new
|
@@ -195,16 +195,16 @@ module NewRelic
|
|
195
195
|
def error_event_data(data)
|
196
196
|
metadata, items = data
|
197
197
|
response = invoke_remote(:error_event_data, [@agent_id, *data], :item_count => items.size)
|
198
|
-
NewRelic::Agent.record_metric(
|
199
|
-
NewRelic::Agent.record_metric(
|
198
|
+
NewRelic::Agent.record_metric('Supportability/Events/TransactionError/Sent', :count => items.size)
|
199
|
+
NewRelic::Agent.record_metric('Supportability/Events/TransactionError/Seen', :count => metadata[:events_seen])
|
200
200
|
response
|
201
201
|
end
|
202
202
|
|
203
203
|
def span_event_data(data)
|
204
204
|
metadata, items = data
|
205
205
|
response = invoke_remote(:span_event_data, [@agent_id, *data], :item_count => items.size)
|
206
|
-
NewRelic::Agent.record_metric(
|
207
|
-
NewRelic::Agent.record_metric(
|
206
|
+
NewRelic::Agent.record_metric('Supportability/Events/SpanEvents/Sent', :count => items.size)
|
207
|
+
NewRelic::Agent.record_metric('Supportability/Events/SpanEvents/Seen', :count => metadata[:events_seen])
|
208
208
|
response
|
209
209
|
end
|
210
210
|
|
@@ -305,7 +305,7 @@ module NewRelic
|
|
305
305
|
conn.verify_mode = OpenSSL::SSL::VERIFY_PEER
|
306
306
|
set_cert_store(conn)
|
307
307
|
rescue StandardError, LoadError
|
308
|
-
msg =
|
308
|
+
msg = 'SSL is not available in the environment; please install SSL support.'
|
309
309
|
raise UnrecoverableAgentException.new(msg)
|
310
310
|
end
|
311
311
|
|
@@ -313,7 +313,7 @@ module NewRelic
|
|
313
313
|
if NewRelic::Agent.config[:ca_bundle_path]
|
314
314
|
conn.cert_store = ssl_cert_store
|
315
315
|
else
|
316
|
-
::NewRelic::Agent.logger.debug(
|
316
|
+
::NewRelic::Agent.logger.debug('Using default security certificates')
|
317
317
|
end
|
318
318
|
end
|
319
319
|
|
@@ -363,7 +363,7 @@ module NewRelic
|
|
363
363
|
start_connection(conn)
|
364
364
|
conn
|
365
365
|
rescue Timeout::Error
|
366
|
-
::NewRelic::Agent.logger.info(
|
366
|
+
::NewRelic::Agent.logger.info('Timeout while attempting to connect. You may need to install system-level CA Certificates, as the ruby agent no longer includes these.')
|
367
367
|
raise
|
368
368
|
end
|
369
369
|
|
@@ -380,7 +380,7 @@ module NewRelic
|
|
380
380
|
@marshaller.dump(data)
|
381
381
|
true
|
382
382
|
rescue StandardError, SystemStackError => e
|
383
|
-
NewRelic::Agent.logger.warn(
|
383
|
+
NewRelic::Agent.logger.warn('Unable to marshal environment report on connect.', e)
|
384
384
|
false
|
385
385
|
end
|
386
386
|
|
@@ -409,7 +409,7 @@ module NewRelic
|
|
409
409
|
end
|
410
410
|
@audit_logger.log_request_headers(opts[:uri], headers)
|
411
411
|
request['user-agent'] = user_agent
|
412
|
-
request.content_type =
|
412
|
+
request.content_type = 'application/octet-stream'
|
413
413
|
request.body = opts[:data]
|
414
414
|
request
|
415
415
|
end
|
@@ -462,7 +462,6 @@ module NewRelic
|
|
462
462
|
Net::HTTPRequestURITooLong,
|
463
463
|
Net::HTTPUnsupportedMediaType,
|
464
464
|
Net::HTTPExpectationFailed,
|
465
|
-
Net::HTTPUnsupportedMediaType,
|
466
465
|
Net::HTTPRequestHeaderFieldsTooLarge
|
467
466
|
handle_unrecoverable_server_exception(response, endpoint)
|
468
467
|
when Net::HTTPConflict,
|
@@ -521,7 +520,7 @@ module NewRelic
|
|
521
520
|
# ruled out; see the initializer
|
522
521
|
}
|
523
522
|
|
524
|
-
uri =
|
523
|
+
uri = +'/agent_listener/invoke_raw_method?'
|
525
524
|
uri << params.map do |k, v|
|
526
525
|
next unless v
|
527
526
|
|
@@ -551,7 +550,7 @@ module NewRelic
|
|
551
550
|
end
|
552
551
|
|
553
552
|
def handle_serialization_error(method, e)
|
554
|
-
NewRelic::Agent.increment_metric(
|
553
|
+
NewRelic::Agent.increment_metric('Supportability/serialization_failure')
|
555
554
|
NewRelic::Agent.increment_metric("Supportability/serialization_failure/#{method}")
|
556
555
|
msg = "Failed to serialize #{method} data using #{@marshaller.class}: #{e.inspect}"
|
557
556
|
error = SerializationError.new(msg)
|
@@ -566,7 +565,7 @@ module NewRelic
|
|
566
565
|
NewRelic::Agent.record_metric("Supportability/Agent/Collector/#{method}/Duration", request_duration)
|
567
566
|
end
|
568
567
|
if serialize_time
|
569
|
-
NewRelic::Agent.record_metric(
|
568
|
+
NewRelic::Agent.record_metric('Supportability/invoke_remote_serialize', serialize_time)
|
570
569
|
NewRelic::Agent.record_metric("Supportability/invoke_remote_serialize/#{method}", serialize_time)
|
571
570
|
end
|
572
571
|
end
|
@@ -581,7 +580,7 @@ module NewRelic
|
|
581
580
|
# of items as arguments.
|
582
581
|
def record_size_supportability_metrics(method, size_bytes, item_count)
|
583
582
|
metrics = [
|
584
|
-
|
583
|
+
'Supportability/Ruby/Collector/Output/Bytes',
|
585
584
|
"Supportability/Ruby/Collector/#{method}/Output/Bytes"
|
586
585
|
]
|
587
586
|
# we may not have an item count, in which case, just record 0 for the exclusive time
|
@@ -7,7 +7,7 @@ module NewRelic
|
|
7
7
|
module ParameterFiltering
|
8
8
|
extend self
|
9
9
|
|
10
|
-
ACTION_DISPATCH_PARAMETER_FILTER ||=
|
10
|
+
ACTION_DISPATCH_PARAMETER_FILTER ||= 'action_dispatch.parameter_filter'.freeze
|
11
11
|
|
12
12
|
if defined?(Rails) && Gem::Version.new(::Rails::VERSION::STRING) >= Gem::Version.new('5.0.0')
|
13
13
|
Rails.application.config.to_prepare do
|
@@ -41,12 +41,12 @@ module NewRelic
|
|
41
41
|
end
|
42
42
|
|
43
43
|
def filter_rack_file_data(env, params)
|
44
|
-
content_type = env[
|
45
|
-
multipart = content_type
|
44
|
+
content_type = env['CONTENT_TYPE']
|
45
|
+
multipart = content_type&.start_with?('multipart')
|
46
46
|
|
47
47
|
params.inject({}) do |memo, (k, v)|
|
48
48
|
if multipart && v.is_a?(Hash) && v[:tempfile]
|
49
|
-
memo[k] =
|
49
|
+
memo[k] = '[FILE]'
|
50
50
|
else
|
51
51
|
memo[k] = v
|
52
52
|
end
|
@@ -56,8 +56,8 @@ module NewRelic
|
|
56
56
|
|
57
57
|
def filter_rails_request_parameters(params)
|
58
58
|
result = params.dup
|
59
|
-
result.delete(
|
60
|
-
result.delete(
|
59
|
+
result.delete('controller')
|
60
|
+
result.delete('action')
|
61
61
|
result
|
62
62
|
end
|
63
63
|
|
@@ -55,7 +55,7 @@ module NewRelic
|
|
55
55
|
# 4 GB - much larger than we'd ever need or want for this application.
|
56
56
|
#
|
57
57
|
class Pipe
|
58
|
-
READY_MARKER =
|
58
|
+
READY_MARKER = 'READY'
|
59
59
|
NUM_LENGTH_BYTES = 4
|
60
60
|
|
61
61
|
attr_accessor :in, :out
|
@@ -76,11 +76,11 @@ module NewRelic
|
|
76
76
|
end
|
77
77
|
|
78
78
|
def serialize_message_length(data)
|
79
|
-
[data.bytesize].pack(
|
79
|
+
[data.bytesize].pack('L>')
|
80
80
|
end
|
81
81
|
|
82
82
|
def deserialize_message_length(data)
|
83
|
-
data.unpack(
|
83
|
+
data.unpack('L>').first
|
84
84
|
end
|
85
85
|
|
86
86
|
def write(data)
|
@@ -103,7 +103,7 @@ module NewRelic
|
|
103
103
|
nil
|
104
104
|
end
|
105
105
|
else
|
106
|
-
NewRelic::Agent.logger.error(
|
106
|
+
NewRelic::Agent.logger.error('Failed to read bytes for length from pipe.')
|
107
107
|
nil
|
108
108
|
end
|
109
109
|
end
|
@@ -218,7 +218,8 @@ module NewRelic
|
|
218
218
|
def close_all_pipes
|
219
219
|
@pipes_lock.synchronize do
|
220
220
|
@pipes.each do |id, pipe|
|
221
|
-
|
221
|
+
# Needs else branch coverage
|
222
|
+
pipe.close if pipe # rubocop:disable Style/SafeNavigation
|
222
223
|
end
|
223
224
|
@pipes = {}
|
224
225
|
end
|
@@ -255,7 +256,7 @@ module NewRelic
|
|
255
256
|
def unmarshal(data)
|
256
257
|
Marshal.load(data)
|
257
258
|
rescue StandardError => e
|
258
|
-
::NewRelic::Agent.logger.error(
|
259
|
+
::NewRelic::Agent.logger.error('Failure unmarshalling message from Resque child process', e)
|
259
260
|
::NewRelic::Agent.logger.debug(Base64.encode64(data))
|
260
261
|
nil
|
261
262
|
end
|
@@ -15,7 +15,7 @@ module NewRelic
|
|
15
15
|
if @pipe && @pipe.parent_pid != $$
|
16
16
|
@pipe.after_fork_in_child
|
17
17
|
else
|
18
|
-
NewRelic::Agent.logger.error(
|
18
|
+
NewRelic::Agent.logger.error('No communication channel to parent process, please see https://newrelic.com/docs/ruby/resque-instrumentation for more information.')
|
19
19
|
end
|
20
20
|
end
|
21
21
|
|
@@ -65,7 +65,8 @@ module NewRelic
|
|
65
65
|
end
|
66
66
|
|
67
67
|
def shutdown
|
68
|
-
|
68
|
+
# no else branch coverage
|
69
|
+
@pipe.close if @pipe # rubocop:disable Style/SafeNavigation
|
69
70
|
end
|
70
71
|
|
71
72
|
# Invokes the block it is passed. This is used to implement HTTP
|
@@ -82,7 +83,8 @@ module NewRelic
|
|
82
83
|
end
|
83
84
|
|
84
85
|
def write_to_pipe(endpoint, data)
|
85
|
-
|
86
|
+
# the following line needs else branch coverage
|
87
|
+
@pipe.write(marshal_payload([endpoint, data])) if @pipe # rubocop:disable Style/SafeNavigation
|
86
88
|
end
|
87
89
|
end
|
88
90
|
end
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# This file is distributed under New Relic's license terms.
|
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
|
#
|
5
6
|
# A Sampler is used to capture meaningful metrics in a background thread
|
6
7
|
# periodically. They will be invoked about once a minute, each time the agent
|
@@ -56,7 +57,7 @@ module NewRelic
|
|
56
57
|
end
|
57
58
|
|
58
59
|
def poll
|
59
|
-
raise
|
60
|
+
raise 'Implement in the subclass'
|
60
61
|
end
|
61
62
|
end
|
62
63
|
end
|
@@ -64,7 +64,7 @@ module NewRelic
|
|
64
64
|
rescue NewRelic::Agent::Sampler::Unsupported => e
|
65
65
|
::NewRelic::Agent.logger.info("#{sampler_class.name} not available: #{e}")
|
66
66
|
rescue => e
|
67
|
-
::NewRelic::Agent.logger.error(
|
67
|
+
::NewRelic::Agent.logger.error('Error registering sampler:', e)
|
68
68
|
end
|
69
69
|
end
|
70
70
|
end
|
@@ -16,26 +16,26 @@ module NewRelic
|
|
16
16
|
@last_time = nil
|
17
17
|
@processor_count = NewRelic::Agent::SystemInfo.num_logical_processors
|
18
18
|
if @processor_count.nil?
|
19
|
-
NewRelic::Agent.logger.warn(
|
19
|
+
NewRelic::Agent.logger.warn('Failed to determine processor count, assuming 1')
|
20
20
|
@processor_count = 1
|
21
21
|
end
|
22
22
|
poll
|
23
23
|
end
|
24
24
|
|
25
25
|
def record_user_util(value)
|
26
|
-
NewRelic::Agent.record_metric(
|
26
|
+
NewRelic::Agent.record_metric('CPU/User/Utilization', value)
|
27
27
|
end
|
28
28
|
|
29
29
|
def record_system_util(value)
|
30
|
-
NewRelic::Agent.record_metric(
|
30
|
+
NewRelic::Agent.record_metric('CPU/System/Utilization', value)
|
31
31
|
end
|
32
32
|
|
33
33
|
def record_usertime(value)
|
34
|
-
NewRelic::Agent.record_metric(
|
34
|
+
NewRelic::Agent.record_metric('CPU/User Time', value)
|
35
35
|
end
|
36
36
|
|
37
37
|
def record_systemtime(value)
|
38
|
-
NewRelic::Agent.record_metric(
|
38
|
+
NewRelic::Agent.record_metric('CPU/System Time', value)
|
39
39
|
end
|
40
40
|
|
41
41
|
def self.supported_on_this_platform?
|