newrelic_rpm 6.2.0.354 → 6.15.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +8 -0
- data/CHANGELOG.md +646 -6
- data/CONTRIBUTING.md +106 -19
- data/Gemfile +6 -2
- data/Guardfile +18 -1
- data/LICENSE +208 -38
- data/README.md +81 -85
- data/ROADMAP.md +24 -0
- data/Rakefile +2 -0
- data/THIRD_PARTY_NOTICES.md +213 -0
- data/bin/nrdebug +1 -1
- data/init.rb +1 -1
- data/install.rb +1 -1
- data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
- data/lib/new_relic/agent/agent.rb +168 -185
- data/lib/new_relic/agent/agent_logger.rb +5 -1
- data/lib/new_relic/agent/attribute_filter.rb +8 -8
- data/lib/new_relic/agent/attribute_processing.rb +1 -1
- data/lib/new_relic/agent/attributes.rb +152 -0
- data/lib/new_relic/agent/audit_logger.rb +11 -1
- data/lib/new_relic/agent/autostart.rb +20 -15
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command_router.rb +3 -22
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +234 -51
- data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
- data/lib/new_relic/agent/configuration/environment_source.rb +5 -3
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +45 -0
- data/lib/new_relic/agent/configuration/high_security_source.rb +2 -1
- data/lib/new_relic/agent/configuration/manager.rb +14 -10
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
- data/lib/new_relic/agent/configuration/security_policy_source.rb +1 -1
- data/lib/new_relic/agent/configuration/server_source.rb +37 -3
- data/lib/new_relic/agent/configuration/yaml_source.rb +12 -7
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +61 -0
- data/lib/new_relic/agent/connect/response_handler.rb +61 -0
- data/lib/new_relic/agent/custom_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
- data/lib/new_relic/agent/database/obfuscator.rb +1 -1
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
- data/lib/new_relic/agent/database.rb +2 -3
- data/lib/new_relic/agent/database_adapter.rb +33 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +3 -3
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +9 -9
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo.rb +2 -2
- data/lib/new_relic/agent/datastores/redis.rb +1 -1
- data/lib/new_relic/agent/datastores.rb +1 -1
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +3 -2
- data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +61 -46
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
- data/lib/new_relic/agent/{distributed_trace_payload.rb → distributed_tracing/distributed_trace_payload.rb} +25 -102
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +39 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +246 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +126 -0
- data/lib/new_relic/agent/distributed_tracing.rb +156 -7
- data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
- data/lib/new_relic/agent/error_collector.rb +36 -19
- data/lib/new_relic/agent/error_event_aggregator.rb +10 -7
- data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
- data/lib/new_relic/agent/event_aggregator.rb +27 -33
- data/lib/new_relic/agent/event_buffer.rb +1 -1
- data/lib/new_relic/agent/event_listener.rb +1 -1
- data/lib/new_relic/agent/event_loop.rb +1 -1
- data/lib/new_relic/agent/external.rb +8 -8
- data/lib/new_relic/agent/guid_generator.rb +28 -0
- data/lib/new_relic/agent/harvester.rb +1 -1
- data/lib/new_relic/agent/heap.rb +1 -1
- data/lib/new_relic/agent/hostname.rb +9 -3
- data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +25 -20
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +29 -14
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -22
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +11 -12
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +17 -5
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -7
- data/lib/new_relic/agent/http_clients/uri_util.rb +12 -11
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +26 -46
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +51 -75
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +81 -56
- data/lib/new_relic/agent/instrumentation/active_job.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_record.rb +85 -38
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +17 -6
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +168 -0
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +35 -11
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +46 -48
- data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +12 -8
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +10 -9
- data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
- data/lib/new_relic/agent/instrumentation/bunny.rb +48 -29
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/curb.rb +66 -19
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +4 -2
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +3 -1
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +7 -4
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
- data/lib/new_relic/agent/instrumentation/excon.rb +2 -2
- data/lib/new_relic/agent/instrumentation/grape.rb +8 -14
- data/lib/new_relic/agent/instrumentation/http.rb +7 -4
- data/lib/new_relic/agent/instrumentation/httpclient.rb +6 -4
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +7 -3
- data/lib/new_relic/agent/instrumentation/memcache.rb +4 -2
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +1 -1
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +1 -1
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +9 -7
- data/lib/new_relic/agent/instrumentation/mongo.rb +10 -4
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +36 -3
- data/lib/new_relic/agent/instrumentation/net.rb +48 -28
- data/lib/new_relic/agent/instrumentation/net_prepend.rb +40 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +100 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +3 -1
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rack.rb +3 -1
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
- data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_cable.rb +6 -7
- data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_controller.rb +4 -4
- data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_view.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake.rb +2 -1
- data/lib/new_relic/agent/instrumentation/redis.rb +12 -6
- data/lib/new_relic/agent/instrumentation/resque.rb +4 -1
- data/lib/new_relic/agent/instrumentation/sequel.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +48 -24
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra.rb +1 -2
- data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +24 -7
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +1 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +2 -2
- data/lib/new_relic/agent/log_once.rb +1 -1
- data/lib/new_relic/agent/logging.rb +139 -0
- data/lib/new_relic/agent/memory_logger.rb +1 -1
- data/lib/new_relic/agent/messaging.rb +6 -74
- data/lib/new_relic/agent/method_tracer.rb +10 -8
- data/lib/new_relic/agent/method_tracer_helpers.rb +3 -3
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +110 -0
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +27 -0
- data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +4 -4
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +3 -5
- data/lib/new_relic/agent/monitors.rb +27 -0
- data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -1
- data/lib/new_relic/agent/new_relic_service.rb +34 -14
- data/lib/new_relic/agent/noticible_error.rb +22 -0
- data/lib/new_relic/agent/null_logger.rb +1 -1
- data/lib/new_relic/agent/obfuscator.rb +1 -1
- data/lib/new_relic/agent/parameter_filtering.rb +19 -6
- data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
- data/lib/new_relic/agent/pipe_channel_manager.rb +1 -1
- data/lib/new_relic/agent/pipe_service.rb +1 -1
- data/lib/new_relic/agent/prepend_supportability.rb +1 -1
- data/lib/new_relic/agent/priority_sampled_buffer.rb +9 -4
- data/lib/new_relic/agent/range_extensions.rb +1 -1
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine.rb +1 -1
- data/lib/new_relic/agent/sampler.rb +1 -1
- data/lib/new_relic/agent/sampler_collection.rb +1 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/memory_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +3 -5
- data/lib/new_relic/agent/span_event_primitive.rb +108 -54
- data/lib/new_relic/agent/sql_sampler.rb +6 -6
- data/lib/new_relic/agent/stats.rb +1 -1
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +2 -2
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
- data/lib/new_relic/agent/stats_engine.rb +1 -1
- data/lib/new_relic/agent/supported_versions.rb +3 -3
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/system_info.rb +13 -4
- data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
- data/lib/new_relic/agent/threading/backtrace_node.rb +1 -1
- data/lib/new_relic/agent/threading/backtrace_service.rb +4 -4
- data/lib/new_relic/agent/threading/thread_profile.rb +10 -24
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +66 -19
- data/lib/new_relic/agent/transaction/abstract_segment.rb +32 -5
- data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +177 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +58 -147
- data/lib/new_relic/agent/transaction/external_request_segment.rb +32 -39
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +5 -12
- data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
- data/lib/new_relic/agent/transaction/segment.rb +28 -2
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/trace.rb +6 -13
- data/lib/new_relic/agent/transaction/trace_builder.rb +1 -2
- data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
- data/lib/new_relic/agent/transaction/trace_node.rb +11 -9
- data/lib/new_relic/agent/transaction/tracing.rb +1 -1
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction.rb +104 -84
- data/lib/new_relic/agent/transaction_error_primitive.rb +11 -16
- data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/transaction_event_primitive.rb +29 -40
- data/lib/new_relic/agent/transaction_event_recorder.rb +4 -4
- data/lib/new_relic/agent/transaction_metrics.rb +1 -1
- data/lib/new_relic/agent/transaction_sampler.rb +2 -6
- data/lib/new_relic/agent/transaction_time_aggregator.rb +1 -1
- data/lib/new_relic/agent/utilization/aws.rb +1 -1
- data/lib/new_relic/agent/utilization/azure.rb +1 -1
- data/lib/new_relic/agent/utilization/gcp.rb +1 -1
- data/lib/new_relic/agent/utilization/pcf.rb +1 -1
- data/lib/new_relic/agent/utilization/vendor.rb +1 -1
- data/lib/new_relic/agent/utilization_data.rb +1 -1
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
- data/lib/new_relic/agent/vm/mri_vm.rb +7 -5
- data/lib/new_relic/agent/vm/snapshot.rb +1 -1
- data/lib/new_relic/agent/vm.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +1 -1
- data/lib/new_relic/agent.rb +98 -8
- data/lib/new_relic/cli/command.rb +1 -1
- data/lib/new_relic/cli/commands/deployments.rb +2 -3
- data/lib/new_relic/cli/commands/install.rb +4 -3
- data/lib/new_relic/coerce.rb +32 -7
- data/lib/new_relic/collection_helper.rb +1 -1
- data/lib/new_relic/constants.rb +42 -0
- data/lib/new_relic/control/class_methods.rb +8 -2
- data/lib/new_relic/control/frameworks/external.rb +1 -1
- data/lib/new_relic/control/frameworks/merb.rb +1 -1
- data/lib/new_relic/control/frameworks/rails.rb +1 -1
- data/lib/new_relic/control/frameworks/rails3.rb +1 -1
- data/lib/new_relic/control/frameworks/rails4.rb +1 -1
- data/lib/new_relic/control/frameworks/{rails5.rb → rails_notifications.rb} +2 -2
- data/lib/new_relic/control/frameworks/ruby.rb +1 -1
- data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/instance_methods.rb +11 -2
- data/lib/new_relic/control/instrumentation.rb +1 -1
- data/lib/new_relic/control/server_methods.rb +1 -1
- data/lib/new_relic/control.rb +1 -1
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +9 -5
- data/lib/new_relic/environment_report.rb +2 -4
- data/lib/new_relic/helper.rb +1 -1
- data/lib/new_relic/language_support.rb +1 -1
- data/lib/new_relic/latest_changes.rb +2 -2
- data/lib/new_relic/local_environment.rb +1 -1
- data/lib/new_relic/metric_data.rb +1 -1
- data/lib/new_relic/metric_spec.rb +1 -1
- data/lib/new_relic/noticed_error.rb +39 -18
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +1 -1
- data/lib/new_relic/rack/browser_monitoring.rb +16 -9
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +1 -1
- data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +17 -1
- data/lib/new_relic/version.rb +2 -2
- data/lib/newrelic_rpm.rb +1 -1
- data/lib/sequel/extensions/newrelic_instrumentation.rb +1 -1
- data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -1
- data/lib/tasks/all.rb +1 -1
- data/lib/tasks/config.rake +1 -2
- data/lib/tasks/multiverse.rb +35 -1
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +6 -1
- data/newrelic_rpm.gemspec +22 -10
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +356 -76
- metadata +116 -52
- data/.travis.yml +0 -153
- data/lib/new_relic/agent/commands/xray_session.rb +0 -55
- data/lib/new_relic/agent/commands/xray_session_collection.rb +0 -161
- data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -40
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/agent/instrumentation/active_record_4.rb +0 -42
- data/lib/new_relic/agent/instrumentation/active_record_5.rb +0 -41
- data/lib/new_relic/agent/instrumentation/evented_subscriber.rb +0 -104
- data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb +0 -32
- data/lib/new_relic/agent/instrumentation/rails4/action_view.rb +0 -27
- data/lib/new_relic/agent/transaction/attributes.rb +0 -154
- data/lib/new_relic/agent/transaction/xray_sample_buffer.rb +0 -64
- data/lib/new_relic/build.rb +0 -2
- data/lib/new_relic/control/frameworks/rails6.rb +0 -14
- data/lib/new_relic/metrics.rb +0 -13
- data/lib/tasks/versions.html.erb +0 -28
- data/lib/tasks/versions.postface.html +0 -8
- data/lib/tasks/versions.preface.html +0 -9
- data/lib/tasks/versions.rake +0 -65
- data/lib/tasks/versions.txt.erb +0 -14
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
DependencyDetection.defer do
|
6
6
|
@name = :sunspot
|
@@ -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 :typhoeus
|
@@ -15,7 +15,7 @@ DependencyDetection.defer do
|
|
15
15
|
|
16
16
|
executes do
|
17
17
|
::NewRelic::Agent.logger.info 'Installing Typhoeus instrumentation'
|
18
|
-
require 'new_relic/agent/cross_app_tracing'
|
18
|
+
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
19
19
|
require 'new_relic/agent/http_clients/typhoeus_wrappers'
|
20
20
|
end
|
21
21
|
|
@@ -60,10 +60,10 @@ module NewRelic
|
|
60
60
|
module Instrumentation
|
61
61
|
module TyphoeusTracing
|
62
62
|
|
63
|
-
HYDRA_SEGMENT_NAME
|
64
|
-
|
63
|
+
HYDRA_SEGMENT_NAME = "External/Multiple/Typhoeus::Hydra/run"
|
64
|
+
NOTICIBLE_ERROR_CLASS = "Typhoeus::Errors::TyphoeusError"
|
65
|
+
|
65
66
|
EARLIEST_VERSION = Gem::Version.new("0.5.3")
|
66
|
-
|
67
67
|
def self.is_supported_version?
|
68
68
|
Gem::Version.new(Typhoeus::VERSION) >= NewRelic::Agent::Instrumentation::TyphoeusTracing::EARLIEST_VERSION
|
69
69
|
end
|
@@ -72,6 +72,17 @@ module NewRelic
|
|
72
72
|
request.respond_to?(:hydra) && request.hydra
|
73
73
|
end
|
74
74
|
|
75
|
+
def self.response_message(response)
|
76
|
+
if response.respond_to?(:response_message)
|
77
|
+
response.response_message
|
78
|
+
elsif response.respond_to?(:return_message)
|
79
|
+
response.return_message
|
80
|
+
else
|
81
|
+
# 0.5.4 seems to have lost xxxx_message methods altogether.
|
82
|
+
"timeout"
|
83
|
+
end
|
84
|
+
end
|
85
|
+
|
75
86
|
def self.trace(request)
|
76
87
|
state = NewRelic::Agent::Tracer.state
|
77
88
|
return unless state.is_execution_traced?
|
@@ -92,8 +103,14 @@ module NewRelic
|
|
92
103
|
segment.add_request_headers wrapped_request
|
93
104
|
|
94
105
|
callback = Proc.new do
|
95
|
-
wrapped_response =
|
96
|
-
|
106
|
+
wrapped_response = HTTPClients::TyphoeusHTTPResponse.new(request.response)
|
107
|
+
|
108
|
+
segment.process_response_headers wrapped_response
|
109
|
+
|
110
|
+
if request.response.code == 0
|
111
|
+
segment.notice_error NoticibleError.new NOTICIBLE_ERROR_CLASS, response_message(request.response)
|
112
|
+
end
|
113
|
+
|
97
114
|
segment.finish if segment
|
98
115
|
end
|
99
116
|
request.on_complete.unshift(callback)
|
@@ -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
|
|
5
5
|
# This is the base class for all errors that we want to record through the
|
6
6
|
# NewRelic::Agent::ErrorCollector#notice_agent_error API. It provides the
|
@@ -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 'base64'
|
6
6
|
require 'json'
|
@@ -14,7 +14,7 @@ module NewRelic
|
|
14
14
|
RUM_KEY_LENGTH = 13
|
15
15
|
|
16
16
|
def initialize(event_listener)
|
17
|
-
event_listener.subscribe(:
|
17
|
+
event_listener.subscribe(:initial_configuration_complete, &method(:log_configuration))
|
18
18
|
end
|
19
19
|
|
20
20
|
def log_configuration
|
@@ -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
|
@@ -0,0 +1,139 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
require 'json'
|
6
|
+
require 'new_relic/agent/hostname'
|
7
|
+
|
8
|
+
module NewRelic
|
9
|
+
module Agent
|
10
|
+
module Logging
|
11
|
+
|
12
|
+
# This class can be used as the formatter for an existing logger. It
|
13
|
+
# decorates log messages with trace and entity metadata, and formats each
|
14
|
+
# log messages as a JSON object.
|
15
|
+
#
|
16
|
+
# It can be added to a Rails application like this:
|
17
|
+
#
|
18
|
+
# require 'newrelic_rpm'
|
19
|
+
#
|
20
|
+
# Rails.application.configure do
|
21
|
+
# config.log_formatter = ::NewRelic::Agent::Logging::DecoratingFormatter.new
|
22
|
+
# end
|
23
|
+
#
|
24
|
+
# @api public
|
25
|
+
class DecoratingFormatter < ::Logger::Formatter
|
26
|
+
TIMESTAMP_KEY = 'timestamp'.freeze
|
27
|
+
MESSAGE_KEY = 'message'.freeze
|
28
|
+
LOG_LEVEL_KEY = 'log.level'.freeze
|
29
|
+
LOG_NAME_KEY = 'logger.name'.freeze
|
30
|
+
NEWLINE = "\n".freeze
|
31
|
+
|
32
|
+
QUOTE = '"'.freeze
|
33
|
+
COLON = ':'.freeze
|
34
|
+
COMMA = ','.freeze
|
35
|
+
CLOSING_BRACE = '}'.freeze
|
36
|
+
|
37
|
+
def initialize
|
38
|
+
Agent.config.register_callback :app_name do
|
39
|
+
@app_name = nil
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
def call severity, time, progname, msg
|
44
|
+
message = '{'
|
45
|
+
if app_name
|
46
|
+
add_key_value message, ENTITY_NAME_KEY, app_name
|
47
|
+
message << COMMA
|
48
|
+
end
|
49
|
+
add_key_value message, ENTITY_TYPE_KEY, ENTITY_TYPE
|
50
|
+
message << COMMA
|
51
|
+
add_key_value message, HOSTNAME_KEY, Hostname.get
|
52
|
+
|
53
|
+
if entity_guid = Agent.config[:entity_guid]
|
54
|
+
message << COMMA
|
55
|
+
add_key_value message, ENTITY_GUID_KEY, entity_guid
|
56
|
+
end
|
57
|
+
|
58
|
+
if trace_id = Tracer.trace_id
|
59
|
+
message << COMMA
|
60
|
+
add_key_value message, TRACE_ID_KEY, trace_id
|
61
|
+
end
|
62
|
+
if span_id = Tracer.span_id
|
63
|
+
message << COMMA
|
64
|
+
add_key_value message, SPAN_ID_KEY, span_id
|
65
|
+
end
|
66
|
+
|
67
|
+
message << COMMA
|
68
|
+
message << QUOTE << MESSAGE_KEY << QUOTE << COLON << escape(msg)
|
69
|
+
message << COMMA
|
70
|
+
add_key_value message, LOG_LEVEL_KEY, severity
|
71
|
+
if progname
|
72
|
+
message << COMMA
|
73
|
+
add_key_value message, LOG_NAME_KEY, progname
|
74
|
+
end
|
75
|
+
|
76
|
+
message << COMMA
|
77
|
+
message << QUOTE << TIMESTAMP_KEY << QUOTE << COLON << (time.to_f * 1000).round.to_s
|
78
|
+
message << CLOSING_BRACE << NEWLINE
|
79
|
+
end
|
80
|
+
|
81
|
+
def app_name
|
82
|
+
@app_name ||= Agent.config[:app_name][0]
|
83
|
+
end
|
84
|
+
|
85
|
+
def add_key_value message, key, value
|
86
|
+
message << QUOTE << key << QUOTE << COLON << QUOTE << value << QUOTE
|
87
|
+
end
|
88
|
+
|
89
|
+
def escape message
|
90
|
+
if String === message
|
91
|
+
message.to_json
|
92
|
+
else
|
93
|
+
message.inspect.to_json
|
94
|
+
end
|
95
|
+
end
|
96
|
+
|
97
|
+
def clear_tags!
|
98
|
+
# No-op; just avoiding issues with act-fluent-logger-rails
|
99
|
+
end
|
100
|
+
end
|
101
|
+
|
102
|
+
|
103
|
+
# This logger decorates logs with trace and entity metadata, and emits log
|
104
|
+
# messages formatted as JSON objects. It extends the Logger class from
|
105
|
+
# the Ruby standard library, and accepts the same constructor parameters.
|
106
|
+
#
|
107
|
+
# It aliases the `:info` message to overwrite the `:write` method, so it
|
108
|
+
# can be used in Rack applications that expect the logger to be a file-like
|
109
|
+
# object.
|
110
|
+
#
|
111
|
+
# It can be added to an application like this:
|
112
|
+
#
|
113
|
+
# require 'newrelic_rpm'
|
114
|
+
#
|
115
|
+
# config.logger = NewRelic::Agent::Logging::DecoratingLogger.new "log/application.log"
|
116
|
+
#
|
117
|
+
# @api public
|
118
|
+
class DecoratingLogger < (defined?(::ActiveSupport) && defined?(::ActiveSupport::Logger) ? ::ActiveSupport::Logger : ::Logger)
|
119
|
+
|
120
|
+
alias :write :info
|
121
|
+
|
122
|
+
# Positional and Keyword arguments are separated beginning with Ruby 2.7
|
123
|
+
# Signature of ::Logger constructor changes in Ruby 2.4 to have both positional and keyword args
|
124
|
+
# We pivot on Ruby 2.7 for widest supportability with least amount of hassle.
|
125
|
+
if RUBY_VERSION < "2.7.0"
|
126
|
+
def initialize(*args)
|
127
|
+
super(*args)
|
128
|
+
self.formatter = DecoratingFormatter.new
|
129
|
+
end
|
130
|
+
else
|
131
|
+
def initialize(*args, **kwargs)
|
132
|
+
super(*args, **kwargs)
|
133
|
+
self.formatter = DecoratingFormatter.new
|
134
|
+
end
|
135
|
+
end
|
136
|
+
end
|
137
|
+
end
|
138
|
+
end
|
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
|
# Base class for startup logging and testing in multiverse
|
6
6
|
|
@@ -1,6 +1,8 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
5
|
+
|
4
6
|
require 'new_relic/agent/transaction'
|
5
7
|
|
6
8
|
module NewRelic
|
@@ -13,12 +15,12 @@ module NewRelic
|
|
13
15
|
module Messaging
|
14
16
|
extend self
|
15
17
|
|
18
|
+
RABBITMQ_TRANSPORT_TYPE = "RabbitMQ"
|
19
|
+
|
16
20
|
ATTR_DESTINATION = AttributeFilter::DST_TRANSACTION_EVENTS |
|
17
21
|
AttributeFilter::DST_TRANSACTION_TRACER |
|
18
22
|
AttributeFilter::DST_ERROR_COLLECTOR
|
19
23
|
|
20
|
-
EMPTY_STRING = ''.freeze
|
21
|
-
|
22
24
|
# Start a MessageBroker segment configured to trace a messaging action.
|
23
25
|
# Finishing this segment will handle timing and recording of the proper
|
24
26
|
# metrics for New Relic's messaging features..
|
@@ -133,7 +135,7 @@ module NewRelic
|
|
133
135
|
txn = Tracer.start_transaction name: txn_name, category: :message
|
134
136
|
|
135
137
|
if headers
|
136
|
-
consume_message_headers headers,
|
138
|
+
txn.distributed_tracer.consume_message_headers headers, state, RABBITMQ_TRANSPORT_TYPE
|
137
139
|
CrossAppTracing.reject_messaging_cat_headers(headers).each do |k, v|
|
138
140
|
txn.add_agent_attribute :"message.headers.#{k}", v, AttributeFilter::DST_NONE unless v.nil?
|
139
141
|
end
|
@@ -365,76 +367,6 @@ module NewRelic
|
|
365
367
|
transaction_name
|
366
368
|
end
|
367
369
|
|
368
|
-
RABBITMQ_TRANSPORT_TYPE = "RabbitMQ".freeze
|
369
|
-
|
370
|
-
def consume_message_headers headers, transaction, state
|
371
|
-
consume_distributed_tracing_headers headers, transaction
|
372
|
-
consume_cross_app_tracing_headers headers, state
|
373
|
-
|
374
|
-
assign_synthetics_header headers[CrossAppTracing::NR_MESSAGE_BROKER_SYNTHETICS_HEADER], transaction
|
375
|
-
rescue => e
|
376
|
-
NewRelic::Agent.logger.error "Error in consume_message_headers", e
|
377
|
-
end
|
378
|
-
|
379
|
-
def decode_txn_info headers, transaction_state
|
380
|
-
encoded_id = headers[CrossAppTracing::NR_MESSAGE_BROKER_ID_HEADER]
|
381
|
-
|
382
|
-
decoded_id = if encoded_id.nil?
|
383
|
-
EMPTY_STRING
|
384
|
-
else
|
385
|
-
CrossAppTracing.obfuscator.deobfuscate(encoded_id)
|
386
|
-
end
|
387
|
-
|
388
|
-
if CrossAppTracing.trusted_valid_cross_app_id?(decoded_id) && transaction_state.current_transaction
|
389
|
-
txn_header = headers[CrossAppTracing::NR_MESSAGE_BROKER_TXN_HEADER]
|
390
|
-
txn = transaction_state.current_transaction
|
391
|
-
txn_info = ::JSON.load(CrossAppTracing.obfuscator.deobfuscate(txn_header))
|
392
|
-
payload = CrossAppPayload.new(decoded_id, txn, txn_info)
|
393
|
-
|
394
|
-
txn.cross_app_payload = payload
|
395
|
-
end
|
396
|
-
rescue => e
|
397
|
-
NewRelic::Agent.logger.debug("Failure deserializing encoded header in #{self.class}, #{e.class}, #{e.message}")
|
398
|
-
nil
|
399
|
-
end
|
400
|
-
|
401
|
-
CANDIDATE_HEADERS = ['newrelic'.freeze, 'NEWRELIC'.freeze, 'Newrelic'.freeze]
|
402
|
-
|
403
|
-
def consume_distributed_tracing_headers headers, transaction
|
404
|
-
if Agent.config[:'distributed_tracing.enabled']
|
405
|
-
return unless newrelic_trace_key = CANDIDATE_HEADERS.detect do |key|
|
406
|
-
headers.has_key?(key)
|
407
|
-
end
|
408
|
-
|
409
|
-
return unless payload = headers[newrelic_trace_key]
|
410
|
-
|
411
|
-
if transaction.accept_distributed_trace_payload payload
|
412
|
-
transaction.distributed_trace_payload.caller_transport_type = RABBITMQ_TRANSPORT_TYPE
|
413
|
-
end
|
414
|
-
end
|
415
|
-
end
|
416
|
-
|
417
|
-
def consume_cross_app_tracing_headers headers, state
|
418
|
-
if CrossAppTracing.cross_app_enabled? && CrossAppTracing.message_has_crossapp_request_header?(headers)
|
419
|
-
decode_txn_info headers, state
|
420
|
-
CrossAppTracing.assign_intrinsic_transaction_attributes state
|
421
|
-
end
|
422
|
-
end
|
423
|
-
|
424
|
-
def assign_synthetics_header synthetics_header, transaction
|
425
|
-
if synthetics_header and
|
426
|
-
incoming_payload = ::JSON.load(CrossAppTracing.obfuscator.deobfuscate(synthetics_header)) and
|
427
|
-
SyntheticsMonitor.is_valid_payload?(incoming_payload) and
|
428
|
-
SyntheticsMonitor.is_supported_version?(incoming_payload) and
|
429
|
-
SyntheticsMonitor.is_trusted?(incoming_payload)
|
430
|
-
|
431
|
-
transaction.raw_synthetics_header = synthetics_header
|
432
|
-
transaction.synthetics_payload = incoming_payload
|
433
|
-
end
|
434
|
-
rescue => e
|
435
|
-
NewRelic::Agent.logger.error "Error in assign_synthetics_header", e
|
436
|
-
end
|
437
|
-
|
438
370
|
end
|
439
371
|
end
|
440
372
|
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
|
# This file may be independently required to set up method tracing prior to
|
6
6
|
# the full agent loading. In those cases, we do need at least this require to
|
@@ -47,6 +47,7 @@ module NewRelic
|
|
47
47
|
#
|
48
48
|
|
49
49
|
module MethodTracer
|
50
|
+
|
50
51
|
def self.included clazz
|
51
52
|
clazz.extend ClassMethods
|
52
53
|
end
|
@@ -67,7 +68,7 @@ module NewRelic
|
|
67
68
|
#
|
68
69
|
# @api public
|
69
70
|
#
|
70
|
-
def trace_execution_scoped(metric_names, options=
|
71
|
+
def trace_execution_scoped(metric_names, options=NewRelic::EMPTY_HASH) #THREAD_LOCAL_ACCESS
|
71
72
|
NewRelic::Agent.record_api_supportability_metric :trace_execution_scoped
|
72
73
|
NewRelic::Agent::MethodTracerHelpers.trace_execution_scoped(metric_names, options) do
|
73
74
|
# Using an implicit block avoids object allocation for a &block param
|
@@ -83,7 +84,7 @@ module NewRelic
|
|
83
84
|
#
|
84
85
|
# @api public
|
85
86
|
#
|
86
|
-
def trace_execution_unscoped(metric_names, options=
|
87
|
+
def trace_execution_unscoped(metric_names, options=NewRelic::EMPTY_HASH) #THREAD_LOCAL_ACCESS
|
87
88
|
NewRelic::Agent.record_api_supportability_metric :trace_execution_unscoped
|
88
89
|
return yield unless NewRelic::Agent.tl_is_execution_traced?
|
89
90
|
t0 = Time.now
|
@@ -172,7 +173,7 @@ module NewRelic
|
|
172
173
|
# instrumentation into effectively one method call overhead
|
173
174
|
# when the agent is disabled
|
174
175
|
def assemble_code_header(method_name, metric_name_code, options)
|
175
|
-
header = "return #{_untraced_method_name(method_name, metric_name_code)}(
|
176
|
+
header = "return #{_untraced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION}) unless NewRelic::Agent.tl_is_execution_traced?\n"
|
176
177
|
header += options[:code_header].to_s
|
177
178
|
header
|
178
179
|
end
|
@@ -181,11 +182,11 @@ module NewRelic
|
|
181
182
|
# method code used if the agent is not creating a scope for
|
182
183
|
# use in scoped metrics.
|
183
184
|
def method_without_push_scope(method_name, metric_name_code, options)
|
184
|
-
"def #{_traced_method_name(method_name, metric_name_code)}(
|
185
|
+
"def #{_traced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION})
|
185
186
|
#{assemble_code_header(method_name, metric_name_code, options)}
|
186
187
|
t0 = Time.now
|
187
188
|
begin
|
188
|
-
#{_untraced_method_name(method_name, metric_name_code)}(
|
189
|
+
#{_untraced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION})\n
|
189
190
|
ensure
|
190
191
|
duration = (Time.now - t0).to_f
|
191
192
|
NewRelic::Agent.record_metric(\"#{metric_name_code}\", duration)
|
@@ -197,11 +198,11 @@ module NewRelic
|
|
197
198
|
# returns an eval-able string that contains the tracing code
|
198
199
|
# for a fully traced metric including scoping
|
199
200
|
def method_with_push_scope(method_name, metric_name_code, options)
|
200
|
-
"def #{_traced_method_name(method_name, metric_name_code)}(
|
201
|
+
"def #{_traced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION})
|
201
202
|
#{options[:code_header]}
|
202
203
|
result = ::NewRelic::Agent::MethodTracerHelpers.trace_execution_scoped(\"#{metric_name_code}\",
|
203
204
|
:metric => #{options[:metric]}) do
|
204
|
-
#{_untraced_method_name(method_name, metric_name_code)}(
|
205
|
+
#{_untraced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION})
|
205
206
|
end
|
206
207
|
#{options[:code_footer]}
|
207
208
|
result
|
@@ -325,6 +326,7 @@ module NewRelic
|
|
325
326
|
class_eval traced_method, __FILE__, __LINE__
|
326
327
|
alias_method _untraced_method_name(method_name, metric_name_code), method_name
|
327
328
|
alias_method method_name, _traced_method_name(method_name, metric_name_code)
|
329
|
+
ruby2_keywords(_traced_method_name(method_name, metric_name_code)) if respond_to?(:ruby2_keywords, true)
|
328
330
|
send visibility, method_name
|
329
331
|
send visibility, _traced_method_name(method_name, metric_name_code)
|
330
332
|
::NewRelic::Agent.logger.debug("Traced method: class = #{derived_class_name},"+
|