newrelic_rpm 6.9.0.363 → 6.12.0.367
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +3 -0
- data/.travis.yml +32 -2
- data/CHANGELOG.md +172 -10
- data/CODE_OF_CONDUCT.md +46 -0
- data/CONTRIBUTING.md +56 -12
- data/Gemfile +6 -2
- data/LICENSE +208 -38
- data/README.md +61 -89
- 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.rb +15 -5
- data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
- data/lib/new_relic/agent/agent.rb +11 -6
- data/lib/new_relic/agent/agent_logger.rb +1 -1
- data/lib/new_relic/agent/attribute_filter.rb +1 -1
- data/lib/new_relic/agent/attribute_processing.rb +1 -1
- data/lib/new_relic/agent/attributes.rb +3 -1
- data/lib/new_relic/agent/audit_logger.rb +1 -1
- data/lib/new_relic/agent/autostart.rb +1 -1
- 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 +1 -1
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +28 -1
- data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
- data/lib/new_relic/agent/configuration/environment_source.rb +1 -1
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -1
- data/lib/new_relic/agent/configuration/high_security_source.rb +1 -1
- data/lib/new_relic/agent/configuration/manager.rb +1 -1
- 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 +1 -1
- data/lib/new_relic/agent/configuration/yaml_source.rb +1 -1
- 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 +1 -1
- data/lib/new_relic/agent/database.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/datastores.rb +1 -1
- data/lib/new_relic/agent/datastores/metric_helper.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo.rb +2 -2
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
- data/lib/new_relic/agent/datastores/redis.rb +1 -1
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +3 -2
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/{distributed_trace_intrinsics.rb → distributed_trace_attributes.rb} +9 -5
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +3 -4
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +2 -2
- data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
- data/lib/new_relic/agent/error_collector.rb +31 -12
- data/lib/new_relic/agent/error_event_aggregator.rb +5 -5
- data/lib/new_relic/agent/error_trace_aggregator.rb +1 -1
- data/lib/new_relic/agent/event_aggregator.rb +1 -1
- 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 +1 -1
- data/lib/new_relic/agent/guid_generator.rb +1 -1
- 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 +8 -2
- 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 +4 -3
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +5 -6
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +5 -1
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +12 -3
- 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 +82 -24
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +92 -34
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +8 -3
- data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +9 -5
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +24 -8
- data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
- data/lib/new_relic/agent/instrumentation/bunny.rb +114 -51
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/curb.rb +92 -27
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +4 -2
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +61 -25
- data/lib/new_relic/agent/instrumentation/excon.rb +1 -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/grape.rb +1 -1
- data/lib/new_relic/agent/instrumentation/http.rb +6 -3
- data/lib/new_relic/agent/instrumentation/httpclient.rb +5 -3
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
- data/lib/new_relic/agent/instrumentation/memcache.rb +4 -2
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +7 -3
- 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 +12 -4
- 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 +59 -22
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +26 -2
- data/lib/new_relic/agent/instrumentation/padrino.rb +40 -16
- 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 +36 -13
- 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/rails_notifications/action_cable.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake.rb +54 -20
- data/lib/new_relic/agent/instrumentation/redis.rb +141 -56
- data/lib/new_relic/agent/instrumentation/resque.rb +1 -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.rb +62 -23
- 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/sunspot.rb +1 -1
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +23 -6
- data/lib/new_relic/agent/internal_agent_error.rb +1 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +1 -1
- data/lib/new_relic/agent/log_once.rb +1 -1
- data/lib/new_relic/agent/logging.rb +2 -2
- data/lib/new_relic/agent/memory_logger.rb +1 -1
- data/lib/new_relic/agent/messaging.rb +1 -1
- data/lib/new_relic/agent/method_tracer.rb +16 -5
- data/lib/new_relic/agent/method_tracer_helpers.rb +2 -2
- data/lib/new_relic/agent/monitors.rb +1 -1
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +1 -1
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +1 -1
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -1
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +1 -1
- data/lib/new_relic/agent/new_relic_service.rb +1 -2
- 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/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 +1 -1
- 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 +8 -5
- data/lib/new_relic/agent/range_extensions.rb +1 -1
- data/lib/new_relic/agent/rules_engine.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/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 +1 -1
- 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 +1 -1
- data/lib/new_relic/agent/span_event_primitive.rb +71 -37
- data/lib/new_relic/agent/sql_sampler.rb +4 -4
- data/lib/new_relic/agent/stats.rb +1 -1
- data/lib/new_relic/agent/stats_engine.rb +1 -1
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -1
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
- data/lib/new_relic/agent/supported_versions.rb +1 -1
- 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 +1 -1
- data/lib/new_relic/agent/threading/thread_profile.rb +1 -1
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +31 -16
- data/lib/new_relic/agent/transaction.rb +67 -46
- data/lib/new_relic/agent/transaction/abstract_segment.rb +29 -2
- data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +3 -3
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +2 -2
- data/lib/new_relic/agent/transaction/external_request_segment.rb +26 -10
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
- data/lib/new_relic/agent/transaction/segment.rb +18 -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 +1 -1
- data/lib/new_relic/agent/transaction/trace_builder.rb +1 -1
- data/lib/new_relic/agent/transaction/trace_context.rb +1 -1
- data/lib/new_relic/agent/transaction/trace_node.rb +1 -1
- 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_error_primitive.rb +8 -6
- data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/transaction_event_primitive.rb +3 -3
- data/lib/new_relic/agent/transaction_event_recorder.rb +1 -1
- data/lib/new_relic/agent/transaction_metrics.rb +1 -1
- data/lib/new_relic/agent/transaction_sampler.rb +1 -1
- 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.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 +1 -1
- data/lib/new_relic/agent/vm/snapshot.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +1 -1
- data/lib/new_relic/cli/command.rb +1 -1
- data/lib/new_relic/cli/commands/deployments.rb +1 -1
- data/lib/new_relic/cli/commands/install.rb +4 -3
- data/lib/new_relic/coerce.rb +1 -1
- data/lib/new_relic/collection_helper.rb +1 -1
- data/lib/new_relic/constants.rb +5 -1
- data/lib/new_relic/control.rb +1 -1
- data/lib/new_relic/control/class_methods.rb +1 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- 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/rails_notifications.rb +1 -1
- 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/instance_methods.rb +1 -1
- data/lib/new_relic/control/instrumentation.rb +1 -1
- data/lib/new_relic/control/server_methods.rb +1 -1
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +1 -1
- data/lib/new_relic/environment_report.rb +6 -2
- 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/metrics.rb +1 -1
- data/lib/new_relic/noticed_error.rb +29 -10
- data/lib/new_relic/rack.rb +1 -1
- 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 +3 -2
- data/lib/new_relic/recipes.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/supportability_helper.rb +1 -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/multiverse.rb +26 -1
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +1 -1
- data/newrelic_rpm.gemspec +11 -9
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +231 -70
- metadata +18 -15
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/true +0 -0
@@ -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/datastores/metric_helper'
|
6
6
|
|
@@ -19,20 +19,38 @@ module NewRelic
|
|
19
19
|
def instrument_save_methods
|
20
20
|
::ActiveRecord::Base.class_eval do
|
21
21
|
alias_method :save_without_newrelic, :save
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
22
|
+
|
23
|
+
if RUBY_VERSION < "2.7.0"
|
24
|
+
def save(*args, &blk)
|
25
|
+
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
26
|
+
save_without_newrelic(*args, &blk)
|
27
|
+
end
|
28
|
+
end
|
29
|
+
else
|
30
|
+
def save(*args, **kwargs, &blk)
|
31
|
+
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
32
|
+
save_without_newrelic(*args, **kwargs, &blk)
|
33
|
+
end
|
26
34
|
end
|
35
|
+
|
27
36
|
end
|
28
37
|
|
29
38
|
alias_method :save_without_newrelic!, :save!
|
30
39
|
|
31
|
-
|
32
|
-
|
33
|
-
|
40
|
+
if RUBY_VERSION < "2.7.0"
|
41
|
+
def save!(*args, &blk)
|
42
|
+
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
43
|
+
save_without_newrelic!(*args, &blk)
|
44
|
+
end
|
45
|
+
end
|
46
|
+
else
|
47
|
+
def save!(*args, **kwargs, &blk)
|
48
|
+
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
49
|
+
save_without_newrelic!(*args, **kwargs, &blk)
|
50
|
+
end
|
34
51
|
end
|
35
52
|
end
|
53
|
+
|
36
54
|
end
|
37
55
|
end
|
38
56
|
|
@@ -40,42 +58,82 @@ module NewRelic
|
|
40
58
|
::ActiveRecord::Relation.class_eval do
|
41
59
|
alias_method :update_all_without_newrelic, :update_all
|
42
60
|
|
43
|
-
|
44
|
-
|
45
|
-
|
61
|
+
if RUBY_VERSION < "2.7.0"
|
62
|
+
def update_all(*args, &blk)
|
63
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
64
|
+
update_all_without_newrelic(*args, &blk)
|
65
|
+
end
|
66
|
+
end
|
67
|
+
else
|
68
|
+
def update_all(*args, **kwargs, &blk)
|
69
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
70
|
+
update_all_without_newrelic(*args, **kwargs, &blk)
|
71
|
+
end
|
46
72
|
end
|
47
73
|
end
|
48
|
-
|
74
|
+
|
49
75
|
alias_method :delete_all_without_newrelic, :delete_all
|
50
76
|
|
51
|
-
|
52
|
-
|
53
|
-
|
77
|
+
if RUBY_VERSION < "2.7.0"
|
78
|
+
def delete_all(*args, &blk)
|
79
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
80
|
+
delete_all_without_newrelic(*args, &blk)
|
81
|
+
end
|
82
|
+
end
|
83
|
+
else
|
84
|
+
def delete_all(*args, **kwargs, &blk)
|
85
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
86
|
+
delete_all_without_newrelic(*args, **kwargs, &blk)
|
87
|
+
end
|
54
88
|
end
|
55
89
|
end
|
56
90
|
|
57
91
|
alias_method :destroy_all_without_newrelic, :destroy_all
|
58
92
|
|
59
|
-
|
60
|
-
|
61
|
-
|
93
|
+
if RUBY_VERSION < "2.7.0"
|
94
|
+
def destroy_all(*args, &blk)
|
95
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
96
|
+
destroy_all_without_newrelic(*args, &blk)
|
97
|
+
end
|
98
|
+
end
|
99
|
+
else
|
100
|
+
def destroy_all(*args, **kwargs, &blk)
|
101
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
102
|
+
destroy_all_without_newrelic(*args, **kwargs, &blk)
|
103
|
+
end
|
62
104
|
end
|
63
105
|
end
|
64
106
|
|
65
107
|
alias_method :calculate_without_newrelic, :calculate
|
66
108
|
|
67
|
-
|
68
|
-
|
69
|
-
|
109
|
+
if RUBY_VERSION < "2.7.0"
|
110
|
+
def calculate(*args, &blk)
|
111
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
112
|
+
calculate_without_newrelic(*args, &blk)
|
113
|
+
end
|
114
|
+
end
|
115
|
+
else
|
116
|
+
def calculate(*args, **kwargs, &blk)
|
117
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
118
|
+
calculate_without_newrelic(*args, **kwargs, &blk)
|
119
|
+
end
|
70
120
|
end
|
71
121
|
end
|
72
122
|
|
73
123
|
if method_defined?(:pluck)
|
74
124
|
alias_method :pluck_without_newrelic, :pluck
|
75
125
|
|
76
|
-
|
77
|
-
|
78
|
-
|
126
|
+
if RUBY_VERSION < "2.7.0"
|
127
|
+
def pluck(*args, &blk)
|
128
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
129
|
+
pluck_without_newrelic(*args, &blk)
|
130
|
+
end
|
131
|
+
end
|
132
|
+
else
|
133
|
+
def pluck(*args, **kwargs, &blk)
|
134
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
135
|
+
pluck_without_newrelic(*args, **kwargs, &blk)
|
136
|
+
end
|
79
137
|
end
|
80
138
|
end
|
81
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_record_subscriber'
|
6
6
|
require 'new_relic/agent/instrumentation/active_record_prepend'
|
@@ -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,42 +45,85 @@ 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
|
41
|
-
|
42
|
-
|
43
|
-
|
65
|
+
if RUBY_VERSION < "2.7.0"
|
66
|
+
def update_all(*args, &blk)
|
67
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
68
|
+
super
|
69
|
+
end
|
44
70
|
end
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
71
|
+
|
72
|
+
def delete_all(*args, &blk)
|
73
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
74
|
+
super
|
75
|
+
end
|
50
76
|
end
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
77
|
+
|
78
|
+
def destroy_all(*args, &blk)
|
79
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
80
|
+
super
|
81
|
+
end
|
56
82
|
end
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
83
|
+
|
84
|
+
def calculate(*args, &blk)
|
85
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
86
|
+
super
|
87
|
+
end
|
62
88
|
end
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
89
|
+
|
90
|
+
def pluck(*args, &blk)
|
91
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
92
|
+
super
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
96
|
+
else
|
97
|
+
def update_all(*args, **kwargs, &blk)
|
98
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
99
|
+
super
|
100
|
+
end
|
68
101
|
end
|
102
|
+
|
103
|
+
def delete_all(*args, **kwargs, &blk)
|
104
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
105
|
+
super
|
106
|
+
end
|
107
|
+
end
|
108
|
+
|
109
|
+
def destroy_all(*args, **kwargs, &blk)
|
110
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
111
|
+
super
|
112
|
+
end
|
113
|
+
end
|
114
|
+
|
115
|
+
def calculate(*args, **kwargs, &blk)
|
116
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
117
|
+
super
|
118
|
+
end
|
119
|
+
end
|
120
|
+
|
121
|
+
def pluck(*args, **kwargs, &blk)
|
122
|
+
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
123
|
+
super
|
124
|
+
end
|
125
|
+
end
|
126
|
+
|
69
127
|
end
|
70
128
|
end
|
71
129
|
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
|
require 'new_relic/agent/instrumentation/active_record_helper'
|
5
5
|
require 'new_relic/agent/instrumentation/notifications_subscriber'
|
6
6
|
|
@@ -58,8 +58,13 @@ module NewRelic
|
|
58
58
|
return if cached?(payload)
|
59
59
|
return unless state.is_execution_traced?
|
60
60
|
|
61
|
-
segment = pop_segment(id)
|
62
|
-
|
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
|
+
|
63
68
|
rescue => e
|
64
69
|
log_notification_error(e, name, 'finish')
|
65
70
|
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,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
|
require 'new_relic/agent/instrumentation/notifications_subscriber'
|
5
5
|
|
6
6
|
module NewRelic
|
@@ -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
|
@@ -28,9 +28,13 @@ module NewRelic
|
|
28
28
|
push_segment id, segment
|
29
29
|
end
|
30
30
|
|
31
|
-
def finish_segment id
|
32
|
-
segment = pop_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,15 +8,31 @@ module NewRelic
|
|
8
8
|
module Instrumentation
|
9
9
|
module ActsAsSolrInstrumentation
|
10
10
|
module ParserMethodsInstrumentation
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
11
|
+
|
12
|
+
if RUBY_VERSION < "2.7.0"
|
13
|
+
def parse_query_with_newrelic(*args)
|
14
|
+
self.class.trace_execution_scoped(["SolrClient/ActsAsSolr/query"]) do
|
15
|
+
begin
|
16
|
+
parse_query_without_newrelic(*args)
|
17
|
+
ensure
|
18
|
+
return unless txn = ::NewRelic::Agent::Tracer.current_transaction
|
19
|
+
txn.current_segment.params[:statement] = ::NewRelic::Agent::Database.truncate_query(args.first.inspect) rescue nil
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
else
|
25
|
+
def parse_query_with_newrelic(*args, **kwargs)
|
26
|
+
self.class.trace_execution_scoped(["SolrClient/ActsAsSolr/query"]) do
|
27
|
+
begin
|
28
|
+
parse_query_without_newrelic(*args, **kwargs)
|
29
|
+
ensure
|
30
|
+
return unless txn = ::NewRelic::Agent::Tracer.current_transaction
|
31
|
+
txn.current_segment.params[:statement] = ::NewRelic::Agent::Database.truncate_query(args.first.inspect) rescue nil
|
32
|
+
end
|
18
33
|
end
|
19
34
|
end
|
35
|
+
|
20
36
|
end
|
21
37
|
end
|
22
38
|
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
|
@@ -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
|
-
msg = pop_without_new_relic opts, &block
|
60
|
-
delivery_info, message_properties, _payload = msg
|
61
|
-
|
60
|
+
bunny_error, delivery_info, message_properties, _payload = nil, nil, nil, nil
|
62
61
|
begin
|
63
|
-
|
64
|
-
|
65
|
-
|
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
|
66
68
|
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
delivery_info
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
start_time: t0
|
75
|
-
)
|
69
|
+
begin
|
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
|
@@ -86,45 +100,92 @@ DependencyDetection.defer do
|
|
86
100
|
|
87
101
|
alias_method :purge_without_new_relic, :purge
|
88
102
|
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
103
|
+
if RUBY_VERSION < "2.7.0"
|
104
|
+
def purge *args
|
105
|
+
begin
|
106
|
+
type = server_named? ? :temporary_queue : :queue
|
107
|
+
segment = NewRelic::Agent::Tracer.start_message_broker_segment(
|
108
|
+
action: :purge,
|
109
|
+
library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
|
110
|
+
destination_type: type,
|
111
|
+
destination_name: name
|
112
|
+
)
|
113
|
+
rescue => e
|
114
|
+
NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#purge", e
|
115
|
+
purge_without_new_relic(*args)
|
116
|
+
else
|
117
|
+
NewRelic::Agent::Tracer.capture_segment_error segment do
|
118
|
+
purge_without_new_relic(*args)
|
119
|
+
end
|
120
|
+
ensure
|
121
|
+
segment.finish if segment
|
122
|
+
end
|
100
123
|
end
|
101
124
|
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
125
|
+
else
|
126
|
+
def purge *args, **kwargs
|
127
|
+
begin
|
128
|
+
type = server_named? ? :temporary_queue : :queue
|
129
|
+
segment = NewRelic::Agent::Tracer.start_message_broker_segment(
|
130
|
+
action: :purge,
|
131
|
+
library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
|
132
|
+
destination_type: type,
|
133
|
+
destination_name: name
|
134
|
+
)
|
135
|
+
rescue => e
|
136
|
+
NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#purge", e
|
137
|
+
purge_without_new_relic(*args, **kwargs)
|
138
|
+
else
|
139
|
+
NewRelic::Agent::Tracer.capture_segment_error segment do
|
140
|
+
purge_without_new_relic(*args, **kwargs)
|
141
|
+
end
|
142
|
+
ensure
|
143
|
+
segment.finish if segment
|
144
|
+
end
|
106
145
|
end
|
107
146
|
end
|
147
|
+
|
108
148
|
end
|
109
149
|
|
110
150
|
class Consumer
|
111
151
|
alias_method :call_without_new_relic, :call
|
112
152
|
|
113
|
-
|
114
|
-
|
115
|
-
|
153
|
+
if RUBY_VERSION < "2.7.0"
|
154
|
+
def call *args
|
155
|
+
delivery_info, message_properties, _ = args
|
156
|
+
queue_name = queue.respond_to?(:name) ? queue.name : queue
|
157
|
+
|
158
|
+
NewRelic::Agent::Messaging.wrap_amqp_consume_transaction(
|
159
|
+
library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
|
160
|
+
destination_name: NewRelic::Agent::Instrumentation::Bunny.exchange_name(delivery_info.exchange),
|
161
|
+
delivery_info: delivery_info,
|
162
|
+
message_properties: message_properties,
|
163
|
+
exchange_type: NewRelic::Agent::Instrumentation::Bunny.exchange_type(delivery_info, channel),
|
164
|
+
queue_name: queue_name) do
|
165
|
+
|
166
|
+
call_without_new_relic(*args)
|
167
|
+
end
|
168
|
+
end
|
169
|
+
else
|
170
|
+
def call *args, **kwargs
|
171
|
+
delivery_info, message_properties, _ = args
|
172
|
+
queue_name = queue.respond_to?(:name) ? queue.name : queue
|
116
173
|
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
174
|
+
NewRelic::Agent::Messaging.wrap_amqp_consume_transaction(
|
175
|
+
library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
|
176
|
+
destination_name: NewRelic::Agent::Instrumentation::Bunny.exchange_name(delivery_info.exchange),
|
177
|
+
delivery_info: delivery_info,
|
178
|
+
message_properties: message_properties,
|
179
|
+
exchange_type: NewRelic::Agent::Instrumentation::Bunny.exchange_type(delivery_info, channel),
|
180
|
+
queue_name: queue_name) do
|
124
181
|
|
125
|
-
|
182
|
+
call_without_new_relic(*args, **kwargs)
|
183
|
+
end
|
126
184
|
end
|
127
185
|
end
|
186
|
+
|
187
|
+
|
188
|
+
|
128
189
|
end
|
129
190
|
end
|
130
191
|
end
|
@@ -134,18 +195,20 @@ module NewRelic
|
|
134
195
|
module Agent
|
135
196
|
module Instrumentation
|
136
197
|
module Bunny
|
137
|
-
LIBRARY = 'RabbitMQ'
|
138
|
-
|
139
|
-
|
198
|
+
LIBRARY = 'RabbitMQ'
|
199
|
+
DEFAULT_NAME = 'Default'
|
200
|
+
DEFAULT_TYPE = :direct
|
201
|
+
|
202
|
+
SLASH = '/'
|
140
203
|
|
141
204
|
class << self
|
142
205
|
def exchange_name name
|
143
|
-
name.empty? ?
|
206
|
+
name.empty? ? DEFAULT_NAME : name
|
144
207
|
end
|
145
208
|
|
146
209
|
def exchange_type delivery_info, channel
|
147
210
|
if di_exchange = delivery_info[:exchange]
|
148
|
-
return
|
211
|
+
return DEFAULT_TYPE if di_exchange.empty?
|
149
212
|
return channel.exchanges[delivery_info[:exchange]].type if channel.exchanges[di_exchange]
|
150
213
|
end
|
151
214
|
end
|