newrelic_rpm 6.9.0.363 → 6.13.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/ISSUE_TEMPLATE/bug_report.md +31 -0
- data/.github/ISSUE_TEMPLATE/config.yml +5 -0
- data/.github/ISSUE_TEMPLATE/feature_request.md +24 -0
- data/.github/actions/annotate/README.md +79 -0
- data/.github/actions/annotate/action.yml +6 -0
- data/.github/actions/annotate/dist/index.js +433 -0
- data/.github/actions/annotate/index.js +25 -0
- data/.github/actions/annotate/package-lock.json +172 -0
- data/.github/actions/annotate/package.json +30 -0
- data/.github/actions/annotate/pre-commit +5 -0
- data/.github/actions/build-ruby/README.md +79 -0
- data/.github/actions/build-ruby/action.yml +15 -0
- data/.github/actions/build-ruby/dist/index.js +52683 -0
- data/.github/actions/build-ruby/index.js +514 -0
- data/.github/actions/build-ruby/package-lock.json +581 -0
- data/.github/actions/build-ruby/package.json +32 -0
- data/.github/actions/build-ruby/pre-commit +5 -0
- data/.github/pull_request_template.md +16 -0
- data/.github/workflows/ci.yml +212 -0
- data/.github/workflows/pr_review_checklist.yml +22 -0
- data/.github/workflows/release.yml +78 -0
- data/.github/workflows/scripts/rubygems-authenticate.py +13 -0
- data/.github/workflows/scripts/rubygems-publish.rb +32 -0
- data/.github/workflows/snyk.yml +27 -0
- data/.github/workflows/stale.yml +21 -0
- data/.gitignore +6 -0
- data/CHANGELOG.md +254 -10
- data/CONTRIBUTING.md +106 -19
- data/Gemfile +6 -2
- 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.rb +14 -6
- data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
- data/lib/new_relic/agent/agent.rb +15 -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 +12 -11
- 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 +55 -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 +26 -5
- 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 +28 -12
- 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 +23 -3
- 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/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 +3 -3
- 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 +1 -1
- data/newrelic_rpm.gemspec +10 -9
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +237 -70
- metadata +42 -18
- data/.travis.yml +0 -210
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/metrics.rb +0 -13
- data/true +0 -0
@@ -1,20 +1,21 @@
|
|
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
|
+
require_relative 'abstract'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
9
10
|
module HTTPClients
|
10
|
-
class ExconHTTPResponse
|
11
|
-
def initialize
|
12
|
-
|
11
|
+
class ExconHTTPResponse < AbstractResponse
|
12
|
+
def initialize wrapped_response
|
13
|
+
super wrapped_response
|
14
|
+
|
13
15
|
# Since HTTP headers are case-insensitive, we normalize all of them to
|
14
16
|
# upper case here, and then also in our [](key) implementation.
|
15
17
|
@normalized_headers = {}
|
16
|
-
|
17
|
-
(headers || {}).each do |key, val|
|
18
|
+
(get_attribute(:headers) || {}).each do |key, val|
|
18
19
|
@normalized_headers[key.upcase] = val
|
19
20
|
end
|
20
21
|
end
|
@@ -26,15 +27,30 @@ module NewRelic
|
|
26
27
|
def to_hash
|
27
28
|
@normalized_headers.dup
|
28
29
|
end
|
30
|
+
|
31
|
+
private
|
32
|
+
|
33
|
+
def get_attribute name
|
34
|
+
if @wrapped_response.respond_to?(name)
|
35
|
+
@wrapped_response.send(name)
|
36
|
+
else
|
37
|
+
@wrapped_response[name]
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
def get_status_code
|
42
|
+
code = get_attribute(:status).to_i
|
43
|
+
code == 0 ? nil : code
|
44
|
+
end
|
29
45
|
end
|
30
46
|
|
31
47
|
class ExconHTTPRequest < AbstractRequest
|
32
48
|
attr_reader :method
|
33
49
|
|
34
|
-
EXCON = "Excon"
|
35
|
-
LHOST = 'host'
|
36
|
-
UHOST = 'Host'
|
37
|
-
COLON = ':'
|
50
|
+
EXCON = "Excon"
|
51
|
+
LHOST = 'host'
|
52
|
+
UHOST = 'Host'
|
53
|
+
COLON = ':'
|
38
54
|
|
39
55
|
def initialize(datum)
|
40
56
|
@datum = datum
|
@@ -70,9 +86,8 @@ module NewRelic
|
|
70
86
|
end
|
71
87
|
|
72
88
|
def uri
|
73
|
-
|
74
|
-
|
75
|
-
)
|
89
|
+
url = "#{@scheme}://#{host}:#{@port}#{@path}"
|
90
|
+
URIUtil.parse_and_normalize_url url
|
76
91
|
end
|
77
92
|
end
|
78
93
|
end
|
@@ -1,39 +1,35 @@
|
|
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
|
+
require_relative 'abstract'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
9
10
|
module HTTPClients
|
10
|
-
class HTTPResponse
|
11
|
-
attr_reader :response
|
12
|
-
|
13
|
-
def initialize(response)
|
14
|
-
@response = response
|
15
|
-
end
|
16
|
-
|
11
|
+
class HTTPResponse < AbstractResponse
|
17
12
|
def [](key)
|
18
|
-
_, value =
|
13
|
+
_, value = @wrapped_response.headers.find{ |k, _| key.downcase == k.downcase }
|
19
14
|
value unless value.nil?
|
20
15
|
end
|
21
16
|
|
22
17
|
def to_hash
|
23
|
-
|
18
|
+
@wrapped_response.headers
|
24
19
|
end
|
25
20
|
end
|
26
21
|
|
27
22
|
class HTTPRequest < AbstractRequest
|
28
|
-
HTTP_RB = 'http.rb'
|
29
|
-
HOST = 'host'
|
30
|
-
COLON = ':'
|
23
|
+
HTTP_RB = 'http.rb'
|
24
|
+
HOST = 'host'
|
25
|
+
COLON = ':'
|
31
26
|
|
32
|
-
|
27
|
+
def initialize wrapped_request
|
28
|
+
@wrapped_request = wrapped_request
|
29
|
+
end
|
33
30
|
|
34
|
-
def
|
35
|
-
@
|
36
|
-
@uri = request.uri
|
31
|
+
def uri
|
32
|
+
@uri ||= URIUtil.parse_and_normalize_url(@wrapped_request.uri)
|
37
33
|
end
|
38
34
|
|
39
35
|
def type
|
@@ -47,19 +43,19 @@ module NewRelic
|
|
47
43
|
end
|
48
44
|
|
49
45
|
def host
|
50
|
-
host_from_header ||
|
46
|
+
host_from_header || @wrapped_request.host
|
51
47
|
end
|
52
48
|
|
53
49
|
def method
|
54
|
-
|
50
|
+
@wrapped_request.verb.upcase
|
55
51
|
end
|
56
52
|
|
57
53
|
def [](key)
|
58
|
-
|
54
|
+
@wrapped_request.headers[key]
|
59
55
|
end
|
60
56
|
|
61
57
|
def []=(key, value)
|
62
|
-
|
58
|
+
@wrapped_request.headers[key] = value
|
63
59
|
end
|
64
60
|
end
|
65
61
|
end
|
@@ -1,21 +1,17 @@
|
|
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
|
+
require_relative 'abstract'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
9
10
|
module HTTPClients
|
10
|
-
class HTTPClientResponse
|
11
|
-
attr_reader :response
|
12
|
-
|
13
|
-
def initialize(response)
|
14
|
-
@response = response
|
15
|
-
end
|
11
|
+
class HTTPClientResponse < AbstractResponse
|
16
12
|
|
17
13
|
def [](key)
|
18
|
-
|
14
|
+
@wrapped_response.headers.each do |k,v|
|
19
15
|
if key.downcase == k.downcase
|
20
16
|
return v
|
21
17
|
end
|
@@ -24,12 +20,12 @@ module NewRelic
|
|
24
20
|
end
|
25
21
|
|
26
22
|
def to_hash
|
27
|
-
|
23
|
+
@wrapped_response.headers
|
28
24
|
end
|
29
25
|
end
|
30
26
|
|
31
27
|
class HTTPClientRequest < AbstractRequest
|
32
|
-
attr_reader :request
|
28
|
+
attr_reader :request
|
33
29
|
|
34
30
|
HTTP_CLIENT = "HTTPClient".freeze
|
35
31
|
LHOST = 'host'.freeze
|
@@ -38,7 +34,6 @@ module NewRelic
|
|
38
34
|
|
39
35
|
def initialize(request)
|
40
36
|
@request = request
|
41
|
-
@uri = request.header.request_uri
|
42
37
|
end
|
43
38
|
|
44
39
|
def type
|
@@ -59,6 +54,10 @@ module NewRelic
|
|
59
54
|
host_from_header || uri.host.to_s
|
60
55
|
end
|
61
56
|
|
57
|
+
def uri
|
58
|
+
@uri ||= URIUtil.parse_and_normalize_url(request.header.request_uri)
|
59
|
+
end
|
60
|
+
|
62
61
|
def [](key)
|
63
62
|
request.headers[key]
|
64
63
|
end
|
@@ -1,26 +1,38 @@
|
|
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
|
+
require_relative 'abstract'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
9
10
|
module HTTPClients
|
11
|
+
class NetHTTPResponse < AbstractResponse
|
12
|
+
|
13
|
+
def [](key)
|
14
|
+
@wrapped_response[key]
|
15
|
+
end
|
16
|
+
|
17
|
+
def to_hash
|
18
|
+
@wrapped_response.to_hash
|
19
|
+
end
|
20
|
+
end
|
21
|
+
|
10
22
|
class NetHTTPRequest < AbstractRequest
|
11
23
|
def initialize(connection, request)
|
12
24
|
@connection = connection
|
13
25
|
@request = request
|
14
26
|
end
|
15
27
|
|
16
|
-
NET_HTTP = 'Net::HTTP'
|
28
|
+
NET_HTTP = 'Net::HTTP'
|
17
29
|
|
18
30
|
def type
|
19
31
|
NET_HTTP
|
20
32
|
end
|
21
33
|
|
22
|
-
HOST = 'host'
|
23
|
-
COLON = ':'
|
34
|
+
HOST = 'host'
|
35
|
+
COLON = ':'
|
24
36
|
|
25
37
|
def host_from_header
|
26
38
|
if hostname = self[HOST]
|
@@ -1,16 +1,14 @@
|
|
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
|
+
require_relative 'abstract'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
9
10
|
module HTTPClients
|
10
|
-
class TyphoeusHTTPResponse
|
11
|
-
def initialize(response)
|
12
|
-
@response = response
|
13
|
-
end
|
11
|
+
class TyphoeusHTTPResponse < AbstractResponse
|
14
12
|
|
15
13
|
def [](key)
|
16
14
|
unless headers.nil?
|
@@ -33,7 +31,7 @@ module NewRelic
|
|
33
31
|
private
|
34
32
|
|
35
33
|
def headers
|
36
|
-
@
|
34
|
+
@wrapped_response.headers
|
37
35
|
end
|
38
36
|
end
|
39
37
|
|
@@ -1,7 +1,8 @@
|
|
1
1
|
# -*- ruby -*-
|
2
2
|
# encoding: utf-8
|
3
3
|
# This file is distributed under New Relic's license terms.
|
4
|
-
# See https://github.com/newrelic/
|
4
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
5
|
+
# frozen_string_literal: true
|
5
6
|
|
6
7
|
# This module includes utilities for manipulating URIs, particularly from the
|
7
8
|
# context of Net::HTTP requests. We don't always have direct access to the full
|
@@ -14,20 +15,20 @@ module NewRelic
|
|
14
15
|
module HTTPClients
|
15
16
|
module URIUtil
|
16
17
|
|
17
|
-
def self.
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
18
|
+
def self.obfuscated_uri(url)
|
19
|
+
parse_and_normalize_url(url).tap do |obfuscated|
|
20
|
+
obfuscated.user = nil
|
21
|
+
obfuscated.password = nil
|
22
|
+
obfuscated.query = nil
|
23
|
+
obfuscated.fragment = nil
|
24
|
+
end
|
24
25
|
end
|
25
26
|
|
26
27
|
# There are valid URI strings that some HTTP client libraries will
|
27
28
|
# accept that the stdlib URI module doesn't handle. If we find that
|
28
29
|
# Addressable is around, use that to normalize out our URL's.
|
29
30
|
def self.parse_and_normalize_url(url)
|
30
|
-
uri = url
|
31
|
+
uri = url.dup
|
31
32
|
unless ::URI === uri
|
32
33
|
if defined?(::Addressable::URI)
|
33
34
|
address = ::Addressable::URI.parse(url)
|
@@ -41,10 +42,10 @@ module NewRelic
|
|
41
42
|
uri
|
42
43
|
end
|
43
44
|
|
44
|
-
QUESTION_MARK = "?"
|
45
|
+
QUESTION_MARK = "?"
|
45
46
|
|
46
47
|
def self.strip_query_string(fragment)
|
47
|
-
if
|
48
|
+
if fragment.include? QUESTION_MARK
|
48
49
|
fragment.split(QUESTION_MARK).first
|
49
50
|
else
|
50
51
|
fragment
|
@@ -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'
|
6
6
|
module NewRelic
|
@@ -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
|
@@ -29,7 +29,10 @@ module NewRelic
|
|
29
29
|
def finish(name, id, payload) #THREAD_LOCAL_ACCESS
|
30
30
|
return unless state.is_execution_traced?
|
31
31
|
|
32
|
-
|
32
|
+
if exception = exception_object(payload)
|
33
|
+
NewRelic::Agent.notice_error exception
|
34
|
+
end
|
35
|
+
|
33
36
|
finishable = pop_segment(id)
|
34
37
|
finishable.finish if finishable
|
35
38
|
rescue => e
|
@@ -51,10 +54,6 @@ module NewRelic
|
|
51
54
|
def action_name(name)
|
52
55
|
name.gsub DOT_ACTION_CABLE, NewRelic::EMPTY_STR
|
53
56
|
end
|
54
|
-
|
55
|
-
def notice_error(payload)
|
56
|
-
NewRelic::Agent.notice_error payload[:exception_object]
|
57
|
-
end
|
58
57
|
end
|
59
58
|
end
|
60
59
|
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/notifications_subscriber'
|
5
5
|
require 'new_relic/agent/instrumentation/ignore_actions'
|
6
6
|
require 'new_relic/agent/parameter_filtering'
|
@@ -35,6 +35,10 @@ module NewRelic
|
|
35
35
|
if state.is_execution_traced? \
|
36
36
|
&& !should_ignore(payload, controller_class(payload))
|
37
37
|
|
38
|
+
if exception = exception_object(payload)
|
39
|
+
finishable.notice_error(exception)
|
40
|
+
end
|
41
|
+
|
38
42
|
finishable.finish
|
39
43
|
else
|
40
44
|
Agent.instance.pop_trace_execution_flag
|
@@ -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
|
# Listen for ActiveSupport::Notifications events for ActionView render
|
@@ -24,8 +24,13 @@ module NewRelic
|
|
24
24
|
end
|
25
25
|
|
26
26
|
def finish(name, id, payload) #THREAD_LOCAL_ACCESS
|
27
|
-
|
28
|
-
|
27
|
+
if segment = pop_segment(id)
|
28
|
+
|
29
|
+
if exception = exception_object(payload)
|
30
|
+
segment.notice_error exception
|
31
|
+
end
|
32
|
+
segment.finish
|
33
|
+
end
|
29
34
|
rescue => e
|
30
35
|
log_notification_error(e, name, 'finish')
|
31
36
|
end
|
@@ -97,6 +102,10 @@ module NewRelic
|
|
97
102
|
def finish
|
98
103
|
@finishable.finish if @finishable
|
99
104
|
end
|
105
|
+
|
106
|
+
def notice_error error
|
107
|
+
@finishable.notice_error error if @finishable
|
108
|
+
end
|
100
109
|
end
|
101
110
|
end
|
102
111
|
|
@@ -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
|
|
@@ -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 = :active_merchant
|