newrelic_rpm 6.15.0 → 9.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.build_ignore +26 -0
- data/CHANGELOG.md +4176 -2789
- data/CONTRIBUTING.md +32 -13
- data/Gemfile +1 -2
- data/LICENSE +0 -6
- data/README.md +29 -22
- data/Rakefile +33 -35
- data/THIRD_PARTY_NOTICES.md +14 -199
- data/Thorfile +5 -0
- data/bin/newrelic +4 -9
- data/bin/newrelic_rpm +15 -0
- data/bin/nrdebug +85 -62
- data/init.rb +6 -8
- data/install.rb +2 -2
- data/lib/new_relic/agent/adaptive_sampler.rb +13 -9
- data/lib/new_relic/agent/agent.rb +99 -941
- data/lib/new_relic/agent/agent_helpers/connect.rb +222 -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 +175 -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 +27 -23
- data/lib/new_relic/agent/attribute_filter.rb +67 -50
- data/lib/new_relic/agent/attribute_pre_filtering.rb +109 -0
- data/lib/new_relic/agent/attribute_processing.rb +9 -9
- data/lib/new_relic/agent/attributes.rb +5 -4
- data/lib/new_relic/agent/audit_logger.rb +13 -8
- data/lib/new_relic/agent/autostart.rb +21 -20
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +4 -4
- data/lib/new_relic/agent/commands/agent_command_router.rb +15 -13
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +16 -14
- data/lib/new_relic/agent/configuration/default_source.rb +1608 -1182
- data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
- data/lib/new_relic/agent/configuration/environment_source.rb +13 -11
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +40 -17
- data/lib/new_relic/agent/configuration/high_security_source.rb +11 -12
- data/lib/new_relic/agent/configuration/manager.rb +103 -75
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
- data/lib/new_relic/agent/configuration/security_policy_source.rb +92 -95
- data/lib/new_relic/agent/configuration/server_source.rb +43 -41
- data/lib/new_relic/agent/configuration/yaml_source.rb +47 -10
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +18 -18
- data/lib/new_relic/agent/connect/response_handler.rb +5 -8
- data/lib/new_relic/agent/custom_event_aggregator.rb +42 -16
- 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 +4 -4
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
- data/lib/new_relic/agent/database.rb +45 -53
- data/lib/new_relic/agent/database_adapter.rb +3 -1
- data/lib/new_relic/agent/datastores/metric_helper.rb +21 -22
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +17 -21
- data/lib/new_relic/agent/datastores/mongo.rb +6 -11
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +9 -15
- data/lib/new_relic/agent/datastores.rb +13 -15
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +10 -10
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +45 -40
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -22
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +23 -23
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +52 -54
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +10 -11
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +82 -83
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +42 -41
- data/lib/new_relic/agent/distributed_tracing.rb +33 -101
- data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
- data/lib/new_relic/agent/error_collector.rb +105 -58
- data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +9 -7
- data/lib/new_relic/agent/event_aggregator.rb +22 -21
- data/lib/new_relic/agent/event_buffer.rb +7 -8
- data/lib/new_relic/agent/event_listener.rb +1 -2
- data/lib/new_relic/agent/event_loop.rb +27 -25
- data/lib/new_relic/agent/external.rb +11 -44
- data/lib/new_relic/agent/guid_generator.rb +13 -11
- data/lib/new_relic/agent/harvester.rb +5 -8
- data/lib/new_relic/agent/heap.rb +8 -9
- data/lib/new_relic/agent/hostname.rb +21 -14
- data/lib/new_relic/agent/http_clients/abstract.rb +22 -31
- data/lib/new_relic/agent/http_clients/async_http_wrappers.rb +80 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +14 -17
- data/lib/new_relic/agent/http_clients/ethon_wrappers.rb +109 -0
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +15 -17
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +7 -6
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +8 -9
- data/lib/new_relic/agent/http_clients/httpx_wrappers.rb +91 -0
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +13 -8
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +12 -13
- data/lib/new_relic/agent/http_clients/uri_util.rb +3 -5
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +9 -22
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +42 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +41 -33
- 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 +20 -21
- data/lib/new_relic/agent/instrumentation/active_job.rb +33 -13
- data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
- data/lib/new_relic/agent/instrumentation/active_record.rb +41 -38
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +87 -75
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +54 -66
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +6 -6
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +30 -22
- data/lib/new_relic/agent/instrumentation/active_storage.rb +7 -3
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +8 -33
- data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/instrumentation.rb +13 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/prepend.rb +37 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger.rb +23 -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 +24 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +26 -0
- data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/async_http/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/async_http/instrumentation.rb +37 -0
- data/lib/new_relic/agent/instrumentation/async_http/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/async_http.rb +28 -0
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +159 -0
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/bunny.rb +11 -154
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +20 -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 +74 -63
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +225 -0
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
- data/lib/new_relic/agent/instrumentation/curb.rb +14 -246
- data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
- data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +38 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +51 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +30 -53
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +70 -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/ethon/chain.rb +39 -0
- data/lib/new_relic/agent/instrumentation/ethon/instrumentation.rb +105 -0
- data/lib/new_relic/agent/instrumentation/ethon/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/ethon.rb +39 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +11 -7
- data/lib/new_relic/agent/instrumentation/excon.rb +27 -29
- data/lib/new_relic/agent/instrumentation/fiber/chain.rb +27 -0
- data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +20 -0
- data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +25 -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 +104 -0
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/grape.rb +16 -117
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +94 -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 +138 -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 +41 -0
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +10 -32
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +34 -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/httpx/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/httpx/instrumentation.rb +51 -0
- data/lib/new_relic/agent/instrumentation/httpx/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpx.rb +27 -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 +69 -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 +59 -128
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +99 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +103 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +58 -74
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +15 -14
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +6 -8
- data/lib/new_relic/agent/instrumentation/mongo.rb +6 -137
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +24 -23
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/{net_prepend.rb → net_http/instrumentation.rb} +18 -14
- 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 +56 -10
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +32 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +20 -58
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +6 -6
- 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 +81 -0
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +32 -142
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +25 -56
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +9 -8
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +18 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +8 -5
- 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 +146 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +17 -158
- 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 +98 -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 +19 -108
- 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 +38 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +32 -43
- data/lib/new_relic/agent/instrumentation/roda/chain.rb +43 -0
- data/lib/new_relic/agent/instrumentation/roda/ignorer.rb +45 -0
- data/lib/new_relic/agent/instrumentation/roda/instrumentation.rb +68 -0
- data/lib/new_relic/agent/instrumentation/roda/prepend.rb +24 -0
- data/lib/new_relic/agent/instrumentation/roda/roda_transaction_namer.rb +29 -0
- data/lib/new_relic/agent/instrumentation/roda.rb +36 -0
- data/lib/new_relic/agent/instrumentation/sequel.rb +16 -19
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +12 -12
- data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +24 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +60 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +27 -65
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -36
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +130 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +4 -6
- data/lib/new_relic/agent/instrumentation/sinatra.rb +34 -163
- data/lib/new_relic/agent/instrumentation/stripe.rb +28 -0
- data/lib/new_relic/agent/instrumentation/stripe_subscriber.rb +77 -0
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +24 -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 +46 -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 +84 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +12 -91
- data/lib/new_relic/agent/instrumentation/view_component/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/view_component/instrumentation.rb +39 -0
- data/lib/new_relic/agent/instrumentation/view_component/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/view_component.rb +26 -0
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +2 -2
- data/lib/new_relic/agent/javascript_instrumentor.rb +58 -48
- 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 +282 -0
- data/lib/new_relic/agent/log_event_attributes.rb +115 -0
- data/lib/new_relic/agent/log_once.rb +1 -1
- data/lib/new_relic/agent/log_priority.rb +20 -0
- data/lib/new_relic/agent/logging.rb +95 -52
- data/lib/new_relic/agent/memory_logger.rb +2 -2
- data/lib/new_relic/agent/messaging.rb +72 -86
- data/lib/new_relic/agent/method_tracer.rb +159 -154
- data/lib/new_relic/agent/method_tracer_helpers.rb +109 -11
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +26 -19
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +5 -4
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -2
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +17 -9
- data/lib/new_relic/agent/monitors.rb +6 -7
- data/lib/new_relic/agent/new_relic_service/encoders.rb +9 -9
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +6 -6
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +4 -4
- data/lib/new_relic/agent/new_relic_service.rb +282 -213
- data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -5
- data/lib/new_relic/agent/null_logger.rb +7 -3
- data/lib/new_relic/agent/obfuscator.rb +7 -11
- data/lib/new_relic/agent/parameter_filtering.rb +29 -15
- data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
- data/lib/new_relic/agent/pipe_channel_manager.rb +34 -23
- data/lib/new_relic/agent/pipe_service.rb +13 -8
- data/lib/new_relic/agent/prepend_supportability.rb +2 -2
- data/lib/new_relic/agent/priority_sampled_buffer.rb +9 -12
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +12 -14
- data/lib/new_relic/agent/rules_engine.rb +6 -5
- data/lib/new_relic/agent/sampler.rb +5 -5
- data/lib/new_relic/agent/sampler_collection.rb +4 -5
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +8 -7
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +20 -17
- data/lib/new_relic/agent/samplers/memory_sampler.rb +32 -21
- data/lib/new_relic/agent/samplers/object_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
- data/lib/new_relic/agent/span_event_aggregator.rb +15 -15
- data/lib/new_relic/agent/span_event_primitive.rb +77 -59
- data/lib/new_relic/agent/sql_sampler.rb +20 -21
- data/lib/new_relic/agent/stats.rb +79 -42
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +9 -11
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +12 -13
- data/lib/new_relic/agent/stats_engine.rb +8 -8
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +8 -9
- data/lib/new_relic/agent/system_info.rb +113 -67
- data/lib/new_relic/agent/threading/agent_thread.rb +18 -14
- data/lib/new_relic/agent/threading/backtrace_node.rb +12 -13
- data/lib/new_relic/agent/threading/backtrace_service.rb +17 -21
- data/lib/new_relic/agent/threading/thread_profile.rb +24 -24
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +2 -2
- data/lib/new_relic/agent/tracer.rb +101 -96
- data/lib/new_relic/agent/transaction/abstract_segment.rb +176 -52
- data/lib/new_relic/agent/transaction/datastore_segment.rb +22 -18
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +65 -57
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +46 -48
- data/lib/new_relic/agent/transaction/external_request_segment.rb +52 -39
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +31 -37
- data/lib/new_relic/agent/transaction/request_attributes.rb +78 -42
- data/lib/new_relic/agent/transaction/segment.rb +20 -10
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +2 -2
- data/lib/new_relic/agent/transaction/trace.rb +16 -12
- data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
- data/lib/new_relic/agent/transaction/trace_context.rb +35 -35
- data/lib/new_relic/agent/transaction/trace_node.rb +30 -28
- data/lib/new_relic/agent/transaction/tracing.rb +32 -13
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +6 -6
- data/lib/new_relic/agent/transaction.rb +229 -178
- data/lib/new_relic/agent/transaction_error_primitive.rb +43 -25
- data/lib/new_relic/agent/transaction_event_aggregator.rb +16 -16
- data/lib/new_relic/agent/transaction_event_primitive.rb +51 -33
- data/lib/new_relic/agent/transaction_event_recorder.rb +16 -15
- data/lib/new_relic/agent/transaction_metrics.rb +10 -9
- data/lib/new_relic/agent/transaction_sampler.rb +7 -8
- data/lib/new_relic/agent/transaction_time_aggregator.rb +32 -27
- data/lib/new_relic/agent/utilization/aws.rb +34 -4
- data/lib/new_relic/agent/utilization/azure.rb +6 -6
- data/lib/new_relic/agent/utilization/gcp.rb +11 -13
- data/lib/new_relic/agent/utilization/pcf.rb +6 -5
- data/lib/new_relic/agent/utilization/vendor.rb +45 -32
- data/lib/new_relic/agent/utilization_data.rb +7 -5
- data/lib/new_relic/agent/vm/c_ruby_vm.rb +99 -0
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +3 -3
- data/lib/new_relic/agent/vm/snapshot.rb +5 -5
- data/lib/new_relic/agent/vm.rb +3 -3
- data/lib/new_relic/agent/worker_loop.rb +10 -12
- data/lib/new_relic/agent.rb +204 -111
- data/lib/new_relic/base64.rb +25 -0
- data/lib/new_relic/cli/command.rb +26 -25
- data/lib/new_relic/cli/commands/deployments.rb +100 -49
- data/lib/new_relic/cli/commands/install.rb +31 -34
- data/lib/new_relic/coerce.rb +15 -13
- data/lib/new_relic/collection_helper.rb +50 -48
- data/lib/new_relic/constants.rb +13 -12
- data/lib/new_relic/control/class_methods.rb +6 -12
- data/lib/new_relic/control/frameworks/external.rb +2 -2
- data/lib/new_relic/control/frameworks/rails.rb +60 -30
- data/lib/new_relic/control/frameworks/rails3.rb +3 -4
- 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/roda.rb +20 -0
- data/lib/new_relic/control/frameworks/ruby.rb +3 -3
- data/lib/new_relic/control/frameworks/sinatra.rb +7 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/instance_methods.rb +27 -45
- data/lib/new_relic/control/instrumentation.rb +25 -11
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +3 -4
- data/lib/new_relic/control.rb +1 -2
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +141 -32
- data/lib/new_relic/environment_report.rb +41 -33
- data/lib/new_relic/helper.rb +49 -7
- data/lib/new_relic/language_support.rb +39 -6
- data/lib/new_relic/latest_changes.rb +10 -9
- data/lib/new_relic/local_environment.rb +42 -37
- data/lib/new_relic/metric_data.rb +31 -26
- data/lib/new_relic/metric_spec.rb +8 -6
- data/lib/new_relic/noticed_error.rb +43 -46
- data/lib/new_relic/rack/agent_hooks.rb +2 -2
- data/lib/new_relic/rack/agent_middleware.rb +3 -17
- data/lib/new_relic/rack/browser_monitoring.rb +135 -121
- data/lib/new_relic/rack.rb +1 -1
- 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 +1 -1
- data/lib/new_relic/supportability_helper.rb +14 -12
- data/lib/new_relic/traced_thread.rb +38 -0
- data/lib/new_relic/version.rb +6 -17
- data/lib/newrelic_rpm.rb +20 -33
- data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +18 -21
- data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +9 -15
- data/lib/tasks/all.rb +3 -3
- data/lib/tasks/bump_version.rake +21 -0
- data/lib/tasks/config.rake +25 -119
- data/lib/tasks/coverage_report.rake +28 -0
- data/lib/tasks/helpers/config.html.erb +114 -0
- data/lib/tasks/helpers/format.rb +127 -0
- data/lib/tasks/helpers/matches.rb +12 -0
- data/lib/tasks/helpers/newrelicyml.rb +144 -0
- data/lib/tasks/helpers/prompt.rb +24 -0
- data/lib/tasks/helpers/version_bump.rb +62 -0
- data/lib/tasks/install.rake +8 -4
- 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 +21 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +7 -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/newrelic.rb +2 -1
- data/lib/tasks/newrelicyml.rake +13 -0
- data/lib/tasks/tests.rake +83 -17
- data/newrelic.yml +790 -4
- data/newrelic_rpm.gemspec +52 -43
- data/recipes/newrelic.rb +2 -2
- data/test/agent_helper.rb +252 -198
- metadata +275 -95
- data/.gitignore +0 -37
- data/.project +0 -23
- data/.yardopts +0 -26
- data/Guardfile +0 -25
- data/ROADMAP.md +0 -24
- data/bin/mongrel_rpm +0 -33
- data/bin/newrelic_cmd +0 -5
- data/cert/cacert.pem +0 -1177
- data/config/database.yml +0 -5
- data/config.dot +0 -278
- 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/instrumentation/acts_as_solr.rb +0 -75
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -204
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
- data/lib/new_relic/agent/instrumentation/http.rb +0 -49
- 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 -70
- 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/rainbows_instrumentation.rb +0 -26
- data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
- data/lib/new_relic/agent/range_extensions.rb +0 -47
- data/lib/new_relic/agent/supported_versions.rb +0 -275
- data/lib/new_relic/agent/vm/mri_vm.rb +0 -81
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/tasks/config.html.erb +0 -32
- data/lib/tasks/multiverse.rake +0 -2
- data/lib/tasks/multiverse.rb +0 -104
- /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
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,13 +47,12 @@ module NewRelic
|
|
47
47
|
#
|
48
48
|
|
49
49
|
module MethodTracer
|
50
|
-
|
51
|
-
|
52
|
-
clazz.extend ClassMethods
|
50
|
+
def self.included(klass)
|
51
|
+
klass.extend(ClassMethods)
|
53
52
|
end
|
54
53
|
|
55
|
-
def self.extended
|
56
|
-
|
54
|
+
def self.extended(klass)
|
55
|
+
klass.extend(ClassMethods)
|
57
56
|
end
|
58
57
|
|
59
58
|
# Trace a given block with stats and keep track of the caller.
|
@@ -68,8 +67,8 @@ module NewRelic
|
|
68
67
|
#
|
69
68
|
# @api public
|
70
69
|
#
|
71
|
-
def trace_execution_scoped(metric_names, options=NewRelic::EMPTY_HASH) #THREAD_LOCAL_ACCESS
|
72
|
-
NewRelic::Agent.record_api_supportability_metric :
|
70
|
+
def trace_execution_scoped(metric_names, options = NewRelic::EMPTY_HASH) # THREAD_LOCAL_ACCESS
|
71
|
+
NewRelic::Agent.record_api_supportability_metric(:trace_execution_scoped) unless options[:internal]
|
73
72
|
NewRelic::Agent::MethodTracerHelpers.trace_execution_scoped(metric_names, options) do
|
74
73
|
# Using an implicit block avoids object allocation for a &block param
|
75
74
|
yield
|
@@ -79,19 +78,20 @@ module NewRelic
|
|
79
78
|
# Trace a given block with stats assigned to the given metric_name. It does not
|
80
79
|
# provide scoped measurements, meaning whatever is being traced will not 'blame the
|
81
80
|
# Controller'--that is to say appear in the breakdown chart.
|
82
|
-
#
|
81
|
+
#
|
83
82
|
# * <tt>metric_names</tt> is a single name or an array of names of metrics
|
84
83
|
#
|
85
84
|
# @api public
|
86
85
|
#
|
87
|
-
def trace_execution_unscoped(metric_names, options=NewRelic::EMPTY_HASH) #THREAD_LOCAL_ACCESS
|
88
|
-
NewRelic::Agent.record_api_supportability_metric :
|
86
|
+
def trace_execution_unscoped(metric_names, options = NewRelic::EMPTY_HASH) # THREAD_LOCAL_ACCESS
|
87
|
+
NewRelic::Agent.record_api_supportability_metric(:trace_execution_unscoped) unless options[:internal]
|
89
88
|
return yield unless NewRelic::Agent.tl_is_execution_traced?
|
90
|
-
|
89
|
+
|
90
|
+
t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
91
91
|
begin
|
92
92
|
yield
|
93
93
|
ensure
|
94
|
-
duration = (
|
94
|
+
duration = Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0
|
95
95
|
NewRelic::Agent.instance.stats_engine.tl_record_unscoped_metrics(metric_names, duration)
|
96
96
|
end
|
97
97
|
end
|
@@ -101,52 +101,40 @@ module NewRelic
|
|
101
101
|
module ClassMethods
|
102
102
|
# contains methods refactored out of the #add_method_tracer method
|
103
103
|
module AddMethodTracer
|
104
|
-
ALLOWED_KEYS = [:metric, :push_scope, :code_header, :code_footer].freeze
|
105
|
-
|
106
|
-
# raises an error when the
|
107
|
-
# NewRelic::Agent::MethodTracer::ClassMethods#add_method_tracer
|
108
|
-
# method is called with improper keys. This aids in
|
109
|
-
# debugging new instrumentation by failing fast
|
110
|
-
def check_for_illegal_keys!(method_name, options)
|
111
|
-
unrecognized_keys = options.keys - ALLOWED_KEYS
|
112
|
-
|
113
|
-
if unrecognized_keys.any?
|
114
|
-
raise "Unrecognized options when adding method tracer to #{method_name}: " +
|
115
|
-
unrecognized_keys.join(', ')
|
116
|
-
end
|
117
|
-
end
|
118
|
-
|
119
|
-
# validity checking - add_method_tracer must receive either
|
120
|
-
# push scope or metric, or else it would record no
|
121
|
-
# data. Raises an error if this is the case
|
122
|
-
def check_for_push_scope_and_metric(options)
|
123
|
-
unless options[:push_scope] || options[:metric]
|
124
|
-
raise "Can't add a tracer where push_scope is false and metric is false"
|
125
|
-
end
|
126
|
-
end
|
104
|
+
ALLOWED_KEYS = [:metric, :push_scope, :code_header, :code_information, :code_footer].freeze
|
127
105
|
|
128
|
-
DEFAULT_SETTINGS = {:push_scope => true, :metric => true, :code_header =>
|
106
|
+
DEFAULT_SETTINGS = {:push_scope => true, :metric => true, :code_header => '', :code_footer => ''}.freeze
|
129
107
|
|
130
108
|
# Checks the provided options to make sure that they make
|
131
109
|
# sense. Raises an error if the options are incorrect to
|
132
110
|
# assist with debugging, so that errors occur at class
|
133
111
|
# construction time rather than instrumentation run time
|
134
|
-
def
|
112
|
+
def _nr_validate_method_tracer_options(method_name, options)
|
135
113
|
unless options.is_a?(Hash)
|
136
114
|
raise TypeError.new("Error adding method tracer to #{method_name}: provided options must be a Hash")
|
137
115
|
end
|
138
|
-
|
116
|
+
|
117
|
+
unrecognized_keys = options.keys - ALLOWED_KEYS
|
118
|
+
if unrecognized_keys.any?
|
119
|
+
raise "Unrecognized options when adding method tracer to #{method_name}: " +
|
120
|
+
unrecognized_keys.join(', ')
|
121
|
+
end
|
122
|
+
|
139
123
|
options = DEFAULT_SETTINGS.merge(options)
|
140
|
-
|
124
|
+
unless options[:push_scope] || options[:metric]
|
125
|
+
raise "Can't add a tracer where push_scope is false and metric is false"
|
126
|
+
end
|
127
|
+
|
141
128
|
options
|
142
129
|
end
|
143
130
|
|
144
131
|
# Default to the class where the method is defined.
|
145
132
|
#
|
146
133
|
# Example:
|
147
|
-
# Foo.
|
148
|
-
def
|
149
|
-
|
134
|
+
# Foo._nr_default_metric_name_code('bar') #=> "Custom/#{Foo.name}/bar"
|
135
|
+
def _nr_default_metric_name(method_name)
|
136
|
+
class_name = _nr_derived_class_name
|
137
|
+
->(*) { "Custom/#{class_name}/#{method_name}" }
|
150
138
|
end
|
151
139
|
|
152
140
|
# Checks to see if the method we are attempting to trace
|
@@ -154,7 +142,7 @@ module NewRelic
|
|
154
142
|
# anything if the method doesn't exist.
|
155
143
|
def newrelic_method_exists?(method_name)
|
156
144
|
exists = method_defined?(method_name) || private_method_defined?(method_name)
|
157
|
-
::NewRelic::Agent.logger.error("Did not trace #{
|
145
|
+
::NewRelic::Agent.logger.error("Did not trace #{_nr_derived_class_name}##{method_name} because that method does not exist") unless exists
|
158
146
|
exists
|
159
147
|
end
|
160
148
|
|
@@ -162,76 +150,34 @@ module NewRelic
|
|
162
150
|
# given metric by checking to see if the traced method
|
163
151
|
# exists. Warns the user if methods are being double-traced
|
164
152
|
# to help with debugging custom instrumentation.
|
165
|
-
def
|
166
|
-
exists = method_defined?(
|
167
|
-
::NewRelic::Agent.logger.error("Attempt to trace a method twice
|
153
|
+
def method_traced?(method_name)
|
154
|
+
exists = method_name && _nr_traced_method_module.method_defined?(method_name)
|
155
|
+
::NewRelic::Agent.logger.error("Attempt to trace a method twice: Method = #{method_name}") if exists
|
168
156
|
exists
|
169
157
|
end
|
170
158
|
|
171
|
-
# Returns
|
172
|
-
|
173
|
-
|
174
|
-
# when the agent is disabled
|
175
|
-
def assemble_code_header(method_name, metric_name_code, options)
|
176
|
-
header = "return #{_untraced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION}) unless NewRelic::Agent.tl_is_execution_traced?\n"
|
177
|
-
header += options[:code_header].to_s
|
178
|
-
header
|
159
|
+
# Returns an anonymous module that stores prepended trace methods.
|
160
|
+
def _nr_traced_method_module
|
161
|
+
@_nr_traced_method_module ||= Module.new
|
179
162
|
end
|
180
163
|
|
181
|
-
#
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
"def #{_traced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION})
|
186
|
-
#{assemble_code_header(method_name, metric_name_code, options)}
|
187
|
-
t0 = Time.now
|
188
|
-
begin
|
189
|
-
#{_untraced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION})\n
|
190
|
-
ensure
|
191
|
-
duration = (Time.now - t0).to_f
|
192
|
-
NewRelic::Agent.record_metric(\"#{metric_name_code}\", duration)
|
193
|
-
#{options[:code_footer]}
|
194
|
-
end
|
195
|
-
end"
|
196
|
-
end
|
197
|
-
|
198
|
-
# returns an eval-able string that contains the tracing code
|
199
|
-
# for a fully traced metric including scoping
|
200
|
-
def method_with_push_scope(method_name, metric_name_code, options)
|
201
|
-
"def #{_traced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION})
|
202
|
-
#{options[:code_header]}
|
203
|
-
result = ::NewRelic::Agent::MethodTracerHelpers.trace_execution_scoped(\"#{metric_name_code}\",
|
204
|
-
:metric => #{options[:metric]}) do
|
205
|
-
#{_untraced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION})
|
206
|
-
end
|
207
|
-
#{options[:code_footer]}
|
208
|
-
result
|
209
|
-
end"
|
210
|
-
end
|
211
|
-
|
212
|
-
# Decides which code snippet we should be eval'ing in this
|
213
|
-
# context, based on the options.
|
214
|
-
def code_to_eval(method_name, metric_name_code, options)
|
215
|
-
options = validate_options(method_name, options)
|
216
|
-
if options[:push_scope]
|
217
|
-
method_with_push_scope(method_name, metric_name_code, options)
|
218
|
-
else
|
219
|
-
method_without_push_scope(method_name, metric_name_code, options)
|
164
|
+
# for testing only
|
165
|
+
def _nr_clear_traced_methods!
|
166
|
+
_nr_traced_method_module.module_eval do
|
167
|
+
self.instance_methods.each { |m| remove_method(m) }
|
220
168
|
end
|
221
169
|
end
|
222
170
|
|
223
|
-
|
224
|
-
|
225
|
-
def derived_class_name
|
171
|
+
def _nr_derived_class_name
|
226
172
|
return self.name if self.name && !self.name.empty?
|
227
|
-
return
|
173
|
+
return 'AnonymousModule' if self.to_s.start_with?('#<Module:')
|
228
174
|
|
229
175
|
# trying to get the "MyClass" portion of "#<Class:MyClass>"
|
230
176
|
name = self.to_s[/^#<Class:(.+)>$/, 1]
|
231
|
-
if name.start_with?(
|
232
|
-
|
233
|
-
elsif name.start_with?(
|
234
|
-
|
177
|
+
if name.start_with?('0x')
|
178
|
+
'AnonymousClass'
|
179
|
+
elsif name.start_with?('#<Class:')
|
180
|
+
'AnonymousClass/Class'
|
235
181
|
else
|
236
182
|
"#{name}/Class"
|
237
183
|
end
|
@@ -248,22 +194,26 @@ module NewRelic
|
|
248
194
|
#
|
249
195
|
# === Overriding the metric name
|
250
196
|
#
|
251
|
-
# +
|
252
|
-
#
|
253
|
-
# evaluated at call time, then single quote the value like this:
|
197
|
+
# +metric_name+ is a String or Proc. If a Proc is given, it is bound to
|
198
|
+
# the object that called the traced method. For example:
|
254
199
|
#
|
255
|
-
# add_method_tracer :foo,
|
200
|
+
# add_method_tracer :foo, -> { "Custom/#{self.class.name}/foo" }
|
256
201
|
#
|
257
202
|
# This would name the metric according to the class of the runtime
|
258
|
-
#
|
203
|
+
# instance, as opposed to the class where +foo+ is defined.
|
259
204
|
#
|
260
205
|
# If not provided, the metric name will be <tt>Custom/ClassName/method_name</tt>.
|
261
206
|
#
|
262
|
-
# @param [Symbol]
|
263
|
-
# @param [String]
|
264
|
-
# the traced method under. This may be either a
|
265
|
-
#
|
207
|
+
# @param method_name [Symbol] the name of the method to trace
|
208
|
+
# @param metric_name [String,Proc,Array] the metric name to record calls to
|
209
|
+
# the traced method under. This may be either a String, or a Proc
|
210
|
+
# to be evaluated at call-time in order to determine the metric
|
266
211
|
# name dynamically.
|
212
|
+
# This method also accepts an array of Strings/Procs, in which case the
|
213
|
+
# first metric given will be scoped, while the remaining metrics will be
|
214
|
+
# recorded as though passed with :push_scope => false. If an Array of
|
215
|
+
# metric names is given with :push_scope => false, all metrics will be
|
216
|
+
# unscoped.
|
267
217
|
# @param [Hash] options additional options controlling how the method is
|
268
218
|
# traced.
|
269
219
|
# @option options [Boolean] :push_scope (true) If false, the traced method will
|
@@ -272,16 +222,17 @@ module NewRelic
|
|
272
222
|
# @option options [Boolean] :metric (true) If false, the traced method will
|
273
223
|
# only appear in transaction traces, but no metrics will be recorded
|
274
224
|
# for it.
|
275
|
-
# @option options [
|
225
|
+
# @option options [Proc] :code_header ('') Ruby code to be inserted and run
|
276
226
|
# before the tracer begins timing.
|
277
|
-
# @option options [
|
227
|
+
# @option options [Proc] :code_footer ('') Ruby code to be inserted and run
|
278
228
|
# after the tracer stops timing.
|
279
229
|
#
|
280
230
|
# @example
|
281
231
|
# add_method_tracer :foo
|
282
232
|
#
|
283
233
|
# # With a custom metric name
|
284
|
-
# add_method_tracer :foo,
|
234
|
+
# add_method_tracer :foo, "Custom/MyClass/foo"
|
235
|
+
# add_method_tracer :bar, -> { "Custom/#{self.class.name}/bar" }
|
285
236
|
#
|
286
237
|
# # Instrument foo only for custom dashboards (not in transaction
|
287
238
|
# # traces or breakdown charts)
|
@@ -292,65 +243,119 @@ module NewRelic
|
|
292
243
|
#
|
293
244
|
# @api public
|
294
245
|
#
|
295
|
-
def add_method_tracer(method_name,
|
296
|
-
::NewRelic::Agent.add_or_defer_method_tracer(self, method_name,
|
246
|
+
def add_method_tracer(method_name, metric_name = nil, options = {})
|
247
|
+
::NewRelic::Agent.add_or_defer_method_tracer(self, method_name, metric_name, options)
|
297
248
|
end
|
298
249
|
|
299
250
|
# For tests only because tracers must be removed in reverse-order
|
300
251
|
# from when they were added, or else other tracers that were added to the same method
|
301
252
|
# may get removed as well.
|
302
|
-
def remove_method_tracer(method_name
|
253
|
+
def remove_method_tracer(method_name) # :nodoc:
|
303
254
|
return unless Agent.config[:agent_enabled]
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
::NewRelic::Agent.logger.debug("removed method tracer #{method_name}
|
255
|
+
|
256
|
+
if _nr_traced_method_module.method_defined?(method_name)
|
257
|
+
_nr_traced_method_module.send(:remove_method, method_name)
|
258
|
+
::NewRelic::Agent.logger.debug("removed method tracer #{method_name}\n")
|
308
259
|
else
|
309
|
-
raise "No tracer
|
260
|
+
raise "No tracer on method '#{method_name}'"
|
310
261
|
end
|
311
262
|
end
|
312
263
|
|
313
264
|
private
|
314
265
|
|
315
|
-
def
|
266
|
+
def _nr_add_method_tracer_now(method_name, metric_name, options)
|
316
267
|
NewRelic::Agent.record_api_supportability_metric(:add_method_tracer)
|
317
|
-
|
318
268
|
return unless newrelic_method_exists?(method_name)
|
319
|
-
metric_name_code ||= default_metric_name_code(method_name)
|
320
|
-
return if traced_method_exists?(method_name, metric_name_code)
|
321
|
-
|
322
|
-
traced_method = code_to_eval(method_name, metric_name_code, options)
|
323
|
-
|
324
|
-
visibility = NewRelic::Helper.instance_method_visibility self, method_name
|
325
|
-
|
326
|
-
class_eval traced_method, __FILE__, __LINE__
|
327
|
-
alias_method _untraced_method_name(method_name, metric_name_code), method_name
|
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)
|
330
|
-
send visibility, method_name
|
331
|
-
send visibility, _traced_method_name(method_name, metric_name_code)
|
332
|
-
::NewRelic::Agent.logger.debug("Traced method: class = #{derived_class_name},"+
|
333
|
-
"method = #{method_name}, "+
|
334
|
-
"metric = '#{metric_name_code}'")
|
335
|
-
end
|
336
269
|
|
337
|
-
|
338
|
-
|
339
|
-
|
340
|
-
|
270
|
+
remove_method_tracer(method_name) if method_traced?(method_name)
|
271
|
+
|
272
|
+
options = _nr_validate_method_tracer_options(method_name, options)
|
273
|
+
|
274
|
+
visibility = NewRelic::Helper.instance_method_visibility(self, method_name)
|
275
|
+
|
276
|
+
scoped_metric, unscoped_metrics = _nr_scoped_unscoped_metrics(metric_name, method_name, push_scope: options[:push_scope])
|
277
|
+
|
278
|
+
_nr_define_traced_method(method_name, scoped_metric: scoped_metric, unscoped_metrics: unscoped_metrics,
|
279
|
+
code_header: options[:code_header], code_footer: options[:code_footer],
|
280
|
+
record_metrics: options[:metric], visibility: visibility,
|
281
|
+
code_information: options[:code_information])
|
282
|
+
|
283
|
+
prepend(_nr_traced_method_module)
|
284
|
+
|
285
|
+
::NewRelic::Agent.logger.debug("Traced method: class = #{_nr_derived_class_name}," +
|
286
|
+
"method = #{method_name}, " +
|
287
|
+
"metric = '#{metric_name}'")
|
341
288
|
end
|
342
289
|
|
343
|
-
#
|
344
|
-
#
|
345
|
-
|
346
|
-
|
290
|
+
# See #add_method_tracer; if multiple metric names are given, the first is
|
291
|
+
# treated as scoped, the rest unscoped. If options[:push_scope] is false,
|
292
|
+
# all given metrics are unscoped.
|
293
|
+
def _nr_scoped_unscoped_metrics(metric_name, method_name, push_scope: true)
|
294
|
+
if metric_name.is_a?(Array) && push_scope
|
295
|
+
[metric_name.shift, metric_name]
|
296
|
+
elsif push_scope
|
297
|
+
[metric_name || _nr_default_metric_name(method_name), []]
|
298
|
+
else
|
299
|
+
[nil, Array(metric_name)]
|
300
|
+
end
|
347
301
|
end
|
348
302
|
|
349
|
-
|
350
|
-
|
351
|
-
|
352
|
-
|
353
|
-
|
303
|
+
def _nr_define_traced_method(method_name, scoped_metric: nil, unscoped_metrics: [],
|
304
|
+
code_header: nil, code_footer: nil, record_metrics: true,
|
305
|
+
visibility: :public, code_information: {})
|
306
|
+
|
307
|
+
_nr_traced_method_module.module_eval do
|
308
|
+
define_method(method_name) do |*args, &block|
|
309
|
+
return super(*args, &block) unless NewRelic::Agent.tl_is_execution_traced?
|
310
|
+
|
311
|
+
scoped_metric_eval, unscoped_metrics_eval = nil, []
|
312
|
+
|
313
|
+
scoped_metric_eval = case scoped_metric
|
314
|
+
when Proc
|
315
|
+
instance_exec(*args, &scoped_metric)
|
316
|
+
when String
|
317
|
+
scoped_metric
|
318
|
+
end
|
319
|
+
|
320
|
+
unscoped_metrics_eval = unscoped_metrics.map do |metric|
|
321
|
+
metric.kind_of?(Proc) ? instance_exec(*args, &metric) : metric.to_s
|
322
|
+
end
|
323
|
+
|
324
|
+
instance_exec(&code_header) if code_header.kind_of?(Proc)
|
325
|
+
|
326
|
+
# NOTE: Calling ::NewRelic::Agent::MethodTracer.trace_execution_scoped and
|
327
|
+
# .trace_execution_unscoped below relies on the fact that MethodTracer is included
|
328
|
+
# in Module on agent startup. If/when this changes, these methods should be
|
329
|
+
# explicitly namespaced and extended in MethodTracer.
|
330
|
+
|
331
|
+
# If tracing multiple metrics on this method, nest one unscoped trace inside the scoped trace.
|
332
|
+
begin
|
333
|
+
if scoped_metric_eval
|
334
|
+
::NewRelic::Agent::MethodTracer.trace_execution_scoped(scoped_metric_eval,
|
335
|
+
metric: record_metrics,
|
336
|
+
internal: true,
|
337
|
+
code_information: code_information) do
|
338
|
+
if unscoped_metrics_eval.empty?
|
339
|
+
super(*args, &block)
|
340
|
+
else
|
341
|
+
::NewRelic::Agent::MethodTracer.trace_execution_unscoped(unscoped_metrics_eval, internal: true) do
|
342
|
+
super(*args, &block)
|
343
|
+
end
|
344
|
+
end
|
345
|
+
end
|
346
|
+
elsif !unscoped_metrics_eval.empty?
|
347
|
+
::NewRelic::Agent::MethodTracer.trace_execution_unscoped(unscoped_metrics_eval, internal: true) do
|
348
|
+
super(*args, &block)
|
349
|
+
end
|
350
|
+
end
|
351
|
+
ensure
|
352
|
+
instance_exec(&code_footer) if code_footer.kind_of?(Proc)
|
353
|
+
end
|
354
|
+
end
|
355
|
+
|
356
|
+
send(visibility, method_name)
|
357
|
+
ruby2_keywords(method_name) if respond_to?(:ruby2_keywords, true)
|
358
|
+
end
|
354
359
|
end
|
355
360
|
end
|
356
361
|
|
@@ -1,20 +1,26 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
7
7
|
module MethodTracerHelpers
|
8
|
+
# These are code level metrics (CLM) attributes. For Ruby, they map like so:
|
9
|
+
# filepath: full path to an .rb file on disk
|
10
|
+
# lineno: the line number a Ruby method is defined on within a given .rb file
|
11
|
+
# function: the name of the Ruby method
|
12
|
+
# namespace: the Ruby class' namespace as a string, ex: 'MyModule::MyClass'
|
13
|
+
SOURCE_CODE_INFORMATION_PARAMETERS = %i[filepath lineno function namespace].freeze
|
14
|
+
SOURCE_CODE_INFORMATION_FAILURE_METRIC = 'Supportability/CodeLevelMetrics/Ruby/Failure'.freeze
|
8
15
|
MAX_ALLOWED_METRIC_DURATION = 1_000_000_000 # roughly 31 years
|
9
16
|
|
10
17
|
extend self
|
11
18
|
|
12
|
-
def trace_execution_scoped(metric_names, options=NewRelic::EMPTY_HASH) #THREAD_LOCAL_ACCESS
|
13
|
-
|
14
|
-
return yield unless state.is_execution_traced?
|
19
|
+
def trace_execution_scoped(metric_names, options = NewRelic::EMPTY_HASH) # THREAD_LOCAL_ACCESS
|
20
|
+
return yield unless NewRelic::Agent::Tracer.state.is_execution_traced?
|
15
21
|
|
16
22
|
metric_names = Array(metric_names)
|
17
|
-
first_name
|
23
|
+
first_name = metric_names.shift
|
18
24
|
return yield unless first_name
|
19
25
|
|
20
26
|
segment = NewRelic::Agent::Tracer.start_segment(
|
@@ -22,15 +28,107 @@ module NewRelic
|
|
22
28
|
unscoped_metrics: metric_names
|
23
29
|
)
|
24
30
|
|
25
|
-
if options[:metric] == false
|
26
|
-
|
31
|
+
segment.record_metrics = false if options[:metric] == false
|
32
|
+
|
33
|
+
unless !options.key?(:code_information) || options[:code_information].nil? || options[:code_information].empty?
|
34
|
+
segment.code_information = options[:code_information]
|
27
35
|
end
|
28
36
|
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
37
|
+
Tracer.capture_segment_error(segment) { yield }
|
38
|
+
ensure
|
39
|
+
::NewRelic::Agent::Transaction::Segment.finish(segment)
|
40
|
+
end
|
41
|
+
|
42
|
+
def code_information(object, method_name)
|
43
|
+
return ::NewRelic::EMPTY_HASH unless clm_enabled? && object && method_name
|
44
|
+
|
45
|
+
@code_information ||= {}
|
46
|
+
cache_key = "#{object.object_id}#{method_name}".freeze
|
47
|
+
return @code_information[cache_key] if @code_information.key?(cache_key)
|
48
|
+
|
49
|
+
info = namespace_and_location(object, method_name.to_sym)
|
50
|
+
return ::NewRelic::EMPTY_HASH if info.empty?
|
51
|
+
|
52
|
+
namespace, location, is_class_method = info
|
53
|
+
@code_information[cache_key] = {filepath: location.first,
|
54
|
+
lineno: location.last,
|
55
|
+
function: "#{'self.' if is_class_method}#{method_name}",
|
56
|
+
namespace: namespace}.freeze
|
57
|
+
rescue StandardError => e
|
58
|
+
::NewRelic::Agent.logger.warn("Unable to determine source code info for '#{object}', " \
|
59
|
+
"method '#{method_name}' - #{e.class}: #{e.message}")
|
60
|
+
::NewRelic::Agent.increment_metric(SOURCE_CODE_INFORMATION_FAILURE_METRIC, 1)
|
61
|
+
::NewRelic::EMPTY_HASH
|
62
|
+
end
|
63
|
+
|
64
|
+
private
|
65
|
+
|
66
|
+
def clm_enabled?
|
67
|
+
::NewRelic::Agent.config[:'code_level_metrics.enabled']
|
68
|
+
end
|
69
|
+
|
70
|
+
# The string representation of a singleton class looks like
|
71
|
+
# '#<Class:MyModule::MyClass>', or '#<Class:MyModule::MyClass(id: integer, attribute: string)>'
|
72
|
+
# Return the 'MyModule::MyClass' part of that string
|
73
|
+
def klass_name(object)
|
74
|
+
name = Regexp.last_match(1) if object.to_s =~ /^#<Class:([\w:]+).*>$/
|
75
|
+
return name if name
|
76
|
+
|
77
|
+
raise "Unable to glean a class name from string '#{object}'"
|
78
|
+
end
|
79
|
+
|
80
|
+
# get at the underlying class from the singleton class
|
81
|
+
#
|
82
|
+
# note: even with the regex hit from klass_name(), `Object.const_get`
|
83
|
+
# is more performant than iterating through `ObjectSpace`
|
84
|
+
def klassify_singleton(object)
|
85
|
+
Object.const_get(klass_name(object))
|
86
|
+
end
|
87
|
+
|
88
|
+
# determine the namespace (class name including all module names in scope)
|
89
|
+
# and source code location (file path and line number) for the given
|
90
|
+
# object and method name
|
91
|
+
#
|
92
|
+
# traced class methods:
|
93
|
+
# * object is a singleton class, `#<Class::MyClass>`
|
94
|
+
# * get at the underlying non-singleton class
|
95
|
+
#
|
96
|
+
# traced instance methods and Rails controller methods:
|
97
|
+
# * object is a class, `MyClass`
|
98
|
+
#
|
99
|
+
# anonymous class based methods (`c = Class.new { def method; end; }`:
|
100
|
+
# * `#name` returns `nil`, so use '(Anonymous)' instead
|
101
|
+
#
|
102
|
+
def namespace_and_location(object, method_name)
|
103
|
+
klass = object.singleton_class? ? klassify_singleton(object) : object
|
104
|
+
name = klass.name || '(Anonymous)'
|
105
|
+
is_class_method = false
|
106
|
+
|
107
|
+
return controller_info(klass, name, is_class_method) if controller_without_method?(klass, method_name)
|
108
|
+
|
109
|
+
method = if (klass.instance_methods + klass.private_instance_methods).include?(method_name)
|
110
|
+
klass.instance_method(method_name)
|
111
|
+
else
|
112
|
+
is_class_method = true
|
113
|
+
klass.method(method_name)
|
33
114
|
end
|
115
|
+
[name, method.source_location, is_class_method]
|
116
|
+
end
|
117
|
+
|
118
|
+
# Rails controllers can be a special case because by default, controllers in Rails
|
119
|
+
# automatically render views with names that correspond to valid routes. This means
|
120
|
+
# that a controller method may not have a corresponding method in the controller class.
|
121
|
+
def controller_without_method?(klass, method_name)
|
122
|
+
defined?(Rails) &&
|
123
|
+
defined?(ApplicationController) &&
|
124
|
+
klass < ApplicationController &&
|
125
|
+
!klass.method_defined?(method_name)
|
126
|
+
end
|
127
|
+
|
128
|
+
def controller_info(klass, name, is_class_method)
|
129
|
+
path = Rails.root.join("app/controllers/#{klass.name.underscore}.rb")
|
130
|
+
|
131
|
+
File.exist?(path) ? [name, [path.to_s, 1], is_class_method] : []
|
34
132
|
end
|
35
133
|
end
|
36
134
|
end
|