newrelic_rpm 5.7.0.350 → 9.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.gitignore +15 -1
- data/.rubocop.yml +1919 -0
- data/.rubocop_todo.yml +100 -0
- data/.simplecov +15 -0
- data/.snyk +11 -0
- data/.yardopts +2 -0
- data/Brewfile +12 -0
- data/CHANGELOG.md +4056 -2339
- data/CONTRIBUTING.md +132 -19
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Gemfile +5 -2
- data/Guardfile +22 -4
- data/LICENSE +202 -38
- data/README.md +87 -87
- data/Rakefile +27 -27
- data/THIRD_PARTY_NOTICES.md +28 -0
- data/Thorfile +5 -0
- data/bin/newrelic +3 -2
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +77 -54
- data/config.dot +5 -5
- data/docker-compose.yml +107 -0
- data/init.rb +5 -7
- data/install.rb +3 -3
- data/lefthook.yml +9 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +14 -10
- data/lib/new_relic/agent/agent.rb +125 -969
- data/lib/new_relic/agent/agent_helpers/connect.rb +227 -0
- data/lib/new_relic/agent/agent_helpers/harvest.rb +153 -0
- data/lib/new_relic/agent/agent_helpers/shutdown.rb +72 -0
- data/lib/new_relic/agent/agent_helpers/special_startup.rb +74 -0
- data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +167 -0
- data/lib/new_relic/agent/agent_helpers/startup.rb +202 -0
- data/lib/new_relic/agent/agent_helpers/transmit.rb +76 -0
- data/lib/new_relic/agent/agent_logger.rb +26 -18
- data/lib/new_relic/agent/attribute_filter.rb +69 -52
- data/lib/new_relic/agent/attribute_processing.rb +8 -8
- data/lib/new_relic/agent/attributes.rb +153 -0
- data/lib/new_relic/agent/audit_logger.rb +19 -4
- data/lib/new_relic/agent/autostart.rb +34 -28
- data/lib/new_relic/agent/chained_call.rb +2 -2
- data/lib/new_relic/agent/commands/agent_command.rb +4 -4
- data/lib/new_relic/agent/commands/agent_command_router.rb +15 -33
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +13 -11
- data/lib/new_relic/agent/configuration/default_source.rb +1480 -1053
- data/lib/new_relic/agent/configuration/dotted_hash.rb +7 -6
- data/lib/new_relic/agent/configuration/environment_source.rb +15 -11
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +68 -0
- data/lib/new_relic/agent/configuration/high_security_source.rb +9 -9
- data/lib/new_relic/agent/configuration/manager.rb +96 -79
- data/lib/new_relic/agent/configuration/manual_source.rb +2 -2
- data/lib/new_relic/agent/configuration/mask_defaults.rb +4 -4
- data/lib/new_relic/agent/configuration/security_policy_source.rb +83 -86
- data/lib/new_relic/agent/configuration/server_source.rb +49 -12
- data/lib/new_relic/agent/configuration/yaml_source.rb +42 -13
- data/lib/new_relic/agent/configuration.rb +2 -2
- data/lib/new_relic/agent/connect/request_builder.rb +61 -0
- data/lib/new_relic/agent/connect/response_handler.rb +58 -0
- data/lib/new_relic/agent/custom_event_aggregator.rb +15 -15
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +5 -6
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +16 -15
- data/lib/new_relic/agent/database/obfuscator.rb +3 -3
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +4 -4
- data/lib/new_relic/agent/database.rb +44 -53
- data/lib/new_relic/agent/database_adapter.rb +35 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +18 -20
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +9 -8
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +7 -11
- data/lib/new_relic/agent/datastores/mongo.rb +7 -12
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +6 -12
- data/lib/new_relic/agent/datastores.rb +19 -23
- data/lib/new_relic/agent/deprecator.rb +2 -2
- data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +13 -12
- data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +87 -66
- 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_tracing/distributed_trace_payload.rb +163 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +38 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +245 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +127 -0
- data/lib/new_relic/agent/distributed_tracing.rb +113 -32
- data/lib/new_relic/agent/encoding_normalizer.rb +5 -3
- data/lib/new_relic/agent/error_collector.rb +99 -63
- data/lib/new_relic/agent/error_event_aggregator.rb +10 -8
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +6 -4
- data/lib/new_relic/agent/event_aggregator.rb +43 -48
- data/lib/new_relic/agent/event_buffer.rb +8 -9
- data/lib/new_relic/agent/event_listener.rb +2 -3
- data/lib/new_relic/agent/event_loop.rb +27 -25
- data/lib/new_relic/agent/external.rb +20 -51
- data/lib/new_relic/agent/guid_generator.rb +30 -0
- data/lib/new_relic/agent/harvester.rb +5 -6
- data/lib/new_relic/agent/heap.rb +8 -10
- data/lib/new_relic/agent/hostname.rb +26 -5
- data/lib/new_relic/agent/http_clients/abstract.rb +81 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +26 -26
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +31 -17
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -23
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +12 -15
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +24 -8
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +9 -12
- data/lib/new_relic/agent/http_clients/uri_util.rb +12 -13
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +22 -52
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +39 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +59 -72
- data/lib/new_relic/agent/instrumentation/action_dispatch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb +64 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb +33 -0
- data/lib/new_relic/agent/instrumentation/action_mailer.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb +85 -0
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +86 -62
- data/lib/new_relic/agent/instrumentation/active_job.rb +38 -19
- data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +21 -7
- data/lib/new_relic/agent/instrumentation/active_record.rb +95 -46
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +82 -61
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +155 -0
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +36 -12
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +69 -64
- data/lib/new_relic/agent/instrumentation/active_storage.rb +8 -4
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +11 -32
- data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
- data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/bunny.rb +14 -134
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +77 -61
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
- data/lib/new_relic/agent/instrumentation/curb.rb +15 -187
- data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
- data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +37 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +35 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +30 -52
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +8 -7
- data/lib/new_relic/agent/instrumentation/excon.rb +29 -31
- data/lib/new_relic/agent/instrumentation/fiber/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
- data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
- data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/grape.rb +16 -121
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +12 -32
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +5 -6
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +58 -125
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +101 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +57 -71
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +15 -14
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +21 -14
- data/lib/new_relic/agent/instrumentation/mongo.rb +7 -132
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +49 -13
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
- data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +142 -0
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +22 -58
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +7 -7
- data/lib/new_relic/agent/instrumentation/queue_time.rb +9 -10
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +33 -141
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +19 -55
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +5 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +36 -0
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +45 -0
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +30 -0
- data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +142 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +18 -159
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +93 -0
- data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
- data/lib/new_relic/agent/instrumentation/redis.rb +20 -103
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +33 -41
- data/lib/new_relic/agent/instrumentation/sequel.rb +17 -20
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +3 -3
- data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +29 -46
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +31 -37
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +125 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +3 -3
- data/lib/new_relic/agent/instrumentation/sinatra.rb +35 -165
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
- data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +41 -0
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +14 -76
- data/lib/new_relic/agent/instrumentation.rb +2 -2
- data/lib/new_relic/agent/internal_agent_error.rb +3 -3
- data/lib/new_relic/agent/javascript_instrumentor.rb +51 -45
- data/lib/new_relic/agent/linking_metadata.rb +44 -0
- data/lib/new_relic/agent/local_log_decorator.rb +37 -0
- data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
- data/lib/new_relic/agent/log_once.rb +2 -2
- data/lib/new_relic/agent/log_priority.rb +20 -0
- data/lib/new_relic/agent/logging.rb +142 -0
- data/lib/new_relic/agent/memory_logger.rb +3 -3
- data/lib/new_relic/agent/messaging.rb +81 -164
- data/lib/new_relic/agent/method_tracer.rb +152 -145
- data/lib/new_relic/agent/method_tracer_helpers.rb +90 -13
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +117 -0
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +28 -0
- data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +5 -6
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +9 -15
- data/lib/new_relic/agent/monitors.rb +26 -0
- data/lib/new_relic/agent/new_relic_service/encoders.rb +7 -7
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +6 -7
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +8 -29
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -5
- data/lib/new_relic/agent/new_relic_service.rb +282 -166
- data/lib/new_relic/agent/noticeable_error.rb +19 -0
- data/lib/new_relic/agent/null_logger.rb +8 -4
- data/lib/new_relic/agent/obfuscator.rb +9 -11
- data/lib/new_relic/agent/parameter_filtering.rb +35 -8
- data/lib/new_relic/agent/payload_metric_mapping.rb +10 -11
- data/lib/new_relic/agent/pipe_channel_manager.rb +28 -18
- data/lib/new_relic/agent/pipe_service.rb +9 -6
- data/lib/new_relic/agent/prepend_supportability.rb +3 -3
- data/lib/new_relic/agent/priority_sampled_buffer.rb +16 -14
- data/lib/new_relic/agent/range_extensions.rb +9 -29
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +12 -12
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -14
- data/lib/new_relic/agent/rules_engine.rb +6 -5
- data/lib/new_relic/agent/sampler.rb +4 -5
- data/lib/new_relic/agent/sampler_collection.rb +4 -5
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +4 -3
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +14 -11
- data/lib/new_relic/agent/samplers/memory_sampler.rb +26 -15
- data/lib/new_relic/agent/samplers/object_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/vm_sampler.rb +22 -20
- data/lib/new_relic/agent/span_event_aggregator.rb +14 -16
- data/lib/new_relic/agent/span_event_primitive.rb +118 -58
- data/lib/new_relic/agent/sql_sampler.rb +25 -25
- data/lib/new_relic/agent/stats.rb +79 -42
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +11 -13
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +13 -14
- data/lib/new_relic/agent/stats_engine.rb +11 -11
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +8 -9
- data/lib/new_relic/agent/system_info.rb +100 -66
- data/lib/new_relic/agent/threading/agent_thread.rb +20 -16
- data/lib/new_relic/agent/threading/backtrace_node.rb +13 -14
- data/lib/new_relic/agent/threading/backtrace_service.rb +18 -18
- data/lib/new_relic/agent/threading/thread_profile.rb +31 -45
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +2 -2
- data/lib/new_relic/agent/tracer.rb +513 -0
- data/lib/new_relic/agent/transaction/abstract_segment.rb +131 -41
- data/lib/new_relic/agent/transaction/datastore_segment.rb +22 -18
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +184 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +72 -163
- data/lib/new_relic/agent/transaction/external_request_segment.rb +66 -63
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +34 -46
- data/lib/new_relic/agent/transaction/request_attributes.rb +36 -36
- data/lib/new_relic/agent/transaction/segment.rb +46 -10
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +2 -4
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +2 -2
- data/lib/new_relic/agent/transaction/trace.rb +21 -24
- data/lib/new_relic/agent/transaction/trace_builder.rb +11 -12
- data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
- data/lib/new_relic/agent/transaction/trace_node.rb +31 -28
- data/lib/new_relic/agent/transaction/tracing.rb +15 -111
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +6 -6
- data/lib/new_relic/agent/transaction.rb +252 -259
- data/lib/new_relic/agent/transaction_error_primitive.rb +34 -37
- data/lib/new_relic/agent/transaction_event_aggregator.rb +13 -13
- data/lib/new_relic/agent/transaction_event_primitive.rb +44 -56
- data/lib/new_relic/agent/transaction_event_recorder.rb +17 -16
- data/lib/new_relic/agent/transaction_metrics.rb +11 -10
- data/lib/new_relic/agent/transaction_sampler.rb +7 -12
- data/lib/new_relic/agent/transaction_time_aggregator.rb +41 -26
- data/lib/new_relic/agent/utilization/aws.rb +34 -4
- data/lib/new_relic/agent/utilization/azure.rb +4 -4
- data/lib/new_relic/agent/utilization/gcp.rb +8 -8
- data/lib/new_relic/agent/utilization/pcf.rb +6 -5
- data/lib/new_relic/agent/utilization/vendor.rb +44 -29
- data/lib/new_relic/agent/utilization_data.rb +43 -6
- data/lib/new_relic/agent/vm/jruby_vm.rb +2 -2
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +3 -3
- data/lib/new_relic/agent/vm/mri_vm.rb +46 -19
- data/lib/new_relic/agent/vm/snapshot.rb +6 -6
- data/lib/new_relic/agent/vm.rb +2 -2
- data/lib/new_relic/agent/worker_loop.rb +11 -13
- data/lib/new_relic/agent.rb +151 -79
- data/lib/new_relic/cli/command.rb +21 -23
- data/lib/new_relic/cli/commands/deployments.rb +94 -45
- data/lib/new_relic/cli/commands/install.rb +24 -26
- data/lib/new_relic/coerce.rb +42 -15
- data/lib/new_relic/collection_helper.rb +51 -49
- data/lib/new_relic/constants.rb +39 -0
- data/lib/new_relic/control/class_methods.rb +11 -5
- data/lib/new_relic/control/frameworks/external.rb +3 -3
- data/lib/new_relic/control/frameworks/rails.rb +24 -18
- data/lib/new_relic/control/frameworks/rails3.rb +4 -5
- data/lib/new_relic/control/frameworks/rails4.rb +2 -2
- data/lib/new_relic/control/frameworks/rails_notifications.rb +14 -0
- data/lib/new_relic/control/frameworks/ruby.rb +4 -4
- data/lib/new_relic/control/frameworks/sinatra.rb +8 -2
- data/lib/new_relic/control/frameworks.rb +2 -2
- data/lib/new_relic/control/instance_methods.rb +33 -42
- data/lib/new_relic/control/instrumentation.rb +40 -12
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +4 -5
- data/lib/new_relic/control.rb +2 -3
- data/lib/new_relic/delayed_job_injection.rb +2 -2
- data/lib/new_relic/dependency_detection.rb +129 -18
- data/lib/new_relic/environment_report.rb +41 -35
- data/lib/new_relic/helper.rb +49 -8
- data/lib/new_relic/language_support.rb +30 -6
- data/lib/new_relic/latest_changes.rb +9 -8
- data/lib/new_relic/local_environment.rb +23 -27
- data/lib/new_relic/metric_data.rb +32 -27
- data/lib/new_relic/metric_spec.rb +9 -7
- data/lib/new_relic/noticed_error.rb +46 -33
- data/lib/new_relic/rack/agent_hooks.rb +2 -2
- data/lib/new_relic/rack/agent_middleware.rb +7 -5
- data/lib/new_relic/rack/browser_monitoring.rb +134 -117
- data/lib/new_relic/rack.rb +2 -2
- data/lib/new_relic/recipes/capistrano3.rb +4 -62
- data/lib/new_relic/recipes/capistrano_legacy.rb +24 -27
- data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
- data/lib/new_relic/recipes.rb +2 -2
- data/lib/new_relic/supportability_helper.rb +21 -7
- data/lib/new_relic/traced_thread.rb +39 -0
- data/lib/new_relic/version.rb +7 -18
- data/lib/newrelic_rpm.rb +20 -33
- data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +16 -19
- data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +9 -15
- data/lib/tasks/all.rb +4 -4
- data/lib/tasks/config.rake +22 -118
- data/lib/tasks/coverage_report.rake +28 -0
- data/lib/tasks/helpers/config.html.erb +21 -0
- data/lib/tasks/helpers/format.rb +123 -0
- data/lib/tasks/helpers/matches.rb +12 -0
- data/lib/tasks/helpers/prompt.rb +24 -0
- data/lib/tasks/helpers/removers.rb +33 -0
- data/lib/tasks/install.rake +4 -0
- data/lib/tasks/instrumentation_generator/README.md +63 -0
- data/lib/tasks/instrumentation_generator/TODO.md +33 -0
- data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
- data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
- data/lib/tasks/multiverse.rake +4 -0
- data/lib/tasks/multiverse.rb +12 -5
- data/lib/tasks/newrelic.rb +2 -2
- data/lib/tasks/tests.rake +14 -14
- data/newrelic.yml +672 -3
- data/newrelic_rpm.gemspec +40 -31
- data/recipes/newrelic.rb +3 -3
- data/test/agent_helper.rb +419 -98
- metadata +238 -127
- data/.travis.yml +0 -228
- data/bin/mongrel_rpm +0 -33
- data/cert/cacert.pem +0 -1177
- 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/datastores/mongo/obfuscator.rb +0 -44
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -41
- data/lib/new_relic/agent/distributed_trace_payload.rb +0 -246
- 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/acts_as_solr.rb +0 -74
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -202
- data/lib/new_relic/agent/instrumentation/evented_subscriber.rb +0 -104
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -46
- data/lib/new_relic/agent/instrumentation/http.rb +0 -46
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
- data/lib/new_relic/agent/instrumentation/net.rb +0 -50
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
- 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/instrumentation/rails5/action_cable.rb +0 -36
- data/lib/new_relic/agent/instrumentation/rails5/action_controller.rb +0 -33
- data/lib/new_relic/agent/instrumentation/rails5/action_view.rb +0 -27
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
- data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
- data/lib/new_relic/agent/supported_versions.rb +0 -275
- 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/agent/transaction_state.rb +0 -186
- data/lib/new_relic/build.rb +0 -2
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/new_relic/control/frameworks/rails5.rb +0 -14
- data/lib/new_relic/metrics.rb +0 -13
- data/lib/tasks/config.html.erb +0 -32
- 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
- /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -0,0 +1,66 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module Rack
|
7
|
+
module Chain
|
8
|
+
def self.instrument!(builder_class)
|
9
|
+
NewRelic::Agent::Instrumentation::RackBuilder.track_deferred_detection(builder_class)
|
10
|
+
|
11
|
+
builder_class.class_eval do
|
12
|
+
include ::NewRelic::Agent::Instrumentation::RackBuilder
|
13
|
+
|
14
|
+
def to_app_with_newrelic_deferred_dependency_detection
|
15
|
+
with_deferred_dependency_detection { to_app_without_newrelic }
|
16
|
+
end
|
17
|
+
|
18
|
+
alias_method(:to_app_without_newrelic, :to_app)
|
19
|
+
alias_method(:to_app, :to_app_with_newrelic_deferred_dependency_detection)
|
20
|
+
|
21
|
+
if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
|
22
|
+
::NewRelic::Agent.logger.info("Installing #{builder_class} middleware instrumentation")
|
23
|
+
|
24
|
+
def run_with_newrelic(app = nil, *args, &block)
|
25
|
+
app_or_block = app || block
|
26
|
+
run_with_tracing(app_or_block) do |wrapped|
|
27
|
+
# Rack::Builder#run for Rack v3+ supports a block, and does not
|
28
|
+
# support args. Whether a block or an app is provided, that
|
29
|
+
# callable object will be wrapped into a MiddlewareProxy
|
30
|
+
# instance. That proxy instance must then be passed to
|
31
|
+
# run_without_newrelic as the app argument.
|
32
|
+
block ? run_without_newrelic(wrapped, &nil) : run_without_newrelic(wrapped, *args)
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
alias_method(:run_without_newrelic, :run)
|
37
|
+
alias_method(:run, :run_with_newrelic)
|
38
|
+
|
39
|
+
def use_with_newrelic(middleware_class, *args, &block)
|
40
|
+
use_with_tracing(middleware_class) { |wrapped_class| use_without_newrelic(wrapped_class, *args, &block) }
|
41
|
+
end
|
42
|
+
ruby2_keywords(:use_with_newrelic) if respond_to?(:ruby2_keywords, true)
|
43
|
+
|
44
|
+
alias_method(:use_without_newrelic, :use)
|
45
|
+
alias_method(:use, :use_with_newrelic)
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
50
|
+
|
51
|
+
module URLMap
|
52
|
+
module Chain
|
53
|
+
def self.instrument!(url_map_class)
|
54
|
+
url_map_class.class_eval do
|
55
|
+
alias_method(:initialize_without_newrelic, :initialize)
|
56
|
+
|
57
|
+
def initialize(map = {})
|
58
|
+
traced_map = ::NewRelic::Agent::Instrumentation::RackURLMap.generate_traced_map(map)
|
59
|
+
initialize_without_newrelic(traced_map)
|
60
|
+
end
|
61
|
+
end
|
62
|
+
end
|
63
|
+
end
|
64
|
+
end
|
65
|
+
end
|
66
|
+
end
|
@@ -0,0 +1,33 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module RackHelpers
|
7
|
+
def self.version_supported?
|
8
|
+
rack_version_supported? || puma_rack_version_supported?
|
9
|
+
end
|
10
|
+
|
11
|
+
def self.rack_version_supported?
|
12
|
+
return false unless defined? ::Rack
|
13
|
+
|
14
|
+
version = Gem::Version.new(::Rack.release)
|
15
|
+
min_version = Gem::Version.new('1.1.0')
|
16
|
+
version >= min_version
|
17
|
+
end
|
18
|
+
|
19
|
+
def self.puma_rack_version_supported?
|
20
|
+
return false unless defined? ::Puma::Const::PUMA_VERSION
|
21
|
+
|
22
|
+
version = Gem::Version.new(::Puma::Const::PUMA_VERSION)
|
23
|
+
# TODO: MAJOR VERSION - update min_version to 3.9.0
|
24
|
+
# min_version = Gem::Version.new('3.9.0')
|
25
|
+
min_version = Gem::Version.new('2.12.0')
|
26
|
+
version >= min_version
|
27
|
+
end
|
28
|
+
|
29
|
+
def self.middleware_instrumentation_enabled?
|
30
|
+
version_supported? && !::NewRelic::Agent.config[:disable_middleware_instrumentation]
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
@@ -0,0 +1,75 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
module Instrumentation
|
8
|
+
module RackBuilder
|
9
|
+
def self.track_deferred_detection(builder_class)
|
10
|
+
class << builder_class
|
11
|
+
attr_accessor :_nr_deferred_detection_ran
|
12
|
+
end
|
13
|
+
builder_class._nr_deferred_detection_ran = false
|
14
|
+
end
|
15
|
+
|
16
|
+
def deferred_dependency_check
|
17
|
+
return if self.class._nr_deferred_detection_ran
|
18
|
+
|
19
|
+
NewRelic::Agent.logger.info("Doing deferred dependency-detection before Rack startup")
|
20
|
+
DependencyDetection.detect!
|
21
|
+
self.class._nr_deferred_detection_ran = true
|
22
|
+
end
|
23
|
+
|
24
|
+
def check_for_late_instrumentation(app)
|
25
|
+
return if defined?(@checked_for_late_instrumentation) && @checked_for_late_instrumentation
|
26
|
+
|
27
|
+
@checked_for_late_instrumentation = true
|
28
|
+
if middleware_instrumentation_enabled?
|
29
|
+
if ::NewRelic::Agent::Instrumentation::MiddlewareProxy.needs_wrapping?(app)
|
30
|
+
::NewRelic::Agent.logger.info("We weren't able to instrument all of your Rack middlewares.",
|
31
|
+
"To correct this, ensure you 'require \"newrelic_rpm\"' before setting up your middleware stack.")
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
# We patch the #to_app method for a reason that actually has nothing to do with
|
37
|
+
# instrumenting rack itself. It happens to be a convenient and
|
38
|
+
# easy-to-hook point that happens late in the startup sequence of almost
|
39
|
+
# every application, making it a good place to do a final call to
|
40
|
+
# DependencyDetection.detect!, since all libraries are likely loaded at
|
41
|
+
# this point.
|
42
|
+
def with_deferred_dependency_detection
|
43
|
+
deferred_dependency_check
|
44
|
+
yield.tap { |result| check_for_late_instrumentation(result) }
|
45
|
+
end
|
46
|
+
|
47
|
+
def middleware_instrumentation_enabled?
|
48
|
+
::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
|
49
|
+
end
|
50
|
+
|
51
|
+
def run_with_tracing(app)
|
52
|
+
return yield(app) unless middleware_instrumentation_enabled?
|
53
|
+
|
54
|
+
yield(::NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true))
|
55
|
+
end
|
56
|
+
|
57
|
+
def use_with_tracing(middleware_class)
|
58
|
+
return if middleware_class.nil?
|
59
|
+
return yield(middleware_class) unless middleware_instrumentation_enabled?
|
60
|
+
|
61
|
+
yield(::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class))
|
62
|
+
end
|
63
|
+
end
|
64
|
+
|
65
|
+
module RackURLMap
|
66
|
+
def self.generate_traced_map(map)
|
67
|
+
map.inject({}) do |traced_map, (url, handler)|
|
68
|
+
traced_map[url] = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(handler, true)
|
69
|
+
traced_map
|
70
|
+
end
|
71
|
+
end
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|
75
|
+
end
|
@@ -0,0 +1,43 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module Rack
|
7
|
+
module URLMap
|
8
|
+
module Prepend
|
9
|
+
def initialize(map = {})
|
10
|
+
super(::NewRelic::Agent::Instrumentation::RackURLMap.generate_traced_map(map))
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
14
|
+
|
15
|
+
module Prepend
|
16
|
+
include ::NewRelic::Agent::Instrumentation::RackBuilder
|
17
|
+
|
18
|
+
def self.prepended(builder_class)
|
19
|
+
NewRelic::Agent::Instrumentation::RackBuilder.track_deferred_detection(builder_class)
|
20
|
+
end
|
21
|
+
|
22
|
+
def to_app
|
23
|
+
with_deferred_dependency_detection { super }
|
24
|
+
end
|
25
|
+
|
26
|
+
def run(app = nil, *args, &block)
|
27
|
+
app_or_block = app || block
|
28
|
+
run_with_tracing(app_or_block) do |wrapped|
|
29
|
+
# Rack::Builder#run for Rack v3+ supports a block, and does not
|
30
|
+
# support args. Whether a block or an app is provided, that callable
|
31
|
+
# object will be wrapped into a MiddlewareProxy instance. That
|
32
|
+
# proxy instance must then be passed to super as the app argument.
|
33
|
+
block ? super(wrapped, &nil) : super(wrapped, *args)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
def use(middleware_class, *args, &blk)
|
38
|
+
use_with_tracing(middleware_class) { |wrapped_class| super(wrapped_class, *args, &blk) }
|
39
|
+
end
|
40
|
+
ruby2_keywords(:use) if respond_to?(:ruby2_keywords, true)
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
@@ -1,158 +1,43 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/instrumentation/controller_instrumentation'
|
6
6
|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
def self.version_supported?
|
12
|
-
rack_version_supported? || puma_rack_version_supported?
|
13
|
-
end
|
14
|
-
|
15
|
-
def self.rack_version_supported?
|
16
|
-
return false unless defined? ::Rack
|
17
|
-
|
18
|
-
version = Gem::Version.new(::Rack.release)
|
19
|
-
min_version = Gem::Version.new('1.1.0')
|
20
|
-
version >= min_version
|
21
|
-
end
|
22
|
-
|
23
|
-
def self.puma_rack_version_supported?
|
24
|
-
return false unless defined? ::Puma::Const::PUMA_VERSION
|
25
|
-
|
26
|
-
version = Gem::Version.new(::Puma::Const::PUMA_VERSION)
|
27
|
-
min_version = Gem::Version.new('2.12.0')
|
28
|
-
version >= min_version
|
29
|
-
end
|
30
|
-
|
31
|
-
def self.middleware_instrumentation_enabled?
|
32
|
-
version_supported? && !::NewRelic::Agent.config[:disable_middleware_instrumentation]
|
33
|
-
end
|
34
|
-
|
35
|
-
def self.check_for_late_instrumentation(app)
|
36
|
-
return if defined?(@checked_for_late_instrumentation) && @checked_for_late_instrumentation
|
37
|
-
@checked_for_late_instrumentation = true
|
38
|
-
if middleware_instrumentation_enabled?
|
39
|
-
if ::NewRelic::Agent::Instrumentation::MiddlewareProxy.needs_wrapping?(app)
|
40
|
-
::NewRelic::Agent.logger.info("We weren't able to instrument all of your Rack middlewares.",
|
41
|
-
"To correct this, ensure you 'require \"newrelic_rpm\"' before setting up your middleware stack.")
|
42
|
-
end
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
def self.instrument_builder builder_class
|
47
|
-
::NewRelic::Agent.logger.info "Installing deferred #{builder_class} instrumentation"
|
48
|
-
|
49
|
-
builder_class.class_eval do
|
50
|
-
class << self
|
51
|
-
attr_accessor :_nr_deferred_detection_ran
|
52
|
-
end
|
53
|
-
self._nr_deferred_detection_ran = false
|
54
|
-
|
55
|
-
include ::NewRelic::Agent::Instrumentation::RackBuilder
|
56
|
-
|
57
|
-
alias_method :to_app_without_newrelic, :to_app
|
58
|
-
alias_method :to_app, :to_app_with_newrelic_deferred_dependency_detection
|
59
|
-
|
60
|
-
if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
|
61
|
-
::NewRelic::Agent.logger.info "Installing #{builder_class} middleware instrumentation"
|
62
|
-
alias_method :run_without_newrelic, :run
|
63
|
-
alias_method :run, :run_with_newrelic
|
64
|
-
|
65
|
-
alias_method :use_without_newrelic, :use
|
66
|
-
alias_method :use, :use_with_newrelic
|
67
|
-
end
|
68
|
-
end
|
69
|
-
|
70
|
-
def self.instrument_url_map url_map_class
|
71
|
-
url_map_class.class_eval do
|
72
|
-
alias_method :initialize_without_newrelic, :initialize
|
73
|
-
|
74
|
-
def initialize(map = {})
|
75
|
-
traced_map = ::NewRelic::Agent::Instrumentation::RackURLMap.generate_traced_map(map)
|
76
|
-
initialize_without_newrelic(traced_map)
|
77
|
-
end
|
78
|
-
end
|
79
|
-
end
|
80
|
-
end
|
81
|
-
end
|
82
|
-
|
83
|
-
module RackBuilder
|
84
|
-
def run_with_newrelic(app, *args)
|
85
|
-
if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
|
86
|
-
wrapped_app = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
|
87
|
-
run_without_newrelic(wrapped_app, *args)
|
88
|
-
else
|
89
|
-
run_without_newrelic(app, *args)
|
90
|
-
end
|
91
|
-
end
|
92
|
-
|
93
|
-
def use_with_newrelic(middleware_class, *args, &blk)
|
94
|
-
if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
|
95
|
-
wrapped_middleware_class = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class)
|
96
|
-
use_without_newrelic(wrapped_middleware_class, *args, &blk)
|
97
|
-
else
|
98
|
-
use_without_newrelic(middleware_class, *args, &blk)
|
99
|
-
end
|
100
|
-
end
|
101
|
-
|
102
|
-
# We patch this method for a reason that actually has nothing to do with
|
103
|
-
# instrumenting rack itself. It happens to be a convenient and
|
104
|
-
# easy-to-hook point that happens late in the startup sequence of almost
|
105
|
-
# every application, making it a good place to do a final call to
|
106
|
-
# DependencyDetection.detect!, since all libraries are likely loaded at
|
107
|
-
# this point.
|
108
|
-
def to_app_with_newrelic_deferred_dependency_detection
|
109
|
-
unless self.class._nr_deferred_detection_ran
|
110
|
-
NewRelic::Agent.logger.info "Doing deferred dependency-detection before Rack startup"
|
111
|
-
DependencyDetection.detect!
|
112
|
-
self.class._nr_deferred_detection_ran = true
|
113
|
-
end
|
114
|
-
|
115
|
-
result = to_app_without_newrelic
|
116
|
-
::NewRelic::Agent::Instrumentation::RackHelpers.check_for_late_instrumentation(result)
|
117
|
-
|
118
|
-
result
|
119
|
-
end
|
120
|
-
end
|
121
|
-
|
122
|
-
module RackURLMap
|
123
|
-
def self.generate_traced_map(map)
|
124
|
-
map.inject({}) do |traced_map, (url, handler)|
|
125
|
-
traced_map[url] = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(handler, true)
|
126
|
-
traced_map
|
127
|
-
end
|
128
|
-
end
|
129
|
-
end
|
130
|
-
end
|
131
|
-
end
|
132
|
-
end
|
7
|
+
require_relative 'rack/helpers'
|
8
|
+
require_relative 'rack/instrumentation'
|
9
|
+
require_relative 'rack/chain'
|
10
|
+
require_relative 'rack/prepend'
|
133
11
|
|
134
12
|
DependencyDetection.defer do
|
135
13
|
named :rack
|
136
14
|
|
137
15
|
depends_on do
|
138
|
-
defined?(
|
16
|
+
defined?(Rack) && defined?(Rack::Builder)
|
139
17
|
end
|
140
18
|
|
141
19
|
executes do
|
142
|
-
|
20
|
+
if use_prepend?
|
21
|
+
prepend_instrument Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Prepend
|
22
|
+
else
|
23
|
+
chain_instrument_target Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Chain
|
24
|
+
end
|
143
25
|
end
|
144
26
|
end
|
145
27
|
|
146
|
-
|
147
28
|
DependencyDetection.defer do
|
148
29
|
named :puma_rack
|
149
30
|
|
150
31
|
depends_on do
|
151
|
-
defined?(
|
32
|
+
defined?(Puma::Rack::Builder)
|
152
33
|
end
|
153
34
|
|
154
35
|
executes do
|
155
|
-
|
36
|
+
if use_prepend?
|
37
|
+
prepend_instrument Puma::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Prepend
|
38
|
+
else
|
39
|
+
chain_instrument_target Puma::Rack::Builder, NewRelic::Agent::Instrumentation::Rack::Chain
|
40
|
+
end
|
156
41
|
end
|
157
42
|
end
|
158
43
|
|
@@ -160,16 +45,20 @@ DependencyDetection.defer do
|
|
160
45
|
named :rack_urlmap
|
161
46
|
|
162
47
|
depends_on do
|
163
|
-
defined?(
|
48
|
+
defined?(Rack) && defined?(Rack::URLMap)
|
164
49
|
end
|
165
50
|
|
166
51
|
depends_on do
|
167
|
-
|
168
|
-
!::NewRelic::Agent.config[:disable_rack]
|
52
|
+
NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
|
169
53
|
end
|
170
54
|
|
171
55
|
executes do
|
172
|
-
|
56
|
+
if use_prepend?
|
57
|
+
prepend_instrument Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Prepend
|
58
|
+
else
|
59
|
+
chain_instrument_target Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Chain
|
60
|
+
NewRelic::Agent::Instrumentation::RackHelpers.instrument_url_map
|
61
|
+
end
|
173
62
|
end
|
174
63
|
end
|
175
64
|
|
@@ -177,15 +66,18 @@ DependencyDetection.defer do
|
|
177
66
|
named :puma_rack_urlmap
|
178
67
|
|
179
68
|
depends_on do
|
180
|
-
defined?
|
69
|
+
defined?(Puma::Rack::URLMap)
|
181
70
|
end
|
182
71
|
|
183
72
|
depends_on do
|
184
|
-
|
185
|
-
!::NewRelic::Agent.config[:disable_puma_rack]
|
73
|
+
NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
|
186
74
|
end
|
187
75
|
|
188
76
|
executes do
|
189
|
-
|
77
|
+
if use_prepend?
|
78
|
+
prepend_instrument Puma::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Prepend
|
79
|
+
else
|
80
|
+
chain_instrument_target Puma::Rack::URLMap, NewRelic::Agent::Instrumentation::Rack::URLMap::Chain
|
81
|
+
end
|
190
82
|
end
|
191
83
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/parameter_filtering'
|
6
6
|
|
@@ -20,17 +20,16 @@ module NewRelic
|
|
20
20
|
end
|
21
21
|
end
|
22
22
|
|
23
|
-
def process_action(*args) #THREAD_LOCAL_ACCESS
|
23
|
+
def process_action(*args) # THREAD_LOCAL_ACCESS
|
24
24
|
munged_params = NewRelic::Agent::ParameterFiltering.filter_rails_request_parameters(request.filtered_parameters)
|
25
25
|
perform_action_with_newrelic_trace(:category => :controller,
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
26
|
+
:name => self.action_name,
|
27
|
+
:path => newrelic_metric_path,
|
28
|
+
:params => munged_params,
|
29
|
+
:class_name => self.class.name) do
|
30
30
|
super
|
31
31
|
end
|
32
32
|
end
|
33
|
-
|
34
33
|
end
|
35
34
|
|
36
35
|
module ActionView
|
@@ -41,12 +40,13 @@ module NewRelic
|
|
41
40
|
"file"
|
42
41
|
elsif identifier.nil?
|
43
42
|
::NewRelic::Agent::UNKNOWN_METRIC
|
44
|
-
elsif identifier.include?
|
43
|
+
elsif identifier.include?('/') # this is a filepath
|
45
44
|
identifier.split('/')[-2..-1].join('/')
|
46
45
|
else
|
47
46
|
identifier
|
48
47
|
end
|
49
48
|
end
|
49
|
+
|
50
50
|
def render_type(file_path)
|
51
51
|
file = File.basename(file_path)
|
52
52
|
if file.starts_with?('_')
|
@@ -66,7 +66,7 @@ DependencyDetection.defer do
|
|
66
66
|
@name = :rails3_controller
|
67
67
|
|
68
68
|
depends_on do
|
69
|
-
defined?(
|
69
|
+
defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i == 3
|
70
70
|
end
|
71
71
|
|
72
72
|
depends_on do
|
@@ -74,7 +74,7 @@ DependencyDetection.defer do
|
|
74
74
|
end
|
75
75
|
|
76
76
|
executes do
|
77
|
-
|
77
|
+
NewRelic::Agent.logger.info('Installing Rails 3 Controller instrumentation')
|
78
78
|
end
|
79
79
|
|
80
80
|
executes do
|
@@ -84,52 +84,16 @@ DependencyDetection.defer do
|
|
84
84
|
end
|
85
85
|
end
|
86
86
|
end
|
87
|
-
DependencyDetection.defer do
|
88
|
-
@name = :rails30_view
|
89
|
-
|
90
|
-
depends_on do
|
91
|
-
defined?(::Rails::VERSION::MAJOR) && defined?(::Rails::VERSION::MINOR) &&
|
92
|
-
::Rails::VERSION::MAJOR.to_i == 3 && ::Rails::VERSION::MINOR.to_i == 0
|
93
|
-
end
|
94
|
-
|
95
|
-
depends_on do
|
96
|
-
!NewRelic::Agent.config[:disable_view_instrumentation]
|
97
|
-
end
|
98
|
-
|
99
|
-
executes do
|
100
|
-
::NewRelic::Agent.logger.info 'Installing Rails 3.0 view instrumentation'
|
101
|
-
end
|
102
|
-
|
103
|
-
executes do
|
104
|
-
ActionView::Template.class_eval do
|
105
|
-
include NewRelic::Agent::MethodTracer
|
106
|
-
def render_with_newrelic(*args, &block)
|
107
|
-
options = if @virtual_path && @virtual_path.starts_with?('/') # file render
|
108
|
-
{:file => true }
|
109
|
-
else
|
110
|
-
{}
|
111
|
-
end
|
112
|
-
str = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(@identifier, options)}/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.render_type(@identifier)}"
|
113
|
-
trace_execution_scoped str do
|
114
|
-
render_without_newrelic(*args, &block)
|
115
|
-
end
|
116
|
-
end
|
117
|
-
|
118
|
-
alias_method :render_without_newrelic, :render
|
119
|
-
alias_method :render, :render_with_newrelic
|
120
|
-
|
121
|
-
end
|
122
|
-
end
|
123
|
-
end
|
124
87
|
|
88
|
+
# Though this uses the name :rails31_view, it is used only for rails 3.2 now
|
89
|
+
# Rails 3.1 is no longer supported by the agent.
|
125
90
|
DependencyDetection.defer do
|
126
91
|
@name = :rails31_view
|
127
92
|
|
128
|
-
#
|
129
|
-
# Currently enabled for Rails 3.1 and 3.2
|
93
|
+
# Enabled for Rails 3.2
|
130
94
|
depends_on do
|
131
|
-
defined?(
|
132
|
-
|
95
|
+
defined?(Rails::VERSION::MAJOR) && defined?(Rails::VERSION::MINOR) &&
|
96
|
+
Rails::VERSION::MAJOR.to_i == 3 && Rails::VERSION::MINOR.to_i == 2
|
133
97
|
end
|
134
98
|
|
135
99
|
depends_on do
|
@@ -137,7 +101,7 @@ DependencyDetection.defer do
|
|
137
101
|
end
|
138
102
|
|
139
103
|
executes do
|
140
|
-
|
104
|
+
NewRelic::Agent.logger.info('Installing Rails 3.2 view instrumentation')
|
141
105
|
end
|
142
106
|
|
143
107
|
executes do
|
@@ -147,10 +111,10 @@ DependencyDetection.defer do
|
|
147
111
|
|
148
112
|
def render_with_newrelic(context, options)
|
149
113
|
# This is needed for rails 3.2 compatibility
|
150
|
-
@details = extract_details(options) if respond_to?
|
114
|
+
@details = extract_details(options) if respond_to?(:extract_details, true)
|
151
115
|
identifier = determine_template(options) ? determine_template(options).identifier : nil
|
152
116
|
scope_name = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(identifier, options)}/Rendering"
|
153
|
-
trace_execution_scoped
|
117
|
+
trace_execution_scoped(scope_name) do
|
154
118
|
render_without_newrelic(context, options)
|
155
119
|
end
|
156
120
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/instrumentation/middleware_proxy'
|
6
6
|
|
@@ -8,15 +8,15 @@ DependencyDetection.defer do
|
|
8
8
|
named :rails_middleware
|
9
9
|
|
10
10
|
depends_on do
|
11
|
-
|
11
|
+
!NewRelic::Agent.config[:disable_middleware_instrumentation]
|
12
12
|
end
|
13
13
|
|
14
14
|
depends_on do
|
15
|
-
defined?(
|
15
|
+
defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i >= 3
|
16
16
|
end
|
17
17
|
|
18
18
|
executes do
|
19
|
-
|
19
|
+
NewRelic::Agent.logger.info("Installing Rails 3+ middleware instrumentation")
|
20
20
|
module ActionDispatch
|
21
21
|
class MiddlewareStack
|
22
22
|
class Middleware
|
@@ -0,0 +1,36 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require 'new_relic/agent/instrumentation/action_cable_subscriber'
|
6
|
+
require 'new_relic/agent/prepend_supportability'
|
7
|
+
|
8
|
+
DependencyDetection.defer do
|
9
|
+
@name = :action_cable_notifications
|
10
|
+
|
11
|
+
depends_on do
|
12
|
+
defined?(ActionCable::VERSION::MAJOR) &&
|
13
|
+
ActionCable::VERSION::MAJOR.to_i >= 5 &&
|
14
|
+
defined?(ActiveSupport)
|
15
|
+
end
|
16
|
+
|
17
|
+
depends_on do
|
18
|
+
!NewRelic::Agent.config[:disable_action_cable_instrumentation] &&
|
19
|
+
!NewRelic::Agent::Instrumentation::ActionCableSubscriber.subscribed?
|
20
|
+
end
|
21
|
+
|
22
|
+
executes do
|
23
|
+
NewRelic::Agent.logger.info('Installing notifications based Action Cable instrumentation')
|
24
|
+
end
|
25
|
+
|
26
|
+
executes do
|
27
|
+
# enumerate the specific events we want so that we do not get unexpected additions in the future
|
28
|
+
ActiveSupport::Notifications.subscribe(/\A(?:perform_action|transmit|broadcast)\.action_cable\z/,
|
29
|
+
NewRelic::Agent::Instrumentation::ActionCableSubscriber.new)
|
30
|
+
|
31
|
+
ActiveSupport.on_load(:action_cable) do
|
32
|
+
NewRelic::Agent::PrependSupportability.record_metrics_for(ActionCable::Engine) if defined?(ActionCable::Engine)
|
33
|
+
NewRelic::Agent::PrependSupportability.record_metrics_for(ActionCable::RemoteConnections) if defined?(ActionCable::RemoteConnections)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|