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
data/lib/new_relic/agent.rb
CHANGED
@@ -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
|
require 'forwardable'
|
6
6
|
|
@@ -29,7 +29,7 @@ module NewRelic
|
|
29
29
|
require 'new_relic/metric_spec'
|
30
30
|
require 'new_relic/metric_data'
|
31
31
|
require 'new_relic/noticed_error'
|
32
|
-
require 'new_relic/agent/
|
32
|
+
require 'new_relic/agent/noticeable_error'
|
33
33
|
require 'new_relic/supportability_helper'
|
34
34
|
|
35
35
|
require 'new_relic/agent/encoding_normalizer'
|
@@ -44,6 +44,7 @@ module NewRelic
|
|
44
44
|
require 'new_relic/agent/sql_sampler'
|
45
45
|
require 'new_relic/agent/commands/thread_profiler_session'
|
46
46
|
require 'new_relic/agent/error_collector'
|
47
|
+
require 'new_relic/agent/error_filter'
|
47
48
|
require 'new_relic/agent/sampler'
|
48
49
|
require 'new_relic/agent/database'
|
49
50
|
require 'new_relic/agent/database_adapter'
|
@@ -57,7 +58,10 @@ module NewRelic
|
|
57
58
|
require 'new_relic/agent/deprecator'
|
58
59
|
require 'new_relic/agent/logging'
|
59
60
|
require 'new_relic/agent/distributed_tracing'
|
61
|
+
require 'new_relic/agent/attribute_pre_filtering'
|
60
62
|
require 'new_relic/agent/attribute_processing'
|
63
|
+
require 'new_relic/agent/linking_metadata'
|
64
|
+
require 'new_relic/agent/local_log_decorator'
|
61
65
|
|
62
66
|
require 'new_relic/agent/instrumentation/controller_instrumentation'
|
63
67
|
|
@@ -99,30 +103,33 @@ module NewRelic
|
|
99
103
|
# An error while serializing data for the collector
|
100
104
|
class SerializationError < StandardError; end
|
101
105
|
|
102
|
-
class BackgroundLoadingError < StandardError; end
|
103
|
-
|
104
106
|
# placeholder name used when we cannot determine a transaction's name
|
105
107
|
UNKNOWN_METRIC = '(unknown)'.freeze
|
106
108
|
|
109
|
+
attr_reader :error_group_callback
|
110
|
+
|
107
111
|
@agent = nil
|
112
|
+
@error_group_callback = nil
|
108
113
|
@logger = nil
|
109
114
|
@tracer_lock = Mutex.new
|
110
115
|
@tracer_queue = []
|
116
|
+
@metrics_already_recorded = Set.new
|
111
117
|
|
112
118
|
# The singleton Agent instance. Used internally.
|
113
|
-
def agent
|
119
|
+
def agent # :nodoc:
|
114
120
|
return @agent if @agent
|
121
|
+
|
115
122
|
NewRelic::Agent.logger.warn("Agent unavailable as it hasn't been started.")
|
116
123
|
NewRelic::Agent.logger.warn(caller.join("\n"))
|
117
124
|
nil
|
118
125
|
end
|
119
126
|
|
120
|
-
def agent=(new_instance)
|
127
|
+
def agent=(new_instance) # :nodoc:
|
121
128
|
@agent = new_instance
|
122
129
|
add_deferred_method_tracers_now
|
123
130
|
end
|
124
131
|
|
125
|
-
alias instance agent
|
132
|
+
alias instance agent # :nodoc:
|
126
133
|
|
127
134
|
# Primary interface to logging is fronted by this accessor
|
128
135
|
# Access via ::NewRelic::Agent.logger
|
@@ -138,20 +145,22 @@ module NewRelic
|
|
138
145
|
# is initialized; these methods enable us to defer these calls
|
139
146
|
# until we have started up and can process them.
|
140
147
|
#
|
141
|
-
def add_or_defer_method_tracer(receiver, method_name,
|
148
|
+
def add_or_defer_method_tracer(receiver, method_name, metric_name, options)
|
142
149
|
@tracer_lock.synchronize do
|
150
|
+
options[:code_information] = NewRelic::Agent::MethodTracerHelpers.code_information(receiver, method_name)
|
151
|
+
|
143
152
|
if @agent
|
144
|
-
receiver.send(:
|
153
|
+
receiver.send(:_nr_add_method_tracer_now, method_name, metric_name, options)
|
145
154
|
else
|
146
|
-
@tracer_queue << [receiver, method_name,
|
155
|
+
@tracer_queue << [receiver, method_name, metric_name, options]
|
147
156
|
end
|
148
157
|
end
|
149
158
|
end
|
150
159
|
|
151
160
|
def add_deferred_method_tracers_now
|
152
161
|
@tracer_lock.synchronize do
|
153
|
-
@tracer_queue.each do |receiver, method_name,
|
154
|
-
receiver.send(:
|
162
|
+
@tracer_queue.each do |receiver, method_name, metric_name, options|
|
163
|
+
receiver.send(:_nr_add_method_tracer_now, method_name, metric_name, options)
|
155
164
|
end
|
156
165
|
|
157
166
|
@tracer_queue = []
|
@@ -186,25 +195,38 @@ module NewRelic
|
|
186
195
|
# This method is safe to use from any thread.
|
187
196
|
#
|
188
197
|
# @api public
|
189
|
-
def record_metric(metric_name, value) #THREAD_LOCAL_ACCESS
|
198
|
+
def record_metric(metric_name, value) # THREAD_LOCAL_ACCESS
|
190
199
|
record_api_supportability_metric(:record_metric)
|
191
200
|
|
192
201
|
return unless agent
|
193
202
|
|
194
203
|
if value.is_a?(Hash)
|
195
204
|
stats = NewRelic::Agent::Stats.new
|
196
|
-
|
197
|
-
stats.call_count = value[:count] if value[:count]
|
198
|
-
stats.total_call_time = value[:total] if value[:total]
|
199
|
-
stats.total_exclusive_time = value[:total] if value[:total]
|
200
|
-
stats.min_call_time = value[:min] if value[:min]
|
201
|
-
stats.max_call_time = value[:max] if value[:max]
|
202
|
-
stats.sum_of_squares = value[:sum_of_squares] if value[:sum_of_squares]
|
203
|
-
value = stats
|
205
|
+
value = stats.hash_merge(value)
|
204
206
|
end
|
207
|
+
|
205
208
|
agent.stats_engine.tl_record_unscoped_metrics(metric_name, value)
|
206
209
|
end
|
207
210
|
|
211
|
+
def record_metric_once(metric_name, value = 0.0)
|
212
|
+
return unless @metrics_already_recorded.add?(metric_name)
|
213
|
+
|
214
|
+
record_metric(metric_name, value)
|
215
|
+
end
|
216
|
+
|
217
|
+
def record_instrumentation_invocation(library)
|
218
|
+
record_metric_once("Supportability/#{library}/Invoked")
|
219
|
+
end
|
220
|
+
|
221
|
+
# see ActiveSupport::Inflector.demodulize
|
222
|
+
def base_name(klass_name)
|
223
|
+
return klass_name unless ridx = klass_name.rindex('::')
|
224
|
+
|
225
|
+
klass_name[(ridx + 2), klass_name.length]
|
226
|
+
end
|
227
|
+
|
228
|
+
SUPPORTABILITY_INCREMENT_METRIC = 'Supportability/API/increment_metric'.freeze
|
229
|
+
|
208
230
|
# Increment a simple counter metric.
|
209
231
|
#
|
210
232
|
# +metric_name+ should follow a slash separated path convention. Application
|
@@ -213,17 +235,16 @@ module NewRelic
|
|
213
235
|
# This method is safe to use from any thread.
|
214
236
|
#
|
215
237
|
# @api public
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
def increment_metric(metric_name, amount=1) #THREAD_LOCAL_ACCESS
|
238
|
+
#
|
239
|
+
def increment_metric(metric_name, amount = 1) # THREAD_LOCAL_ACCESS
|
220
240
|
return unless agent
|
241
|
+
|
221
242
|
if amount == 1
|
222
243
|
metrics = [metric_name, SUPPORTABILITY_INCREMENT_METRIC]
|
223
|
-
agent.stats_engine.tl_record_unscoped_metrics(metrics) {|stats| stats.increment_count}
|
244
|
+
agent.stats_engine.tl_record_unscoped_metrics(metrics) { |stats| stats.increment_count }
|
224
245
|
else
|
225
|
-
agent.stats_engine.tl_record_unscoped_metrics(metric_name) {|stats| stats.increment_count(amount)}
|
226
|
-
agent.stats_engine.tl_record_unscoped_metrics(SUPPORTABILITY_INCREMENT_METRIC) {|stats| stats.increment_count}
|
246
|
+
agent.stats_engine.tl_record_unscoped_metrics(metric_name) { |stats| stats.increment_count(amount) }
|
247
|
+
agent.stats_engine.tl_record_unscoped_metrics(SUPPORTABILITY_INCREMENT_METRIC) { |stats| stats.increment_count }
|
227
248
|
end
|
228
249
|
end
|
229
250
|
|
@@ -231,8 +252,8 @@ module NewRelic
|
|
231
252
|
|
232
253
|
# @!group Recording custom errors
|
233
254
|
|
234
|
-
# Set a filter to be applied to errors that the Ruby
|
235
|
-
# track. The block should
|
255
|
+
# Set a filter to be applied to errors that the Ruby agent will
|
256
|
+
# track. The block should evaluate to the exception to track
|
236
257
|
# (which could be different from the original exception) or nil to
|
237
258
|
# ignore this exception.
|
238
259
|
#
|
@@ -280,17 +301,52 @@ module NewRelic
|
|
280
301
|
#
|
281
302
|
# @api public
|
282
303
|
#
|
283
|
-
def notice_error(exception, options={})
|
304
|
+
def notice_error(exception, options = {})
|
284
305
|
record_api_supportability_metric(:notice_error)
|
285
306
|
|
286
|
-
|
287
|
-
|
288
|
-
|
289
|
-
|
307
|
+
Transaction.notice_error(exception, options)
|
308
|
+
nil # don't return a noticed error data structure. it can only hurt.
|
309
|
+
end
|
310
|
+
|
311
|
+
# Set a callback proc for determining an error's error group name
|
312
|
+
#
|
313
|
+
# @param callback_proc [Proc] the callback proc
|
314
|
+
#
|
315
|
+
# Typically this method should be called only once to set a callback for
|
316
|
+
# use with all noticed errors. If it is called multiple times, each new
|
317
|
+
# callback given will replace the old one.
|
318
|
+
#
|
319
|
+
# The proc will be called with a single hash as its input argument and is
|
320
|
+
# expected to return a string representing the desired error group.
|
321
|
+
#
|
322
|
+
# see https://docs.newrelic.com/docs/errors-inbox/errors-inbox/#groups
|
323
|
+
#
|
324
|
+
# The hash passed to the customer defined callback proc has the following
|
325
|
+
# keys:
|
326
|
+
#
|
327
|
+
# :error => The Ruby error class instance, likely inheriting from
|
328
|
+
# StandardError. Call `#class`, `#message`, and `#backtrace` on
|
329
|
+
# the error object to retrieve the error's class, message, and
|
330
|
+
# backtrace.
|
331
|
+
# :customAttributes => Any customer defined custom attributes that have been
|
332
|
+
# associated with the current transaction.
|
333
|
+
# :'request.uri' => The current request URI if available
|
334
|
+
# :'http.statusCode' => The HTTP status code (200, 404, etc.) if available
|
335
|
+
# :'http.method' => The HTTP method (GET, PUT, etc.) if available
|
336
|
+
# :'error.expected' => Whether (true) or not (false) the error was expected
|
337
|
+
# :options => The options hash passed to `NewRelic::Agent.notice_error`
|
338
|
+
#
|
339
|
+
# @api public
|
340
|
+
#
|
341
|
+
def set_error_group_callback(callback_proc)
|
342
|
+
unless callback_proc.is_a?(Proc)
|
343
|
+
NewRelic::Agent.logger.error("#{self}.#{__method__}: expected an argument of type Proc, " \
|
344
|
+
"got #{callback_proc.class}")
|
345
|
+
return
|
290
346
|
end
|
291
347
|
|
292
|
-
|
293
|
-
|
348
|
+
record_api_supportability_metric(:set_error_group_callback)
|
349
|
+
@error_group_callback = callback_proc
|
294
350
|
end
|
295
351
|
|
296
352
|
# @!endgroup
|
@@ -335,13 +391,13 @@ module NewRelic
|
|
335
391
|
|
336
392
|
# @!group Manual agent configuration and startup/shutdown
|
337
393
|
|
338
|
-
# Call this to manually start the
|
394
|
+
# Call this to manually start the agent in situations where the agent does
|
339
395
|
# not auto-start.
|
340
396
|
#
|
341
|
-
# When the app environment loads, so does the
|
342
|
-
#
|
397
|
+
# When the app environment loads, so does the agent. However, the
|
398
|
+
# agent will only connect to the service if a web front-end is found. If
|
343
399
|
# you want to selectively monitor ruby processes that don't use
|
344
|
-
# web plugins, then call this method in your code and the
|
400
|
+
# web plugins, then call this method in your code and the agent
|
345
401
|
# will fire up and start reporting to the service.
|
346
402
|
#
|
347
403
|
# Options are passed in as overrides for values in the
|
@@ -352,9 +408,10 @@ module NewRelic
|
|
352
408
|
#
|
353
409
|
# @api public
|
354
410
|
#
|
355
|
-
def manual_start(options={})
|
356
|
-
raise
|
357
|
-
|
411
|
+
def manual_start(options = {})
|
412
|
+
raise 'Options must be a hash' unless Hash === options
|
413
|
+
|
414
|
+
NewRelic::Control.instance.init_plugin({:agent_enabled => true, :sync_startup => true}.merge(options))
|
358
415
|
record_api_supportability_metric(:manual_start)
|
359
416
|
end
|
360
417
|
|
@@ -370,7 +427,7 @@ module NewRelic
|
|
370
427
|
# jobs or other work. If you are doing this with a web dispatcher
|
371
428
|
# that forks worker processes then you will need to force the
|
372
429
|
# agent to reconnect, which it won't do by default. Passenger and
|
373
|
-
#
|
430
|
+
# Unicorn are already handled, nothing special needed for them.
|
374
431
|
#
|
375
432
|
# Options:
|
376
433
|
# * <tt>:force_reconnect => true</tt> to force the spawned process to
|
@@ -383,9 +440,10 @@ module NewRelic
|
|
383
440
|
#
|
384
441
|
# @api public
|
385
442
|
#
|
386
|
-
def after_fork(options={})
|
443
|
+
def after_fork(options = {})
|
387
444
|
record_api_supportability_metric(:after_fork)
|
388
|
-
|
445
|
+
# the following line needs else branch coverage
|
446
|
+
agent.after_fork(options) if agent # rubocop:disable Style/SafeNavigation
|
389
447
|
end
|
390
448
|
|
391
449
|
# Shutdown the agent. Call this before exiting. Sends any queued data
|
@@ -395,9 +453,9 @@ module NewRelic
|
|
395
453
|
#
|
396
454
|
# @api public
|
397
455
|
#
|
398
|
-
def shutdown(options={})
|
456
|
+
def shutdown(options = {})
|
399
457
|
record_api_supportability_metric(:shutdown)
|
400
|
-
agent
|
458
|
+
agent&.shutdown
|
401
459
|
end
|
402
460
|
|
403
461
|
# Clear out any data the agent has buffered but has not yet transmitted
|
@@ -405,7 +463,8 @@ module NewRelic
|
|
405
463
|
#
|
406
464
|
# @api public
|
407
465
|
def drop_buffered_data
|
408
|
-
|
466
|
+
# the following line needs else branch coverage
|
467
|
+
agent.drop_buffered_data if agent # rubocop:disable Style/SafeNavigation
|
409
468
|
record_api_supportability_metric(:drop_buffered_data)
|
410
469
|
end
|
411
470
|
|
@@ -420,7 +479,7 @@ module NewRelic
|
|
420
479
|
#
|
421
480
|
def add_instrumentation(file_pattern)
|
422
481
|
record_api_supportability_metric(:add_instrumentation)
|
423
|
-
NewRelic::Control.instance.add_instrumentation
|
482
|
+
NewRelic::Control.instance.add_instrumentation(file_pattern)
|
424
483
|
end
|
425
484
|
|
426
485
|
# Require agent testing helper methods
|
@@ -464,8 +523,7 @@ module NewRelic
|
|
464
523
|
#
|
465
524
|
def ignore_transaction
|
466
525
|
record_api_supportability_metric(:ignore_transaction)
|
467
|
-
|
468
|
-
txn.ignore! if txn
|
526
|
+
NewRelic::Agent::Transaction.tl_current&.ignore!
|
469
527
|
end
|
470
528
|
|
471
529
|
# This method disables the recording of Apdex metrics in the current
|
@@ -475,8 +533,7 @@ module NewRelic
|
|
475
533
|
#
|
476
534
|
def ignore_apdex
|
477
535
|
record_api_supportability_metric(:ignore_apdex)
|
478
|
-
|
479
|
-
txn.ignore_apdex! if txn
|
536
|
+
NewRelic::Agent::Transaction.tl_current&.ignore_apdex!
|
480
537
|
end
|
481
538
|
|
482
539
|
# This method disables browser monitoring javascript injection in the
|
@@ -486,8 +543,7 @@ module NewRelic
|
|
486
543
|
#
|
487
544
|
def ignore_enduser
|
488
545
|
record_api_supportability_metric(:ignore_enduser)
|
489
|
-
|
490
|
-
txn.ignore_enduser! if txn
|
546
|
+
NewRelic::Agent::Transaction.tl_current&.ignore_enduser!
|
491
547
|
end
|
492
548
|
|
493
549
|
# Yield to the block without collecting any metrics or traces in
|
@@ -510,18 +566,6 @@ module NewRelic
|
|
510
566
|
end
|
511
567
|
end
|
512
568
|
|
513
|
-
# This method disables the recording of transaction traces in the given
|
514
|
-
# block. See also #disable_all_tracing
|
515
|
-
#
|
516
|
-
# @api public
|
517
|
-
#
|
518
|
-
def disable_transaction_tracing
|
519
|
-
Deprecator.deprecate :disable_transaction_tracing,
|
520
|
-
'disable_all_tracing or ignore_transaction'
|
521
|
-
record_api_supportability_metric(:disable_transaction_tracing)
|
522
|
-
yield
|
523
|
-
end
|
524
|
-
|
525
569
|
# This method sets the state of sql recording in the transaction
|
526
570
|
# sampler feature. Within the given block, no sql will be recorded
|
527
571
|
#
|
@@ -553,12 +597,6 @@ module NewRelic
|
|
553
597
|
NewRelic::Agent::Tracer.state.is_execution_traced?
|
554
598
|
end
|
555
599
|
|
556
|
-
# helper method to check the thread local to determine whether sql
|
557
|
-
# is being recorded or not
|
558
|
-
def tl_is_sql_recorded?
|
559
|
-
NewRelic::Agent::Tracer.state.is_sql_recorded?
|
560
|
-
end
|
561
|
-
|
562
600
|
# @!group Adding custom attributes to traces
|
563
601
|
|
564
602
|
# Add attributes to the transaction trace, Insights Transaction event, and
|
@@ -577,24 +615,29 @@ module NewRelic
|
|
577
615
|
#
|
578
616
|
# @api public
|
579
617
|
#
|
580
|
-
def add_custom_attributes(params) #THREAD_LOCAL_ACCESS
|
618
|
+
def add_custom_attributes(params) # THREAD_LOCAL_ACCESS
|
581
619
|
record_api_supportability_metric(:add_custom_attributes)
|
582
620
|
|
583
|
-
if params.is_a?
|
584
|
-
|
585
|
-
txn.add_custom_attributes(params) if txn
|
621
|
+
if params.is_a?(Hash)
|
622
|
+
Transaction.tl_current&.add_custom_attributes(params)
|
586
623
|
|
587
624
|
segment = ::NewRelic::Agent::Tracer.current_segment
|
588
625
|
if segment
|
589
|
-
|
590
|
-
segment_custom_keys = segment.attributes.custom_attributes.keys.map(&:to_sym)
|
591
|
-
segment.add_custom_attributes(params.reject { |k, _v| segment_custom_keys.include?(k.to_sym) })
|
626
|
+
add_new_segment_attributes(params, segment)
|
592
627
|
end
|
593
628
|
else
|
594
629
|
::NewRelic::Agent.logger.warn("Bad argument passed to #add_custom_attributes. Expected Hash but got #{params.class}")
|
595
630
|
end
|
596
631
|
end
|
597
632
|
|
633
|
+
def add_new_segment_attributes(params, segment)
|
634
|
+
# Make sure not to override existing segment-level custom attributes
|
635
|
+
segment_custom_keys = segment.attributes.custom_attributes.keys.map(&:to_sym)
|
636
|
+
segment.add_custom_attributes(params.reject do |k, _v|
|
637
|
+
segment_custom_keys.include?(k.to_sym) if k.respond_to?(:to_sym) # param keys can be integers
|
638
|
+
end)
|
639
|
+
end
|
640
|
+
|
598
641
|
# Add custom attributes to the span event for the current span. Attributes will be visible on spans in the
|
599
642
|
# New Relic Distributed Tracing UI and on span events in New Relic Insights.
|
600
643
|
#
|
@@ -608,18 +651,77 @@ module NewRelic
|
|
608
651
|
#
|
609
652
|
# @see https://docs.newrelic.com/docs/using-new-relic/welcome-new-relic/get-started/glossary#span
|
610
653
|
# @api public
|
611
|
-
def add_custom_span_attributes
|
612
|
-
record_api_supportability_metric
|
654
|
+
def add_custom_span_attributes(params)
|
655
|
+
record_api_supportability_metric(:add_custom_span_attributes)
|
613
656
|
|
614
|
-
if params.is_a?
|
657
|
+
if params.is_a?(Hash)
|
615
658
|
if segment = NewRelic::Agent::Tracer.current_segment
|
616
|
-
segment.add_custom_attributes
|
659
|
+
segment.add_custom_attributes(params)
|
617
660
|
end
|
618
661
|
else
|
619
|
-
::NewRelic::Agent.logger.warn
|
662
|
+
::NewRelic::Agent.logger.warn("Bad argument passed to #add_custom_span_attributes. Expected Hash but got #{params.class}")
|
663
|
+
end
|
664
|
+
end
|
665
|
+
|
666
|
+
# Add global custom attributes to log events for the current agent instance. As these attributes are global to the
|
667
|
+
# agent instance, they will be attached to all log events generated by the agent, and this methods usage isn't
|
668
|
+
# suitable for setting dynamic values.
|
669
|
+
#
|
670
|
+
# @param [Hash] params A Hash of attributes to attach to log
|
671
|
+
# events. The agent accepts up to 240 custom
|
672
|
+
# log event attributes.
|
673
|
+
#
|
674
|
+
# Keys will be coerced into Strings and must
|
675
|
+
# be less than 256 characters. Keys longer
|
676
|
+
# than 255 characters will be truncated.
|
677
|
+
#
|
678
|
+
# Values may be Strings, Symbols, numeric
|
679
|
+
# values or Booleans and must be less than
|
680
|
+
# 4095 characters. If the value is a String
|
681
|
+
# or a Symbol, values longer than 4094
|
682
|
+
# characters will be truncated. If the value
|
683
|
+
# exceeds 4094 characters and is of a
|
684
|
+
# different class, the attribute pair will
|
685
|
+
# be dropped.
|
686
|
+
#
|
687
|
+
# This API can be called multiple times.
|
688
|
+
# If the same key is passed more than once,
|
689
|
+
# the value associated with the last call
|
690
|
+
# will be preserved.
|
691
|
+
#
|
692
|
+
# Attribute pairs with empty or nil contents
|
693
|
+
# will be dropped.
|
694
|
+
# @api public
|
695
|
+
def add_custom_log_attributes(params)
|
696
|
+
record_api_supportability_metric(:add_custom_log_attributes)
|
697
|
+
|
698
|
+
if params.is_a?(Hash)
|
699
|
+
NewRelic::Agent.agent.log_event_aggregator.add_custom_attributes(params)
|
700
|
+
else
|
701
|
+
NewRelic::Agent.logger.warn("Bad argument passed to #add_custom_log_attributes. Expected Hash but got #{params.class}.")
|
620
702
|
end
|
621
703
|
end
|
622
704
|
|
705
|
+
# Set the user id for the current transaction. When present, this value will be included in the agent attributes for transaction and error events as 'enduser.id'.
|
706
|
+
#
|
707
|
+
# @param [String] user_id The user id to add to the current transaction attributes
|
708
|
+
#
|
709
|
+
# @api public
|
710
|
+
def set_user_id(user_id)
|
711
|
+
record_api_supportability_metric(:set_user_id)
|
712
|
+
|
713
|
+
if user_id.nil? || user_id.empty?
|
714
|
+
::NewRelic::Agent.logger.warn('NewRelic::Agent.set_user_id called with a nil or empty user id.')
|
715
|
+
return
|
716
|
+
end
|
717
|
+
|
718
|
+
default_destinations = NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER |
|
719
|
+
NewRelic::Agent::AttributeFilter::DST_TRANSACTION_EVENTS |
|
720
|
+
NewRelic::Agent::AttributeFilter::DST_ERROR_COLLECTOR
|
721
|
+
|
722
|
+
NewRelic::Agent::Transaction.add_agent_attribute(:'enduser.id', user_id, default_destinations)
|
723
|
+
end
|
724
|
+
|
623
725
|
# @!endgroup
|
624
726
|
|
625
727
|
# @!group Transaction naming
|
@@ -649,7 +751,7 @@ module NewRelic
|
|
649
751
|
#
|
650
752
|
# @api public
|
651
753
|
#
|
652
|
-
def set_transaction_name(name, options={})
|
754
|
+
def set_transaction_name(name, options = {})
|
653
755
|
record_api_supportability_metric(:set_transaction_name)
|
654
756
|
Transaction.set_overriding_transaction_name(name, options[:category])
|
655
757
|
end
|
@@ -659,7 +761,7 @@ module NewRelic
|
|
659
761
|
#
|
660
762
|
# @api public
|
661
763
|
#
|
662
|
-
def get_transaction_name #THREAD_LOCAL_ACCESS
|
764
|
+
def get_transaction_name # THREAD_LOCAL_ACCESS
|
663
765
|
record_api_supportability_metric(:get_transaction_name)
|
664
766
|
|
665
767
|
txn = Transaction.tl_current
|
@@ -673,7 +775,7 @@ module NewRelic
|
|
673
775
|
|
674
776
|
# Yield to a block that is run with a database metric name context. This means
|
675
777
|
# the Database instrumentation will use this for the metric name if it does not
|
676
|
-
# otherwise know about a model. This is
|
778
|
+
# otherwise know about a model. This is reentrant.
|
677
779
|
#
|
678
780
|
# @param [String,Class,#to_s] model the DB model class
|
679
781
|
#
|
@@ -691,15 +793,15 @@ module NewRelic
|
|
691
793
|
# Subscribe to events of +event_type+, calling the given +handler+
|
692
794
|
# when one is sent.
|
693
795
|
def subscribe(event_type, &handler)
|
694
|
-
agent.events.subscribe(
|
796
|
+
agent.events.subscribe(event_type, &handler)
|
695
797
|
end
|
696
798
|
|
697
799
|
# Fire an event of the specified +event_type+, passing it an the given +args+
|
698
800
|
# to any registered handlers.
|
699
801
|
def notify(event_type, *args)
|
700
|
-
agent.events.notify(
|
802
|
+
agent.events.notify(event_type, *args)
|
701
803
|
rescue
|
702
|
-
NewRelic::Agent.logger.debug
|
804
|
+
NewRelic::Agent.logger.debug('Ignoring exception during %p event notification' % [event_type])
|
703
805
|
end
|
704
806
|
|
705
807
|
# @!group Trace and Entity metadata
|
@@ -731,24 +833,12 @@ module NewRelic
|
|
731
833
|
# @api public
|
732
834
|
def linking_metadata
|
733
835
|
metadata = Hash.new
|
734
|
-
metadata
|
735
|
-
metadata
|
736
|
-
metadata[HOSTNAME_KEY] = Hostname.get
|
737
|
-
|
738
|
-
if entity_guid = config[:entity_guid]
|
739
|
-
metadata[ENTITY_GUID_KEY] = entity_guid
|
740
|
-
end
|
741
|
-
|
742
|
-
if trace_id = Tracer.current_trace_id
|
743
|
-
metadata[TRACE_ID_KEY] = trace_id
|
744
|
-
end
|
745
|
-
if span_id = Tracer.current_span_id
|
746
|
-
metadata[SPAN_ID_KEY] = span_id
|
747
|
-
end
|
836
|
+
LinkingMetadata.append_service_linking_metadata(metadata)
|
837
|
+
LinkingMetadata.append_trace_linking_metadata(metadata)
|
748
838
|
metadata
|
749
839
|
end
|
750
840
|
|
751
|
-
|
841
|
+
# @!endgroup
|
752
842
|
|
753
843
|
# @!group Manual browser monitoring configuration
|
754
844
|
|
@@ -764,13 +854,16 @@ module NewRelic
|
|
764
854
|
# In previous agents there was a corresponding footer required, but all the
|
765
855
|
# work is now done by this single method.
|
766
856
|
#
|
857
|
+
# @param [String] nonce The nonce to use in the javascript tag for browser instrumentation
|
858
|
+
#
|
767
859
|
# @api public
|
768
860
|
#
|
769
|
-
def browser_timing_header
|
861
|
+
def browser_timing_header(nonce = nil)
|
770
862
|
record_api_supportability_metric(:browser_timing_header)
|
771
863
|
|
772
|
-
return
|
773
|
-
|
864
|
+
return EMPTY_STR unless agent
|
865
|
+
|
866
|
+
agent.javascript_instrumentor.browser_timing_header(nonce)
|
774
867
|
end
|
775
868
|
|
776
869
|
# @!endgroup
|
@@ -0,0 +1,25 @@
|
|
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 Base64
|
7
|
+
extend self
|
8
|
+
|
9
|
+
def encode64(bin)
|
10
|
+
[bin].pack('m')
|
11
|
+
end
|
12
|
+
|
13
|
+
def decode64(str)
|
14
|
+
str.unpack1('m')
|
15
|
+
end
|
16
|
+
|
17
|
+
def strict_encode64(bin)
|
18
|
+
[bin].pack('m0')
|
19
|
+
end
|
20
|
+
|
21
|
+
def strict_decode64(str)
|
22
|
+
str.unpack1('m0')
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|