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
@@ -45,7 +45,8 @@ module NewRelic::Agent::Instrumentation
|
|
45
45
|
|
46
46
|
def try_to_use(app, clazz)
|
47
47
|
install_lock.synchronize do
|
48
|
-
|
48
|
+
# The following line needs else branch coverage
|
49
|
+
has_middleware = app.middleware && app.middleware.any? { |info| info && info[0] == clazz } # rubocop:disable Style/SafeNavigation
|
49
50
|
app.use(clazz) unless has_middleware
|
50
51
|
end
|
51
52
|
end
|
@@ -53,9 +54,9 @@ module NewRelic::Agent::Instrumentation
|
|
53
54
|
# Capture last route we've seen. Will set for transaction on route_eval
|
54
55
|
def process_route_with_tracing(*args)
|
55
56
|
begin
|
56
|
-
env[
|
57
|
+
env['newrelic.last_route'] = args[0]
|
57
58
|
rescue => e
|
58
|
-
::NewRelic::Agent.logger.debug(
|
59
|
+
::NewRelic::Agent.logger.debug('Failed determining last route in Sinatra', e)
|
59
60
|
end
|
60
61
|
yield
|
61
62
|
end
|
@@ -74,7 +75,7 @@ module NewRelic::Agent::Instrumentation
|
|
74
75
|
)
|
75
76
|
end
|
76
77
|
rescue => e
|
77
|
-
::NewRelic::Agent.logger.debug(
|
78
|
+
::NewRelic::Agent.logger.debug('Failed during route_eval to set transaction name', e)
|
78
79
|
end
|
79
80
|
yield
|
80
81
|
end
|
@@ -83,7 +84,7 @@ module NewRelic::Agent::Instrumentation
|
|
83
84
|
begin
|
84
85
|
@request.params
|
85
86
|
rescue => e
|
86
|
-
NewRelic::Agent.logger.debug(
|
87
|
+
NewRelic::Agent.logger.debug('Failed to get params from Rack request.', e)
|
87
88
|
nil
|
88
89
|
end
|
89
90
|
end
|
@@ -47,7 +47,7 @@ module NewRelic
|
|
47
47
|
# For bare Sinatra, our override on process_route captures the last
|
48
48
|
# route into the environment for us to use later on
|
49
49
|
def route_for_sinatra(env)
|
50
|
-
env[
|
50
|
+
env['newrelic.last_route']
|
51
51
|
end
|
52
52
|
|
53
53
|
# For Padrino, the request object has a copy of the matched route
|
@@ -6,15 +6,15 @@ module NewRelic
|
|
6
6
|
module Agent
|
7
7
|
module Instrumentation
|
8
8
|
module MonitoredThread
|
9
|
-
attr_reader :
|
9
|
+
attr_reader :nr_parent_key
|
10
10
|
|
11
11
|
def initialize_with_newrelic_tracing
|
12
|
-
@
|
12
|
+
@nr_parent_key = NewRelic::Agent::Tracer.current_segment_key
|
13
13
|
yield
|
14
14
|
end
|
15
15
|
|
16
16
|
def add_thread_tracing(*args, &block)
|
17
|
-
return block if
|
17
|
+
return block if !NewRelic::Agent::Tracer.thread_tracing_enabled?
|
18
18
|
|
19
19
|
NewRelic::Agent::Tracer.thread_block_with_current_transaction(
|
20
20
|
*args,
|
@@ -22,10 +22,6 @@ module NewRelic
|
|
22
22
|
&block
|
23
23
|
)
|
24
24
|
end
|
25
|
-
|
26
|
-
def skip_tracing?
|
27
|
-
!NewRelic::Agent.config[:'instrumentation.thread.tracing']
|
28
|
-
end
|
29
25
|
end
|
30
26
|
end
|
31
27
|
end
|
@@ -6,10 +6,10 @@ module NewRelic
|
|
6
6
|
module Agent
|
7
7
|
module Instrumentation
|
8
8
|
module Typhoeus
|
9
|
-
HYDRA_SEGMENT_NAME =
|
10
|
-
NOTICEABLE_ERROR_CLASS =
|
9
|
+
HYDRA_SEGMENT_NAME = 'External/Multiple/Typhoeus::Hydra/run'
|
10
|
+
NOTICEABLE_ERROR_CLASS = 'Typhoeus::Errors::TyphoeusError'
|
11
11
|
|
12
|
-
EARLIEST_VERSION = Gem::Version.new(
|
12
|
+
EARLIEST_VERSION = Gem::Version.new('0.5.3')
|
13
13
|
|
14
14
|
def self.is_supported_version?
|
15
15
|
Gem::Version.new(::Typhoeus::VERSION) >= EARLIEST_VERSION
|
@@ -26,7 +26,7 @@ module NewRelic
|
|
26
26
|
response.return_message
|
27
27
|
else
|
28
28
|
# 0.5.4 seems to have lost xxxx_message methods altogether.
|
29
|
-
|
29
|
+
'timeout'
|
30
30
|
end
|
31
31
|
end
|
32
32
|
|
@@ -72,7 +72,7 @@ module NewRelic
|
|
72
72
|
end
|
73
73
|
request.on_complete.unshift(callback)
|
74
74
|
rescue => e
|
75
|
-
NewRelic::Agent.logger.error(
|
75
|
+
NewRelic::Agent.logger.error('Exception during trace setup for Typhoeus request', e)
|
76
76
|
end
|
77
77
|
end
|
78
78
|
end
|
@@ -23,7 +23,7 @@ module NewRelic
|
|
23
23
|
"JS agent loader version: #{NewRelic::Agent.config[:'browser_monitoring.loader_version']}")
|
24
24
|
|
25
25
|
if !NewRelic::Agent.config[:'rum.enabled']
|
26
|
-
NewRelic::Agent.logger.debug(
|
26
|
+
NewRelic::Agent.logger.debug('Real User Monitoring is disabled for this agent. Edit your configuration to change this.')
|
27
27
|
end
|
28
28
|
end
|
29
29
|
|
@@ -38,19 +38,19 @@ module NewRelic
|
|
38
38
|
def js_enabled_and_ready?
|
39
39
|
if !enabled?
|
40
40
|
::NewRelic::Agent.logger.log_once(:debug, :js_agent_disabled,
|
41
|
-
|
41
|
+
'JS agent instrumentation is disabled.')
|
42
42
|
false
|
43
43
|
elsif missing_config?(:js_agent_loader)
|
44
44
|
::NewRelic::Agent.logger.log_once(:debug, :missing_js_agent_loader,
|
45
|
-
|
45
|
+
'Missing :js_agent_loader. Skipping browser instrumentation.')
|
46
46
|
false
|
47
47
|
elsif missing_config?(:beacon)
|
48
48
|
::NewRelic::Agent.logger.log_once(:debug, :missing_beacon,
|
49
|
-
|
49
|
+
'Beacon configuration not received (yet?). Skipping browser instrumentation.')
|
50
50
|
false
|
51
51
|
elsif missing_config?(:browser_key)
|
52
52
|
::NewRelic::Agent.logger.log_once(:debug, :missing_browser_key,
|
53
|
-
|
53
|
+
'Browser key is not set. Skipping browser instrumentation.')
|
54
54
|
false
|
55
55
|
else
|
56
56
|
true
|
@@ -62,19 +62,19 @@ module NewRelic
|
|
62
62
|
|
63
63
|
def insert_js?(state)
|
64
64
|
if !state.current_transaction
|
65
|
-
::NewRelic::Agent.logger.debug(
|
65
|
+
::NewRelic::Agent.logger.debug('Not in transaction. Skipping browser instrumentation.')
|
66
66
|
false
|
67
67
|
elsif !state.is_execution_traced?
|
68
|
-
::NewRelic::Agent.logger.debug(
|
68
|
+
::NewRelic::Agent.logger.debug('Execution is not traced. Skipping browser instrumentation.')
|
69
69
|
false
|
70
70
|
elsif state.current_transaction.ignore_enduser?
|
71
|
-
::NewRelic::Agent.logger.debug(
|
71
|
+
::NewRelic::Agent.logger.debug('Ignore end user for this transaction is set. Skipping browser instrumentation.')
|
72
72
|
false
|
73
73
|
else
|
74
74
|
true
|
75
75
|
end
|
76
76
|
rescue => e
|
77
|
-
::NewRelic::Agent.logger.debug(
|
77
|
+
::NewRelic::Agent.logger.debug('Failure during insert_js', e)
|
78
78
|
false
|
79
79
|
end
|
80
80
|
|
@@ -95,7 +95,7 @@ module NewRelic
|
|
95
95
|
|
96
96
|
bt_config + browser_timing_loader(nonce)
|
97
97
|
rescue => e
|
98
|
-
::NewRelic::Agent.logger.debug(
|
98
|
+
::NewRelic::Agent.logger.debug('Failure during RUM browser_timing_header construction', e)
|
99
99
|
''
|
100
100
|
end
|
101
101
|
|
@@ -122,18 +122,18 @@ module NewRelic
|
|
122
122
|
" nonce=\"#{nonce.to_s}\""
|
123
123
|
end
|
124
124
|
|
125
|
-
BEACON_KEY =
|
126
|
-
ERROR_BEACON_KEY =
|
127
|
-
LICENSE_KEY_KEY =
|
128
|
-
APPLICATIONID_KEY =
|
129
|
-
TRANSACTION_NAME_KEY =
|
130
|
-
QUEUE_TIME_KEY =
|
131
|
-
APPLICATION_TIME_KEY =
|
132
|
-
AGENT_KEY =
|
133
|
-
SSL_FOR_HTTP_KEY =
|
134
|
-
ATTS_KEY =
|
135
|
-
ATTS_USER_SUBKEY =
|
136
|
-
ATTS_AGENT_SUBKEY =
|
125
|
+
BEACON_KEY = 'beacon'.freeze
|
126
|
+
ERROR_BEACON_KEY = 'errorBeacon'.freeze
|
127
|
+
LICENSE_KEY_KEY = 'licenseKey'.freeze
|
128
|
+
APPLICATIONID_KEY = 'applicationID'.freeze
|
129
|
+
TRANSACTION_NAME_KEY = 'transactionName'.freeze
|
130
|
+
QUEUE_TIME_KEY = 'queueTime'.freeze
|
131
|
+
APPLICATION_TIME_KEY = 'applicationTime'.freeze
|
132
|
+
AGENT_KEY = 'agent'.freeze
|
133
|
+
SSL_FOR_HTTP_KEY = 'sslForHttp'.freeze
|
134
|
+
ATTS_KEY = 'atts'.freeze
|
135
|
+
ATTS_USER_SUBKEY = 'u'.freeze
|
136
|
+
ATTS_AGENT_SUBKEY = 'a'.freeze
|
137
137
|
|
138
138
|
# NOTE: Internal prototyping may override this, so leave name stable!
|
139
139
|
def data_for_js_agent(transaction)
|
@@ -185,9 +185,14 @@ module NewRelic
|
|
185
185
|
|
186
186
|
def append_custom_attributes!(txn, atts)
|
187
187
|
custom_attributes = txn.attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_BROWSER_MONITORING)
|
188
|
-
|
189
|
-
|
188
|
+
if custom_attributes.empty?
|
189
|
+
NewRelic::Agent.logger.debug("#{self.class}: No custom attributes found to append.")
|
190
|
+
return
|
190
191
|
end
|
192
|
+
|
193
|
+
NewRelic::Agent.logger.debug("#{self.class}: Appending the following custom attribute keys for browser " \
|
194
|
+
"monitoring: #{custom_attributes.keys}")
|
195
|
+
atts[ATTS_USER_SUBKEY] = custom_attributes
|
191
196
|
end
|
192
197
|
|
193
198
|
def append_agent_attributes!(txn, atts)
|
@@ -11,7 +11,7 @@ module NewRelic
|
|
11
11
|
extend self
|
12
12
|
|
13
13
|
def append_service_linking_metadata(metadata)
|
14
|
-
raise ArgumentError,
|
14
|
+
raise ArgumentError, 'Missing argument `metadata`' if metadata.nil?
|
15
15
|
|
16
16
|
config = ::NewRelic::Agent.config
|
17
17
|
|
@@ -27,7 +27,7 @@ module NewRelic
|
|
27
27
|
end
|
28
28
|
|
29
29
|
def append_trace_linking_metadata(metadata)
|
30
|
-
raise ArgumentError,
|
30
|
+
raise ArgumentError, 'Missing argument `metadata`' if metadata.nil?
|
31
31
|
|
32
32
|
if trace_id = Tracer.current_trace_id
|
33
33
|
metadata[TRACE_ID_KEY] = trace_id
|
@@ -9,20 +9,20 @@ module NewRelic
|
|
9
9
|
module Agent
|
10
10
|
class LogEventAggregator < EventAggregator
|
11
11
|
# Per-message keys
|
12
|
-
LEVEL_KEY =
|
13
|
-
MESSAGE_KEY =
|
14
|
-
TIMESTAMP_KEY =
|
15
|
-
PRIORITY_KEY =
|
12
|
+
LEVEL_KEY = 'level'.freeze
|
13
|
+
MESSAGE_KEY = 'message'.freeze
|
14
|
+
TIMESTAMP_KEY = 'timestamp'.freeze
|
15
|
+
PRIORITY_KEY = 'priority'.freeze
|
16
16
|
|
17
17
|
# Metric keys
|
18
|
-
LINES =
|
19
|
-
DROPPED_METRIC =
|
20
|
-
SEEN_METRIC =
|
21
|
-
SENT_METRIC =
|
22
|
-
OVERALL_SUPPORTABILITY_FORMAT =
|
23
|
-
METRICS_SUPPORTABILITY_FORMAT =
|
24
|
-
FORWARDING_SUPPORTABILITY_FORMAT =
|
25
|
-
DECORATING_SUPPORTABILITY_FORMAT =
|
18
|
+
LINES = 'Logging/lines'.freeze
|
19
|
+
DROPPED_METRIC = 'Logging/Forwarding/Dropped'.freeze
|
20
|
+
SEEN_METRIC = 'Supportability/Logging/Forwarding/Seen'.freeze
|
21
|
+
SENT_METRIC = 'Supportability/Logging/Forwarding/Sent'.freeze
|
22
|
+
OVERALL_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Ruby/Logger/%s'.freeze
|
23
|
+
METRICS_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Metrics/Ruby/%s'.freeze
|
24
|
+
FORWARDING_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Forwarding/Ruby/%s'.freeze
|
25
|
+
DECORATING_SUPPORTABILITY_FORMAT = 'Supportability/Logging/LocalDecorating/Ruby/%s'.freeze
|
26
26
|
MAX_BYTES = 32768 # 32 * 1024 bytes (32 kibibytes)
|
27
27
|
|
28
28
|
named :LogEventAggregator
|
@@ -54,7 +54,7 @@ module NewRelic
|
|
54
54
|
def record(formatted_message, severity)
|
55
55
|
return unless enabled?
|
56
56
|
|
57
|
-
severity =
|
57
|
+
severity = 'UNKNOWN' if severity.nil? || severity.empty?
|
58
58
|
|
59
59
|
if NewRelic::Agent.config[METRICS_ENABLED_KEY]
|
60
60
|
@counter_lock.synchronize do
|
@@ -174,9 +174,9 @@ module NewRelic
|
|
174
174
|
def record_configuration_metric(format, key)
|
175
175
|
state = NewRelic::Agent.config[key]
|
176
176
|
label = if !enabled?
|
177
|
-
|
177
|
+
'disabled'
|
178
178
|
else
|
179
|
-
state ?
|
179
|
+
state ? 'enabled' : 'disabled'
|
180
180
|
end
|
181
181
|
NewRelic::Agent.increment_metric(format % label)
|
182
182
|
end
|
@@ -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
|
@@ -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
|
@@ -12,7 +12,6 @@ module NewRelic
|
|
12
12
|
module Agent
|
13
13
|
module DistributedTracing
|
14
14
|
class CrossAppMonitor < InboundRequestMonitor
|
15
|
-
NEWRELIC_ID_HEADER = 'X-NewRelic-ID'.freeze
|
16
15
|
NEWRELIC_TXN_HEADER = 'X-NewRelic-Transaction'.freeze
|
17
16
|
NEWRELIC_APPDATA_HEADER = 'X-NewRelic-App-Data'.freeze
|
18
17
|
|
@@ -24,7 +23,7 @@ module NewRelic
|
|
24
23
|
if CrossAppTracing.cross_app_enabled?
|
25
24
|
Deprecator.deprecate('cross_application_tracer')
|
26
25
|
::NewRelic::Agent.logger.warn(
|
27
|
-
|
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`'
|
28
27
|
)
|
29
28
|
end
|
30
29
|
|
@@ -35,7 +34,7 @@ module NewRelic
|
|
35
34
|
rotated = ((seed << 1) | (seed >> 31)) & 0xffffffff
|
36
35
|
app_name = NewRelic::Agent.config[:app_name].first
|
37
36
|
identifier = "#{app_name};#{txn_name}"
|
38
|
-
sprintf(
|
37
|
+
sprintf('%08x', rotated ^ hash_transaction_name(identifier))
|
39
38
|
end
|
40
39
|
|
41
40
|
private
|
@@ -45,7 +44,7 @@ module NewRelic
|
|
45
44
|
# :after_call will write our response headers/metrics and clean up the thread
|
46
45
|
def register_event_listeners(events)
|
47
46
|
NewRelic::Agent.logger
|
48
|
-
.debug(
|
47
|
+
.debug('Wiring up Cross Application Tracing to events after finished configuring')
|
49
48
|
|
50
49
|
events.subscribe(:before_call) do |env| # THREAD_LOCAL_ACCESS
|
51
50
|
if id = decoded_id(env) and should_process_request?(id)
|
@@ -110,7 +109,7 @@ module NewRelic
|
|
110
109
|
end
|
111
110
|
|
112
111
|
def hash_transaction_name(identifier)
|
113
|
-
Digest::MD5.digest(identifier).unpack(
|
112
|
+
Digest::MD5.digest(identifier).unpack('@12N').first & 0xffffffff
|
114
113
|
end
|
115
114
|
end
|
116
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 = {})
|