newrelic_rpm 6.2.0.354 → 6.15.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +8 -0
- data/CHANGELOG.md +646 -6
- data/CONTRIBUTING.md +106 -19
- data/Gemfile +6 -2
- data/Guardfile +18 -1
- data/LICENSE +208 -38
- data/README.md +81 -85
- data/ROADMAP.md +24 -0
- data/Rakefile +2 -0
- data/THIRD_PARTY_NOTICES.md +213 -0
- data/bin/nrdebug +1 -1
- data/init.rb +1 -1
- data/install.rb +1 -1
- data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
- data/lib/new_relic/agent/agent.rb +168 -185
- data/lib/new_relic/agent/agent_logger.rb +5 -1
- data/lib/new_relic/agent/attribute_filter.rb +8 -8
- data/lib/new_relic/agent/attribute_processing.rb +1 -1
- data/lib/new_relic/agent/attributes.rb +152 -0
- data/lib/new_relic/agent/audit_logger.rb +11 -1
- data/lib/new_relic/agent/autostart.rb +20 -15
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command_router.rb +3 -22
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +234 -51
- data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
- data/lib/new_relic/agent/configuration/environment_source.rb +5 -3
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +45 -0
- data/lib/new_relic/agent/configuration/high_security_source.rb +2 -1
- data/lib/new_relic/agent/configuration/manager.rb +14 -10
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
- data/lib/new_relic/agent/configuration/security_policy_source.rb +1 -1
- data/lib/new_relic/agent/configuration/server_source.rb +37 -3
- data/lib/new_relic/agent/configuration/yaml_source.rb +12 -7
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +61 -0
- data/lib/new_relic/agent/connect/response_handler.rb +61 -0
- data/lib/new_relic/agent/custom_event_aggregator.rb +1 -1
- 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 +1 -1
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
- data/lib/new_relic/agent/database.rb +2 -3
- data/lib/new_relic/agent/database_adapter.rb +33 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +3 -3
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +9 -9
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo.rb +2 -2
- data/lib/new_relic/agent/datastores/redis.rb +1 -1
- data/lib/new_relic/agent/datastores.rb +1 -1
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +3 -2
- data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +61 -46
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
- data/lib/new_relic/agent/{distributed_trace_payload.rb → distributed_tracing/distributed_trace_payload.rb} +25 -102
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +39 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +246 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +126 -0
- data/lib/new_relic/agent/distributed_tracing.rb +156 -7
- data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
- data/lib/new_relic/agent/error_collector.rb +36 -19
- data/lib/new_relic/agent/error_event_aggregator.rb +10 -7
- data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
- data/lib/new_relic/agent/event_aggregator.rb +27 -33
- data/lib/new_relic/agent/event_buffer.rb +1 -1
- data/lib/new_relic/agent/event_listener.rb +1 -1
- data/lib/new_relic/agent/event_loop.rb +1 -1
- data/lib/new_relic/agent/external.rb +8 -8
- data/lib/new_relic/agent/guid_generator.rb +28 -0
- data/lib/new_relic/agent/harvester.rb +1 -1
- data/lib/new_relic/agent/heap.rb +1 -1
- data/lib/new_relic/agent/hostname.rb +9 -3
- data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +25 -20
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +29 -14
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -22
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +11 -12
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +17 -5
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -7
- data/lib/new_relic/agent/http_clients/uri_util.rb +12 -11
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +26 -46
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +51 -75
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +81 -56
- data/lib/new_relic/agent/instrumentation/active_job.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_record.rb +85 -38
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +17 -6
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +168 -0
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +35 -11
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +46 -48
- data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +12 -8
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +10 -9
- data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
- data/lib/new_relic/agent/instrumentation/bunny.rb +48 -29
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/curb.rb +66 -19
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +4 -2
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +3 -1
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +7 -4
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
- data/lib/new_relic/agent/instrumentation/excon.rb +2 -2
- data/lib/new_relic/agent/instrumentation/grape.rb +8 -14
- data/lib/new_relic/agent/instrumentation/http.rb +7 -4
- data/lib/new_relic/agent/instrumentation/httpclient.rb +6 -4
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +7 -3
- data/lib/new_relic/agent/instrumentation/memcache.rb +4 -2
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +1 -1
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +1 -1
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +9 -7
- data/lib/new_relic/agent/instrumentation/mongo.rb +10 -4
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +36 -3
- data/lib/new_relic/agent/instrumentation/net.rb +48 -28
- data/lib/new_relic/agent/instrumentation/net_prepend.rb +40 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +100 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +3 -1
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rack.rb +3 -1
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
- data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_cable.rb +6 -7
- data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_controller.rb +4 -4
- data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_view.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake.rb +2 -1
- data/lib/new_relic/agent/instrumentation/redis.rb +12 -6
- data/lib/new_relic/agent/instrumentation/resque.rb +4 -1
- data/lib/new_relic/agent/instrumentation/sequel.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +48 -24
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra.rb +1 -2
- data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +24 -7
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +1 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +2 -2
- data/lib/new_relic/agent/log_once.rb +1 -1
- data/lib/new_relic/agent/logging.rb +139 -0
- data/lib/new_relic/agent/memory_logger.rb +1 -1
- data/lib/new_relic/agent/messaging.rb +6 -74
- data/lib/new_relic/agent/method_tracer.rb +10 -8
- data/lib/new_relic/agent/method_tracer_helpers.rb +3 -3
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +110 -0
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +27 -0
- data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +4 -4
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +3 -5
- data/lib/new_relic/agent/monitors.rb +27 -0
- data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -1
- data/lib/new_relic/agent/new_relic_service.rb +34 -14
- data/lib/new_relic/agent/noticible_error.rb +22 -0
- data/lib/new_relic/agent/null_logger.rb +1 -1
- data/lib/new_relic/agent/obfuscator.rb +1 -1
- data/lib/new_relic/agent/parameter_filtering.rb +19 -6
- data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
- data/lib/new_relic/agent/pipe_channel_manager.rb +1 -1
- data/lib/new_relic/agent/pipe_service.rb +1 -1
- data/lib/new_relic/agent/prepend_supportability.rb +1 -1
- data/lib/new_relic/agent/priority_sampled_buffer.rb +9 -4
- data/lib/new_relic/agent/range_extensions.rb +1 -1
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine.rb +1 -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 +1 -1
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/memory_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +3 -5
- data/lib/new_relic/agent/span_event_primitive.rb +108 -54
- data/lib/new_relic/agent/sql_sampler.rb +6 -6
- data/lib/new_relic/agent/stats.rb +1 -1
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +2 -2
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
- data/lib/new_relic/agent/stats_engine.rb +1 -1
- data/lib/new_relic/agent/supported_versions.rb +3 -3
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/system_info.rb +13 -4
- data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
- data/lib/new_relic/agent/threading/backtrace_node.rb +1 -1
- data/lib/new_relic/agent/threading/backtrace_service.rb +4 -4
- data/lib/new_relic/agent/threading/thread_profile.rb +10 -24
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +66 -19
- data/lib/new_relic/agent/transaction/abstract_segment.rb +32 -5
- data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +177 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +58 -147
- data/lib/new_relic/agent/transaction/external_request_segment.rb +32 -39
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +5 -12
- data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
- data/lib/new_relic/agent/transaction/segment.rb +28 -2
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/trace.rb +6 -13
- data/lib/new_relic/agent/transaction/trace_builder.rb +1 -2
- data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
- data/lib/new_relic/agent/transaction/trace_node.rb +11 -9
- data/lib/new_relic/agent/transaction/tracing.rb +1 -1
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction.rb +104 -84
- data/lib/new_relic/agent/transaction_error_primitive.rb +11 -16
- data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/transaction_event_primitive.rb +29 -40
- data/lib/new_relic/agent/transaction_event_recorder.rb +4 -4
- data/lib/new_relic/agent/transaction_metrics.rb +1 -1
- data/lib/new_relic/agent/transaction_sampler.rb +2 -6
- data/lib/new_relic/agent/transaction_time_aggregator.rb +1 -1
- data/lib/new_relic/agent/utilization/aws.rb +1 -1
- data/lib/new_relic/agent/utilization/azure.rb +1 -1
- data/lib/new_relic/agent/utilization/gcp.rb +1 -1
- 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/utilization_data.rb +1 -1
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
- data/lib/new_relic/agent/vm/mri_vm.rb +7 -5
- data/lib/new_relic/agent/vm/snapshot.rb +1 -1
- data/lib/new_relic/agent/vm.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +1 -1
- data/lib/new_relic/agent.rb +98 -8
- data/lib/new_relic/cli/command.rb +1 -1
- data/lib/new_relic/cli/commands/deployments.rb +2 -3
- data/lib/new_relic/cli/commands/install.rb +4 -3
- data/lib/new_relic/coerce.rb +32 -7
- data/lib/new_relic/collection_helper.rb +1 -1
- data/lib/new_relic/constants.rb +42 -0
- data/lib/new_relic/control/class_methods.rb +8 -2
- data/lib/new_relic/control/frameworks/external.rb +1 -1
- data/lib/new_relic/control/frameworks/merb.rb +1 -1
- data/lib/new_relic/control/frameworks/rails.rb +1 -1
- data/lib/new_relic/control/frameworks/rails3.rb +1 -1
- data/lib/new_relic/control/frameworks/rails4.rb +1 -1
- data/lib/new_relic/control/frameworks/{rails5.rb → rails_notifications.rb} +2 -2
- data/lib/new_relic/control/frameworks/ruby.rb +1 -1
- data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/instance_methods.rb +11 -2
- data/lib/new_relic/control/instrumentation.rb +1 -1
- data/lib/new_relic/control/server_methods.rb +1 -1
- data/lib/new_relic/control.rb +1 -1
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +9 -5
- data/lib/new_relic/environment_report.rb +2 -4
- data/lib/new_relic/helper.rb +1 -1
- data/lib/new_relic/language_support.rb +1 -1
- data/lib/new_relic/latest_changes.rb +2 -2
- data/lib/new_relic/local_environment.rb +1 -1
- data/lib/new_relic/metric_data.rb +1 -1
- data/lib/new_relic/metric_spec.rb +1 -1
- data/lib/new_relic/noticed_error.rb +39 -18
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +1 -1
- data/lib/new_relic/rack/browser_monitoring.rb +16 -9
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +1 -1
- data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +17 -1
- data/lib/new_relic/version.rb +2 -2
- data/lib/newrelic_rpm.rb +1 -1
- data/lib/sequel/extensions/newrelic_instrumentation.rb +1 -1
- data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -1
- data/lib/tasks/all.rb +1 -1
- data/lib/tasks/config.rake +1 -2
- data/lib/tasks/multiverse.rb +35 -1
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +6 -1
- data/newrelic_rpm.gemspec +22 -10
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +356 -76
- metadata +116 -52
- data/.travis.yml +0 -153
- data/lib/new_relic/agent/commands/xray_session.rb +0 -55
- data/lib/new_relic/agent/commands/xray_session_collection.rb +0 -161
- data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -40
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/agent/instrumentation/active_record_4.rb +0 -42
- data/lib/new_relic/agent/instrumentation/active_record_5.rb +0 -41
- data/lib/new_relic/agent/instrumentation/evented_subscriber.rb +0 -104
- data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb +0 -32
- data/lib/new_relic/agent/instrumentation/rails4/action_view.rb +0 -27
- data/lib/new_relic/agent/transaction/attributes.rb +0 -154
- data/lib/new_relic/agent/transaction/xray_sample_buffer.rb +0 -64
- data/lib/new_relic/build.rb +0 -2
- data/lib/new_relic/control/frameworks/rails6.rb +0 -14
- data/lib/new_relic/metrics.rb +0 -13
- data/lib/tasks/versions.html.erb +0 -28
- data/lib/tasks/versions.postface.html +0 -8
- data/lib/tasks/versions.preface.html +0 -9
- data/lib/tasks/versions.rake +0 -65
- data/lib/tasks/versions.txt.erb +0 -14
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/prepend_supportability'
|
6
6
|
|
@@ -11,16 +11,31 @@ module NewRelic
|
|
11
11
|
ACTIVE_RECORD = 'ActiveRecord'.freeze
|
12
12
|
|
13
13
|
module BaseExtensions
|
14
|
-
|
15
|
-
|
16
|
-
|
14
|
+
|
15
|
+
if RUBY_VERSION < "2.7.0"
|
16
|
+
def save(*args, &blk)
|
17
|
+
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
18
|
+
super
|
19
|
+
end
|
20
|
+
end
|
21
|
+
def save!(*args, &blk)
|
22
|
+
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
23
|
+
super
|
24
|
+
end
|
17
25
|
end
|
18
|
-
end
|
19
26
|
|
20
|
-
|
21
|
-
|
22
|
-
|
27
|
+
else
|
28
|
+
def save(*args, **kwargs, &blk)
|
29
|
+
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
30
|
+
super
|
31
|
+
end
|
23
32
|
end
|
33
|
+
def save!(*args, **kwargs, &blk)
|
34
|
+
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
35
|
+
super
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
24
39
|
end
|
25
40
|
end
|
26
41
|
|
@@ -30,11 +45,20 @@ module NewRelic
|
|
30
45
|
# Starting in v5.1.6, this call no longer happens. We'll
|
31
46
|
# have to set the database metrics explicitly now.
|
32
47
|
#
|
33
|
-
|
34
|
-
|
35
|
-
|
48
|
+
if RUBY_VERSION < "2.7.0"
|
49
|
+
def touch(*args, **kwargs, &blk)
|
50
|
+
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
51
|
+
super
|
52
|
+
end
|
53
|
+
end
|
54
|
+
else
|
55
|
+
def touch(*args, **kwargs, &blk)
|
56
|
+
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
57
|
+
super
|
58
|
+
end
|
36
59
|
end
|
37
60
|
end
|
61
|
+
|
38
62
|
end
|
39
63
|
|
40
64
|
module RelationExtensions
|
@@ -1,8 +1,8 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
require 'new_relic/agent/instrumentation/active_record_helper'
|
5
|
-
require 'new_relic/agent/instrumentation/
|
5
|
+
require 'new_relic/agent/instrumentation/notifications_subscriber'
|
6
6
|
|
7
7
|
# Listen for ActiveSupport::Notifications events for ActiveRecord query
|
8
8
|
# events. Write metric data, transaction trace nodes and slow sql
|
@@ -10,7 +10,7 @@ require 'new_relic/agent/instrumentation/evented_subscriber'
|
|
10
10
|
module NewRelic
|
11
11
|
module Agent
|
12
12
|
module Instrumentation
|
13
|
-
class ActiveRecordSubscriber <
|
13
|
+
class ActiveRecordSubscriber < NotificationsSubscriber
|
14
14
|
CACHED_QUERY_NAME = 'CACHE'.freeze
|
15
15
|
|
16
16
|
def initialize
|
@@ -31,6 +31,7 @@ module NewRelic
|
|
31
31
|
# we don't expect this to be called more than once, but we're being
|
32
32
|
# defensive.
|
33
33
|
return if defined?(cached?)
|
34
|
+
|
34
35
|
if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::STRING >= "5.1.0"
|
35
36
|
def cached?(payload)
|
36
37
|
payload.fetch(:cached, false)
|
@@ -45,9 +46,10 @@ module NewRelic
|
|
45
46
|
def start(name, id, payload) #THREAD_LOCAL_ACCESS
|
46
47
|
return if cached?(payload)
|
47
48
|
return unless NewRelic::Agent.tl_is_execution_traced?
|
49
|
+
|
48
50
|
config = active_record_config(payload)
|
49
|
-
|
50
|
-
|
51
|
+
segment = start_segment(config, payload)
|
52
|
+
push_segment(id, segment)
|
51
53
|
rescue => e
|
52
54
|
log_notification_error(e, name, 'start')
|
53
55
|
end
|
@@ -55,8 +57,14 @@ module NewRelic
|
|
55
57
|
def finish(name, id, payload) #THREAD_LOCAL_ACCESS
|
56
58
|
return if cached?(payload)
|
57
59
|
return unless state.is_execution_traced?
|
58
|
-
|
59
|
-
|
60
|
+
|
61
|
+
if segment = pop_segment(id)
|
62
|
+
if exception = exception_object(payload)
|
63
|
+
segment.notice_error(exception)
|
64
|
+
end
|
65
|
+
segment.finish
|
66
|
+
end
|
67
|
+
|
60
68
|
rescue => e
|
61
69
|
log_notification_error(e, name, 'finish')
|
62
70
|
end
|
@@ -78,6 +86,13 @@ module NewRelic
|
|
78
86
|
def active_record_config(payload)
|
79
87
|
return unless payload[:connection_id]
|
80
88
|
|
89
|
+
# handle if the notification payload provides the AR connection
|
90
|
+
# available in Rails 6+ & our ActiveRecordNotifications#log extension
|
91
|
+
if payload[:connection]
|
92
|
+
connection_config = payload[:connection].instance_variable_get(:@config)
|
93
|
+
return connection_config if connection_config
|
94
|
+
end
|
95
|
+
|
81
96
|
connection = nil
|
82
97
|
connection_id = payload[:connection_id]
|
83
98
|
|
@@ -92,50 +107,33 @@ module NewRelic
|
|
92
107
|
connection.instance_variable_get(:@config) if connection
|
93
108
|
end
|
94
109
|
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
110
|
+
def start_segment(config, payload)
|
111
|
+
sql = Helper.correctly_encoded payload[:sql]
|
112
|
+
product, operation, collection = ActiveRecordHelper.product_operation_collection_for(
|
113
|
+
payload[:name],
|
114
|
+
sql,
|
115
|
+
config && config[:adapter]
|
116
|
+
)
|
117
|
+
|
118
|
+
host = nil
|
119
|
+
port_path_or_id = nil
|
120
|
+
database = nil
|
121
|
+
|
122
|
+
if ActiveRecordHelper::InstanceIdentification.supported_adapter?(config)
|
123
|
+
host = ActiveRecordHelper::InstanceIdentification.host(config)
|
124
|
+
port_path_or_id = ActiveRecordHelper::InstanceIdentification.port_path_or_id(config)
|
125
|
+
database = config && config[:database]
|
101
126
|
end
|
102
127
|
|
103
|
-
|
104
|
-
|
105
|
-
|
128
|
+
segment = Tracer.start_datastore_segment(product: product,
|
129
|
+
operation: operation,
|
130
|
+
collection: collection,
|
131
|
+
host: host,
|
132
|
+
port_path_or_id: port_path_or_id,
|
133
|
+
database_name: database)
|
106
134
|
|
107
|
-
|
108
|
-
|
109
|
-
database = nil
|
110
|
-
|
111
|
-
if ActiveRecordHelper::InstanceIdentification.supported_adapter?(@config)
|
112
|
-
host = ActiveRecordHelper::InstanceIdentification.host(@config)
|
113
|
-
port_path_or_id = ActiveRecordHelper::InstanceIdentification.port_path_or_id(@config)
|
114
|
-
database = @config && @config[:database]
|
115
|
-
end
|
116
|
-
|
117
|
-
segment = Tracer.start_datastore_segment product: product,
|
118
|
-
operation: operation,
|
119
|
-
collection: collection,
|
120
|
-
host: host,
|
121
|
-
port_path_or_id: port_path_or_id,
|
122
|
-
database_name: database
|
123
|
-
|
124
|
-
segment._notice_sql sql, @config, @explainer, payload[:binds], payload[:name]
|
125
|
-
segment
|
126
|
-
end
|
127
|
-
|
128
|
-
def finish
|
129
|
-
@segment.finish if @segment
|
130
|
-
end
|
131
|
-
|
132
|
-
def state
|
133
|
-
@state ||= NewRelic::Agent::Tracer.state
|
134
|
-
end
|
135
|
-
|
136
|
-
def sql
|
137
|
-
@sql ||= Helper.correctly_encoded payload[:sql]
|
138
|
-
end
|
135
|
+
segment._notice_sql sql, config, @explainer, payload[:binds], payload[:name]
|
136
|
+
segment
|
139
137
|
end
|
140
138
|
end
|
141
139
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/instrumentation/active_storage_subscriber'
|
6
6
|
|
@@ -1,12 +1,12 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
4
|
-
require 'new_relic/agent/instrumentation/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
require 'new_relic/agent/instrumentation/notifications_subscriber'
|
5
5
|
|
6
6
|
module NewRelic
|
7
7
|
module Agent
|
8
8
|
module Instrumentation
|
9
|
-
class ActiveStorageSubscriber <
|
9
|
+
class ActiveStorageSubscriber < NotificationsSubscriber
|
10
10
|
def start name, id, payload
|
11
11
|
return unless state.is_execution_traced?
|
12
12
|
start_segment name, id, payload
|
@@ -16,7 +16,7 @@ module NewRelic
|
|
16
16
|
|
17
17
|
def finish name, id, payload
|
18
18
|
return unless state.is_execution_traced?
|
19
|
-
finish_segment id
|
19
|
+
finish_segment id, payload
|
20
20
|
rescue => e
|
21
21
|
log_notification_error e, name, 'finish'
|
22
22
|
end
|
@@ -25,12 +25,16 @@ module NewRelic
|
|
25
25
|
segment = Tracer.start_segment name: metric_name(name, payload)
|
26
26
|
segment.params[:key] = payload[:key]
|
27
27
|
segment.params[:exist] = payload[:exist] if payload.key? :exist
|
28
|
-
|
28
|
+
push_segment id, segment
|
29
29
|
end
|
30
30
|
|
31
|
-
def finish_segment id
|
32
|
-
segment =
|
33
|
-
|
31
|
+
def finish_segment id, payload
|
32
|
+
if segment = pop_segment(id)
|
33
|
+
if exception = exception_object(payload)
|
34
|
+
segment.notice_error(exception)
|
35
|
+
end
|
36
|
+
segment.finish
|
37
|
+
end
|
34
38
|
end
|
35
39
|
|
36
40
|
def metric_name name, payload
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/database'
|
6
6
|
|
@@ -8,16 +8,17 @@ module NewRelic
|
|
8
8
|
module Instrumentation
|
9
9
|
module ActsAsSolrInstrumentation
|
10
10
|
module ParserMethodsInstrumentation
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
11
|
+
|
12
|
+
def parse_query_with_newrelic(*args)
|
13
|
+
self.class.trace_execution_scoped(["SolrClient/ActsAsSolr/query"]) do
|
14
|
+
begin
|
15
|
+
parse_query_without_newrelic(*args)
|
16
|
+
ensure
|
17
|
+
return unless txn = ::NewRelic::Agent::Tracer.current_transaction
|
18
|
+
txn.current_segment.params[:statement] = ::NewRelic::Agent::Database.truncate_query(args.first.inspect) rescue nil
|
19
|
+
end
|
18
20
|
end
|
19
21
|
end
|
20
|
-
end
|
21
22
|
end
|
22
23
|
end
|
23
24
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
DependencyDetection.defer do
|
6
6
|
@name = :authlogic
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
DependencyDetection.defer do
|
6
7
|
named :bunny
|
@@ -11,7 +12,7 @@ DependencyDetection.defer do
|
|
11
12
|
|
12
13
|
executes do
|
13
14
|
::NewRelic::Agent.logger.info 'Installing Bunny instrumentation'
|
14
|
-
require 'new_relic/agent/cross_app_tracing'
|
15
|
+
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
15
16
|
require 'new_relic/agent/messaging'
|
16
17
|
require 'new_relic/agent/transaction/message_broker_segment'
|
17
18
|
end
|
@@ -41,10 +42,11 @@ DependencyDetection.defer do
|
|
41
42
|
)
|
42
43
|
rescue => e
|
43
44
|
NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Exchange#publish", e
|
44
|
-
end
|
45
|
-
|
46
|
-
begin
|
47
45
|
publish_without_new_relic payload, opts
|
46
|
+
else
|
47
|
+
NewRelic::Agent::Tracer.capture_segment_error segment do
|
48
|
+
publish_without_new_relic payload, opts
|
49
|
+
end
|
48
50
|
ensure
|
49
51
|
segment.finish if segment
|
50
52
|
end
|
@@ -55,28 +57,40 @@ DependencyDetection.defer do
|
|
55
57
|
alias_method :pop_without_new_relic, :pop
|
56
58
|
|
57
59
|
def pop(opts = {:manual_ack => false}, &block)
|
58
|
-
|
59
|
-
|
60
|
-
|
60
|
+
bunny_error, delivery_info, message_properties, _payload = nil, nil, nil, nil
|
61
|
+
begin
|
62
|
+
t0 = Time.now
|
63
|
+
msg = pop_without_new_relic opts, &block
|
64
|
+
delivery_info, message_properties, _payload = msg
|
65
|
+
rescue StandardError => error
|
66
|
+
bunny_error = error
|
67
|
+
end
|
61
68
|
|
62
69
|
begin
|
63
|
-
if delivery_info
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
destination_name: exchange_name,
|
70
|
-
delivery_info: delivery_info,
|
71
|
-
message_properties: message_properties,
|
72
|
-
exchange_type: exchange_type,
|
73
|
-
queue_name: name,
|
74
|
-
start_time: t0
|
75
|
-
)
|
70
|
+
exchange_name, exchange_type = if delivery_info
|
71
|
+
[ NewRelic::Agent::Instrumentation::Bunny.exchange_name(delivery_info.exchange),
|
72
|
+
NewRelic::Agent::Instrumentation::Bunny.exchange_type(delivery_info, channel) ]
|
73
|
+
else
|
74
|
+
[ NewRelic::Agent::Instrumentation::Bunny.exchange_name(NewRelic::EMPTY_STR),
|
75
|
+
NewRelic::Agent::Instrumentation::Bunny.exchange_type({}, channel) ]
|
76
76
|
end
|
77
77
|
|
78
|
+
segment = NewRelic::Agent::Messaging.start_amqp_consume_segment(
|
79
|
+
library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
|
80
|
+
destination_name: exchange_name,
|
81
|
+
delivery_info: (delivery_info || {}),
|
82
|
+
message_properties: (message_properties || {headers: {}}),
|
83
|
+
exchange_type: exchange_type,
|
84
|
+
queue_name: name,
|
85
|
+
start_time: t0
|
86
|
+
)
|
78
87
|
rescue => e
|
79
88
|
NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#pop", e
|
89
|
+
else
|
90
|
+
if bunny_error
|
91
|
+
segment.notice_error bunny_error
|
92
|
+
raise bunny_error
|
93
|
+
end
|
80
94
|
ensure
|
81
95
|
segment.finish if segment
|
82
96
|
end
|
@@ -97,14 +111,16 @@ DependencyDetection.defer do
|
|
97
111
|
)
|
98
112
|
rescue => e
|
99
113
|
NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#purge", e
|
100
|
-
end
|
101
|
-
|
102
|
-
begin
|
103
114
|
purge_without_new_relic(*args)
|
115
|
+
else
|
116
|
+
NewRelic::Agent::Tracer.capture_segment_error segment do
|
117
|
+
purge_without_new_relic(*args)
|
118
|
+
end
|
104
119
|
ensure
|
105
120
|
segment.finish if segment
|
106
121
|
end
|
107
122
|
end
|
123
|
+
|
108
124
|
end
|
109
125
|
|
110
126
|
class Consumer
|
@@ -125,6 +141,7 @@ DependencyDetection.defer do
|
|
125
141
|
call_without_new_relic(*args)
|
126
142
|
end
|
127
143
|
end
|
144
|
+
|
128
145
|
end
|
129
146
|
end
|
130
147
|
end
|
@@ -134,18 +151,20 @@ module NewRelic
|
|
134
151
|
module Agent
|
135
152
|
module Instrumentation
|
136
153
|
module Bunny
|
137
|
-
LIBRARY = 'RabbitMQ'
|
138
|
-
|
139
|
-
|
154
|
+
LIBRARY = 'RabbitMQ'
|
155
|
+
DEFAULT_NAME = 'Default'
|
156
|
+
DEFAULT_TYPE = :direct
|
157
|
+
|
158
|
+
SLASH = '/'
|
140
159
|
|
141
160
|
class << self
|
142
161
|
def exchange_name name
|
143
|
-
name.empty? ?
|
162
|
+
name.empty? ? DEFAULT_NAME : name
|
144
163
|
end
|
145
164
|
|
146
165
|
def exchange_type delivery_info, channel
|
147
166
|
if di_exchange = delivery_info[:exchange]
|
148
|
-
return
|
167
|
+
return DEFAULT_TYPE if di_exchange.empty?
|
149
168
|
return channel.exchanges[delivery_info[:exchange]].type if channel.exchanges[di_exchange]
|
150
169
|
end
|
151
170
|
end
|