newrelic_rpm 6.7.0.359 → 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 +493 -4
- 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 +63 -44
- 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 +1 -1
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +138 -17
- 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 +2 -2
- 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 +4 -12
- 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/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 +34 -17
- data/lib/new_relic/agent/error_event_aggregator.rb +8 -6
- 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 +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 +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 +12 -11
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +6 -8
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +5 -1
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +12 -4
- 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 +1 -1
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +35 -11
- 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 +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 +6 -11
- 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 +26 -2
- 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/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 +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 +1 -1
- data/lib/new_relic/agent/log_once.rb +1 -1
- data/lib/new_relic/agent/logging.rb +19 -5
- 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} +2 -2
- 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 -10
- 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/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 +2 -1
- 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 +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 +34 -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 +3 -5
- data/lib/new_relic/agent/transaction/trace_builder.rb +1 -1
- 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 -82
- 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 +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/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 +49 -8
- data/lib/new_relic/cli/command.rb +1 -1
- data/lib/new_relic/cli/commands/deployments.rb +1 -2
- 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 +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/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 +6 -1
- 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/multiverse.rb +35 -1
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +6 -1
- data/newrelic_rpm.gemspec +18 -13
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +339 -72
- metadata +104 -41
- data/.travis.yml +0 -175
- 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/transaction/attributes.rb +0 -154
- data/lib/new_relic/build.rb +0 -2
- 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/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
|
@@ -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/transaction'
|
6
6
|
require 'new_relic/agent/instrumentation/queue_time'
|
@@ -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
|
named :curb
|
@@ -14,7 +14,7 @@ DependencyDetection.defer do
|
|
14
14
|
|
15
15
|
executes do
|
16
16
|
::NewRelic::Agent.logger.info 'Installing Curb instrumentation'
|
17
|
-
require 'new_relic/agent/cross_app_tracing'
|
17
|
+
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
18
18
|
require 'new_relic/agent/http_clients/curb_wrappers'
|
19
19
|
end
|
20
20
|
|
@@ -22,10 +22,12 @@ DependencyDetection.defer do
|
|
22
22
|
class Curl::Easy
|
23
23
|
|
24
24
|
attr_accessor :_nr_instrumented,
|
25
|
+
:_nr_failure_instrumented,
|
25
26
|
:_nr_http_verb,
|
26
27
|
:_nr_header_str,
|
27
28
|
:_nr_original_on_header,
|
28
29
|
:_nr_original_on_complete,
|
30
|
+
:_nr_original_on_failure,
|
29
31
|
:_nr_serial
|
30
32
|
|
31
33
|
# We have to hook these three methods separately, as they don't use
|
@@ -34,6 +36,8 @@ DependencyDetection.defer do
|
|
34
36
|
self._nr_http_verb = :HEAD
|
35
37
|
http_head_without_newrelic(*args, &blk)
|
36
38
|
end
|
39
|
+
|
40
|
+
|
37
41
|
alias_method :http_head_without_newrelic, :http_head
|
38
42
|
alias_method :http_head, :http_head_with_newrelic
|
39
43
|
|
@@ -41,6 +45,8 @@ DependencyDetection.defer do
|
|
41
45
|
self._nr_http_verb = :POST
|
42
46
|
http_post_without_newrelic(*args, &blk)
|
43
47
|
end
|
48
|
+
|
49
|
+
|
44
50
|
alias_method :http_post_without_newrelic, :http_post
|
45
51
|
alias_method :http_post, :http_post_with_newrelic
|
46
52
|
|
@@ -48,12 +54,14 @@ DependencyDetection.defer do
|
|
48
54
|
self._nr_http_verb = :PUT
|
49
55
|
http_put_without_newrelic(*args, &blk)
|
50
56
|
end
|
57
|
+
|
58
|
+
|
51
59
|
alias_method :http_put_without_newrelic, :http_put
|
52
60
|
alias_method :http_put, :http_put_with_newrelic
|
53
61
|
|
54
62
|
|
55
63
|
# Hook the #http method to set the verb.
|
56
|
-
def http_with_newrelic
|
64
|
+
def http_with_newrelic verb
|
57
65
|
self._nr_http_verb = verb.to_s.upcase
|
58
66
|
http_without_newrelic( verb )
|
59
67
|
end
|
@@ -72,9 +80,9 @@ DependencyDetection.defer do
|
|
72
80
|
alias_method :perform, :perform_with_newrelic
|
73
81
|
|
74
82
|
# Record the HTTP verb for future #perform calls
|
75
|
-
def method_with_newrelic
|
76
|
-
self._nr_http_verb =
|
77
|
-
method_without_newrelic(
|
83
|
+
def method_with_newrelic verb
|
84
|
+
self._nr_http_verb = verb.upcase
|
85
|
+
method_without_newrelic(verb)
|
78
86
|
end
|
79
87
|
|
80
88
|
alias_method :method_without_newrelic, :method
|
@@ -101,12 +109,12 @@ DependencyDetection.defer do
|
|
101
109
|
include NewRelic::Agent::MethodTracer
|
102
110
|
|
103
111
|
# Add CAT with callbacks if the request is serial
|
104
|
-
def add_with_newrelic(curl)
|
112
|
+
def add_with_newrelic(curl)
|
105
113
|
if curl.respond_to?(:_nr_serial) && curl._nr_serial
|
106
114
|
hook_pending_request(curl) if NewRelic::Agent::Tracer.tracing_enabled?
|
107
115
|
end
|
108
116
|
|
109
|
-
return add_without_newrelic
|
117
|
+
return add_without_newrelic curl
|
110
118
|
end
|
111
119
|
|
112
120
|
alias_method :add_without_newrelic, :add
|
@@ -125,9 +133,9 @@ DependencyDetection.defer do
|
|
125
133
|
alias_method :perform, :perform_with_newrelic
|
126
134
|
|
127
135
|
|
128
|
-
# Instrument the specified +request+ (a Curl::Easy object)
|
129
|
-
# tracing if it's enabled.
|
130
|
-
def hook_pending_request(request)
|
136
|
+
# Instrument the specified +request+ (a Curl::Easy object)
|
137
|
+
# and set up cross-application tracing if it's enabled.
|
138
|
+
def hook_pending_request(request)
|
131
139
|
wrapped_request, wrapped_response = wrap_request(request)
|
132
140
|
|
133
141
|
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
@@ -138,9 +146,11 @@ DependencyDetection.defer do
|
|
138
146
|
|
139
147
|
segment.add_request_headers wrapped_request
|
140
148
|
|
149
|
+
# install all callbacks
|
141
150
|
unless request._nr_instrumented
|
142
151
|
install_header_callback(request, wrapped_response)
|
143
152
|
install_completion_callback(request, wrapped_response, segment)
|
153
|
+
install_failure_callback(request, wrapped_response, segment)
|
144
154
|
request._nr_instrumented = true
|
145
155
|
end
|
146
156
|
rescue => err
|
@@ -149,35 +159,37 @@ DependencyDetection.defer do
|
|
149
159
|
|
150
160
|
|
151
161
|
# Create request and response adapter objects for the specified +request+
|
162
|
+
# NOTE: Although strange to wrap request and response at once, it works
|
163
|
+
# because curb's callback mechanism updates the instantiated wrappers
|
164
|
+
# during the life-cycle of external request
|
152
165
|
def wrap_request(request)
|
153
166
|
return NewRelic::Agent::HTTPClients::CurbRequest.new(request),
|
154
167
|
NewRelic::Agent::HTTPClients::CurbResponse.new(request)
|
155
168
|
end
|
156
169
|
|
157
|
-
|
158
|
-
#
|
159
|
-
|
160
|
-
def install_header_callback( request, wrapped_response )
|
170
|
+
# Install a callback that will record the response headers
|
171
|
+
# to enable CAT linking
|
172
|
+
def install_header_callback(request, wrapped_response)
|
161
173
|
original_callback = request.on_header
|
162
174
|
request._nr_original_on_header = original_callback
|
163
175
|
request._nr_header_str = nil
|
164
176
|
request.on_header do |header_data|
|
165
177
|
if original_callback
|
166
|
-
original_callback.call
|
178
|
+
original_callback.call header_data
|
167
179
|
else
|
168
|
-
wrapped_response.append_header_data
|
180
|
+
wrapped_response.append_header_data header_data
|
169
181
|
header_data.length
|
170
182
|
end
|
171
183
|
end
|
172
184
|
end
|
173
185
|
|
174
186
|
# Install a callback that will finish the trace.
|
175
|
-
def install_completion_callback(request, wrapped_response, segment)
|
187
|
+
def install_completion_callback(request, wrapped_response, segment)
|
176
188
|
original_callback = request.on_complete
|
177
189
|
request._nr_original_on_complete = original_callback
|
178
190
|
request.on_complete do |finished_request|
|
179
191
|
begin
|
180
|
-
segment.
|
192
|
+
segment.process_response_headers wrapped_response
|
181
193
|
ensure
|
182
194
|
segment.finish if segment
|
183
195
|
# Make sure the existing completion callback is run, and restore the
|
@@ -188,12 +200,47 @@ DependencyDetection.defer do
|
|
188
200
|
end
|
189
201
|
end
|
190
202
|
|
203
|
+
# Install a callback that will fire on failures
|
204
|
+
# NOTE: on_failure is not always called, so we're not always
|
205
|
+
# unhooking the callback. No harm/no foul in production, but
|
206
|
+
# definitely something to beware of if debugging callback issues
|
207
|
+
# _nr_failure_instrumented exists to prevent infinitely chaining
|
208
|
+
# our on_failure callback hook.
|
209
|
+
def install_failure_callback(request, wrapped_response, segment)
|
210
|
+
return if request._nr_failure_instrumented
|
211
|
+
original_callback = request.on_failure
|
212
|
+
request._nr_original_on_failure = original_callback
|
213
|
+
request.on_failure do |failed_request, error|
|
214
|
+
begin
|
215
|
+
if segment
|
216
|
+
noticible_error = NewRelic::Agent::NoticibleError.new error[0].name, error[-1]
|
217
|
+
segment.notice_error noticible_error
|
218
|
+
end
|
219
|
+
ensure
|
220
|
+
original_callback.call(failed_request, error) if original_callback
|
221
|
+
remove_failure_callback(failed_request)
|
222
|
+
end
|
223
|
+
request._nr_failure_instrumented = true
|
224
|
+
end
|
225
|
+
end
|
226
|
+
|
227
|
+
# on_failure callbacks cannot be removed in the on_complete
|
228
|
+
# callback where this method is invoked because on_complete
|
229
|
+
# fires before the on_failure!
|
191
230
|
def remove_instrumentation_callbacks(request)
|
192
231
|
request.on_complete(&request._nr_original_on_complete)
|
193
232
|
request.on_header(&request._nr_original_on_header)
|
194
233
|
request._nr_instrumented = false
|
195
234
|
end
|
196
235
|
|
236
|
+
# We execute customer's on_failure callback (if any) and
|
237
|
+
# uninstall our hook here since the on_complete callback
|
238
|
+
# fires before the on_failure callback.
|
239
|
+
def remove_failure_callback(request)
|
240
|
+
request.on_failure(&request._nr_original_on_failure)
|
241
|
+
request._nr_failure_instrumented = false
|
242
|
+
end
|
243
|
+
|
197
244
|
private
|
198
245
|
|
199
246
|
def first_request_is_serial?
|
@@ -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
|
named :data_mapper
|
@@ -140,7 +140,9 @@ module NewRelic
|
|
140
140
|
)
|
141
141
|
|
142
142
|
begin
|
143
|
-
|
143
|
+
NewRelic::Agent::Tracer.capture_segment_error segment do
|
144
|
+
self.send("#{method_name}_without_newrelic", *args, &blk)
|
145
|
+
end
|
144
146
|
rescue ::DataObjects::ConnectionError => e
|
145
147
|
raise
|
146
148
|
rescue ::DataObjects::SQLError => e
|
@@ -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/controller_instrumentation'
|
6
6
|
|
@@ -89,6 +89,7 @@ DependencyDetection.defer do
|
|
89
89
|
|
90
90
|
executes do
|
91
91
|
Delayed::Worker.class_eval do
|
92
|
+
|
92
93
|
def initialize_with_new_relic(*args)
|
93
94
|
initialize_without_new_relic(*args)
|
94
95
|
worker_name = case
|
@@ -129,6 +130,7 @@ DependencyDetection.defer do
|
|
129
130
|
invoke_job_without_new_relic(*args, &block)
|
130
131
|
end
|
131
132
|
end
|
133
|
+
|
132
134
|
end
|
133
135
|
end
|
134
136
|
end
|
@@ -1,11 +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/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
module ::Excon
|
6
6
|
class Connection
|
7
|
+
# @connection is deprecated in newer excon versions and replaced with @data
|
7
8
|
def newrelic_connection_params
|
8
|
-
(@
|
9
|
+
(@data || @connection)
|
9
10
|
end
|
10
11
|
|
11
12
|
def newrelic_resolved_request_params(request_params)
|
@@ -27,10 +28,12 @@ module ::Excon
|
|
27
28
|
response = nil
|
28
29
|
segment.add_request_headers wrapped_request
|
29
30
|
|
30
|
-
response =
|
31
|
+
response = NewRelic::Agent::Tracer.capture_segment_error segment do
|
32
|
+
request_without_newrelic_trace(resolved_params, &block)
|
33
|
+
end
|
31
34
|
|
32
35
|
wrapped_response = ::NewRelic::Agent::HTTPClients::ExconHTTPResponse.new(response)
|
33
|
-
segment.
|
36
|
+
segment.process_response_headers wrapped_response
|
34
37
|
|
35
38
|
response
|
36
39
|
ensure
|
@@ -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
|
module ::Excon
|
6
6
|
module Middleware
|
@@ -49,11 +49,12 @@ module ::Excon
|
|
49
49
|
segment = datum[:connection] && datum[:connection].instance_variable_get(TRACE_DATA_IVAR)
|
50
50
|
if segment
|
51
51
|
begin
|
52
|
+
segment.notice_error(datum[:error]) if datum[:error]
|
52
53
|
datum[:connection].instance_variable_set(TRACE_DATA_IVAR, nil)
|
53
54
|
|
54
55
|
if datum[:response]
|
55
56
|
wrapped_response = ::NewRelic::Agent::HTTPClients::ExconHTTPResponse.new(datum[:response])
|
56
|
-
segment.
|
57
|
+
segment.process_response_headers wrapped_response
|
57
58
|
end
|
58
59
|
ensure
|
59
60
|
segment.finish if segment
|
@@ -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
|
named :excon
|
@@ -42,7 +42,7 @@ DependencyDetection.defer do
|
|
42
42
|
end
|
43
43
|
|
44
44
|
def install_excon_instrumentation(excon_version)
|
45
|
-
require 'new_relic/agent/cross_app_tracing'
|
45
|
+
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
46
46
|
require 'new_relic/agent/http_clients/excon_wrappers'
|
47
47
|
|
48
48
|
if excon_version >= EXCON_MIDDLEWARE_MIN_VERSION
|
@@ -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/parameter_filtering'
|
6
6
|
|
@@ -14,7 +14,6 @@ module NewRelic
|
|
14
14
|
API_VERSION = 'api.version'.freeze
|
15
15
|
FORMAT_REGEX = /\(\/?\.[\:\w]*\)/.freeze # either :format (< 0.12.0) or .ext (>= 0.12.0)
|
16
16
|
VERSION_REGEX = /:version(\/|$)/.freeze
|
17
|
-
EMPTY_STRING = ''.freeze
|
18
17
|
MIN_VERSION = Gem::Version.new("0.2.0")
|
19
18
|
PIPE_STRING = '|'.freeze
|
20
19
|
|
@@ -33,7 +32,7 @@ module NewRelic
|
|
33
32
|
end
|
34
33
|
|
35
34
|
def name_for_transaction(route, class_name, version)
|
36
|
-
action_name = route.path.sub(FORMAT_REGEX,
|
35
|
+
action_name = route.path.sub(FORMAT_REGEX, NewRelic::EMPTY_STR)
|
37
36
|
method_name = route.request_method
|
38
37
|
version ||= route.version
|
39
38
|
|
@@ -42,7 +41,7 @@ module NewRelic
|
|
42
41
|
version = version.join(PIPE_STRING) if Array === version
|
43
42
|
|
44
43
|
if version
|
45
|
-
action_name = action_name.sub(VERSION_REGEX,
|
44
|
+
action_name = action_name.sub(VERSION_REGEX, NewRelic::EMPTY_STR)
|
46
45
|
"#{class_name}-#{version}#{action_name} (#{method_name})"
|
47
46
|
else
|
48
47
|
"#{class_name}#{action_name} (#{method_name})"
|
@@ -50,12 +49,12 @@ module NewRelic
|
|
50
49
|
end
|
51
50
|
|
52
51
|
def name_for_transaction_deprecated(route, class_name, version)
|
53
|
-
action_name = route.route_path.sub(FORMAT_REGEX,
|
52
|
+
action_name = route.route_path.sub(FORMAT_REGEX, NewRelic::EMPTY_STR)
|
54
53
|
method_name = route.route_method
|
55
54
|
version ||= route.route_version
|
56
55
|
|
57
56
|
if version
|
58
|
-
action_name = action_name.sub(VERSION_REGEX,
|
57
|
+
action_name = action_name.sub(VERSION_REGEX, NewRelic::EMPTY_STR)
|
59
58
|
"#{class_name}-#{version}#{action_name} (#{method_name})"
|
60
59
|
else
|
61
60
|
"#{class_name}#{action_name} (#{method_name})"
|
@@ -118,11 +117,7 @@ DependencyDetection.defer do
|
|
118
117
|
|
119
118
|
# Since 1.2.0, the class `Grape::API` no longer refers to an API instance, rather, what used to be `Grape::API` is `Grape::API::Instance`
|
120
119
|
# https://github.com/ruby-grape/grape/blob/c20a73ac1e3f3ba1082005ed61bf69452373ba87/UPGRADING.md#upgrading-to--120
|
121
|
-
grape_api_class =
|
122
|
-
::Grape::API::Instance
|
123
|
-
else
|
124
|
-
::Grape::API
|
125
|
-
end
|
120
|
+
grape_api_class = defined?(Grape::API::Instance) ? ::Grape::API::Instance : ::Grape::API
|
126
121
|
|
127
122
|
grape_api_class.class_eval do
|
128
123
|
def call_with_new_relic(env)
|
@@ -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
|
named :httprb
|
@@ -11,7 +11,7 @@ DependencyDetection.defer do
|
|
11
11
|
|
12
12
|
executes do
|
13
13
|
::NewRelic::Agent.logger.info 'Installing http.rb instrumentation'
|
14
|
-
require 'new_relic/agent/cross_app_tracing'
|
14
|
+
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
15
15
|
require 'new_relic/agent/http_clients/http_rb_wrappers'
|
16
16
|
end
|
17
17
|
|
@@ -29,9 +29,12 @@ DependencyDetection.defer do
|
|
29
29
|
|
30
30
|
segment.add_request_headers wrapped_request
|
31
31
|
|
32
|
-
response =
|
32
|
+
response = NewRelic::Agent::Tracer.capture_segment_error segment do
|
33
|
+
perform_without_newrelic_trace(request, options)
|
34
|
+
end
|
35
|
+
|
33
36
|
wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPResponse.new response
|
34
|
-
segment.
|
37
|
+
segment.process_response_headers wrapped_response
|
35
38
|
|
36
39
|
response
|
37
40
|
ensure
|
@@ -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
|
named :httpclient
|
@@ -20,7 +20,7 @@ DependencyDetection.defer do
|
|
20
20
|
|
21
21
|
executes do
|
22
22
|
::NewRelic::Agent.logger.info 'Installing HTTPClient instrumentation'
|
23
|
-
require 'new_relic/agent/cross_app_tracing'
|
23
|
+
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
24
24
|
require 'new_relic/agent/http_clients/httpclient_wrappers'
|
25
25
|
end
|
26
26
|
|
@@ -38,12 +38,14 @@ DependencyDetection.defer do
|
|
38
38
|
response = nil
|
39
39
|
segment.add_request_headers wrapped_request
|
40
40
|
|
41
|
-
|
41
|
+
NewRelic::Agent::Tracer.capture_segment_error segment do
|
42
|
+
do_get_block_without_newrelic(req, proxy, conn, &block)
|
43
|
+
end
|
42
44
|
response = conn.pop
|
43
45
|
conn.push response
|
44
46
|
|
45
47
|
wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPClientResponse.new(response)
|
46
|
-
segment.
|
48
|
+
segment.process_response_headers wrapped_response
|
47
49
|
|
48
50
|
response
|
49
51
|
ensure
|
@@ -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
|
module NewRelic
|
6
6
|
module Agent
|