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
@@ -0,0 +1,104 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require 'new_relic/agent/parameter_filtering'
|
6
|
+
|
7
|
+
module NewRelic::Agent::Instrumentation
|
8
|
+
module Grape
|
9
|
+
module Instrumentation
|
10
|
+
extend self
|
11
|
+
|
12
|
+
INSTRUMENTATION_NAME = NewRelic::Agent.base_name(name)
|
13
|
+
|
14
|
+
# Since 1.2.0, the class `Grape::API` no longer refers to an API instance, rather, what used to be `Grape::API` is `Grape::API::Instance`
|
15
|
+
# https://github.com/ruby-grape/grape/blob/c20a73ac1e3f3ba1082005ed61bf69452373ba87/UPGRADING.md#upgrading-to--120
|
16
|
+
def instrumented_class
|
17
|
+
defined?(::Grape::API::Instance) ? ::Grape::API::Instance : ::Grape::API
|
18
|
+
end
|
19
|
+
|
20
|
+
def capture_transaction(env, context)
|
21
|
+
begin
|
22
|
+
endpoint = env[API_ENDPOINT]
|
23
|
+
version = env[API_VERSION]
|
24
|
+
|
25
|
+
api_class = (context.class.respond_to?(:base) && context.class.base) || context.class
|
26
|
+
handle_transaction(endpoint, api_class.name, version)
|
27
|
+
rescue => e
|
28
|
+
::NewRelic::Agent.logger.warn('Error in Grape instrumentation', e)
|
29
|
+
end
|
30
|
+
end
|
31
|
+
|
32
|
+
def prepare!
|
33
|
+
if defined?(::Grape::VERSION) && Gem::Version.new(::Grape::VERSION) >= Gem::Version.new('0.16.0')
|
34
|
+
send(:remove_method, :name_for_transaction_deprecated)
|
35
|
+
else
|
36
|
+
send(:remove_method, :name_for_transaction)
|
37
|
+
send(:alias_method, :name_for_transaction, :name_for_transaction_deprecated)
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
API_ENDPOINT = 'api.endpoint'.freeze
|
42
|
+
API_VERSION = 'api.version'.freeze
|
43
|
+
FORMAT_REGEX = /\(\/?\.[\:\w]*\)/.freeze # either :format (< 0.12.0) or .ext (>= 0.12.0)
|
44
|
+
VERSION_REGEX = /:version(\/|$)/.freeze
|
45
|
+
MIN_VERSION = Gem::Version.new('0.2.0')
|
46
|
+
PIPE_STRING = '|'.freeze
|
47
|
+
|
48
|
+
def handle_transaction(endpoint, class_name, version)
|
49
|
+
return unless endpoint && route = endpoint.route
|
50
|
+
|
51
|
+
NewRelic::Agent.record_instrumentation_invocation(INSTRUMENTATION_NAME)
|
52
|
+
|
53
|
+
name_transaction(route, class_name, version)
|
54
|
+
capture_params(endpoint)
|
55
|
+
end
|
56
|
+
|
57
|
+
def name_transaction(route, class_name, version)
|
58
|
+
txn_name = name_for_transaction(route, class_name, version)
|
59
|
+
segment_name = "Middleware/Grape/#{class_name}/call"
|
60
|
+
NewRelic::Agent::Transaction.set_default_transaction_name(txn_name, :grape)
|
61
|
+
txn = NewRelic::Agent::Transaction.tl_current
|
62
|
+
txn.segments.last.name = segment_name
|
63
|
+
end
|
64
|
+
|
65
|
+
def name_for_transaction(route, class_name, version)
|
66
|
+
action_name = route.path.sub(FORMAT_REGEX, NewRelic::EMPTY_STR)
|
67
|
+
method_name = route.request_method
|
68
|
+
version ||= route.version
|
69
|
+
|
70
|
+
# defaulting does not set rack.env['api.version'] and route.version may return Array
|
71
|
+
#
|
72
|
+
version = version.join(PIPE_STRING) if Array === version
|
73
|
+
|
74
|
+
if version
|
75
|
+
action_name = action_name.sub(VERSION_REGEX, NewRelic::EMPTY_STR)
|
76
|
+
"#{class_name}-#{version}#{action_name} (#{method_name})"
|
77
|
+
else
|
78
|
+
"#{class_name}#{action_name} (#{method_name})"
|
79
|
+
end
|
80
|
+
end
|
81
|
+
|
82
|
+
def name_for_transaction_deprecated(route, class_name, version)
|
83
|
+
action_name = route.route_path.sub(FORMAT_REGEX, NewRelic::EMPTY_STR)
|
84
|
+
method_name = route.route_method
|
85
|
+
version ||= route.route_version
|
86
|
+
if version
|
87
|
+
action_name = action_name.sub(VERSION_REGEX, NewRelic::EMPTY_STR)
|
88
|
+
"#{class_name}-#{version}#{action_name} (#{method_name})"
|
89
|
+
else
|
90
|
+
"#{class_name}#{action_name} (#{method_name})"
|
91
|
+
end
|
92
|
+
end
|
93
|
+
|
94
|
+
def capture_params(endpoint)
|
95
|
+
txn = ::NewRelic::Agent::Transaction.tl_current
|
96
|
+
env = endpoint.request.env
|
97
|
+
params = ::NewRelic::Agent::ParameterFiltering::apply_filters(env, endpoint.params)
|
98
|
+
params.delete('route_info')
|
99
|
+
txn.filtered_params = params
|
100
|
+
txn.merge_request_parameters(params)
|
101
|
+
end
|
102
|
+
end
|
103
|
+
end
|
104
|
+
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module Grape
|
7
|
+
module Prepend
|
8
|
+
def call(env)
|
9
|
+
begin
|
10
|
+
super(env)
|
11
|
+
ensure
|
12
|
+
Grape::Instrumentation.capture_transaction(env, self)
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
@@ -1,145 +1,44 @@
|
|
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
|
-
|
6
|
-
|
7
|
-
|
8
|
-
module Agent
|
9
|
-
module Instrumentation
|
10
|
-
module GrapeInstrumentation
|
11
|
-
extend self
|
12
|
-
|
13
|
-
API_ENDPOINT = 'api.endpoint'.freeze
|
14
|
-
API_VERSION = 'api.version'.freeze
|
15
|
-
FORMAT_REGEX = /\(\/?\.[\:\w]*\)/.freeze # either :format (< 0.12.0) or .ext (>= 0.12.0)
|
16
|
-
VERSION_REGEX = /:version(\/|$)/.freeze
|
17
|
-
MIN_VERSION = Gem::Version.new("0.2.0")
|
18
|
-
PIPE_STRING = '|'.freeze
|
19
|
-
|
20
|
-
def handle_transaction(endpoint, class_name, version)
|
21
|
-
return unless endpoint && route = endpoint.route
|
22
|
-
name_transaction(route, class_name, version)
|
23
|
-
capture_params(endpoint)
|
24
|
-
end
|
25
|
-
|
26
|
-
def name_transaction(route, class_name, version)
|
27
|
-
txn_name = name_for_transaction(route, class_name, version)
|
28
|
-
segment_name = "Middleware/Grape/#{class_name}/call"
|
29
|
-
Transaction.set_default_transaction_name(txn_name, :grape)
|
30
|
-
txn = NewRelic::Agent::Transaction.tl_current
|
31
|
-
txn.segments.last.name = segment_name
|
32
|
-
end
|
33
|
-
|
34
|
-
def name_for_transaction(route, class_name, version)
|
35
|
-
action_name = route.path.sub(FORMAT_REGEX, NewRelic::EMPTY_STR)
|
36
|
-
method_name = route.request_method
|
37
|
-
version ||= route.version
|
38
|
-
|
39
|
-
# defaulting does not set rack.env['api.version'] and route.version may return Array
|
40
|
-
#
|
41
|
-
version = version.join(PIPE_STRING) if Array === version
|
42
|
-
|
43
|
-
if version
|
44
|
-
action_name = action_name.sub(VERSION_REGEX, NewRelic::EMPTY_STR)
|
45
|
-
"#{class_name}-#{version}#{action_name} (#{method_name})"
|
46
|
-
else
|
47
|
-
"#{class_name}#{action_name} (#{method_name})"
|
48
|
-
end
|
49
|
-
end
|
50
|
-
|
51
|
-
def name_for_transaction_deprecated(route, class_name, version)
|
52
|
-
action_name = route.route_path.sub(FORMAT_REGEX, NewRelic::EMPTY_STR)
|
53
|
-
method_name = route.route_method
|
54
|
-
version ||= route.route_version
|
55
|
-
|
56
|
-
if version
|
57
|
-
action_name = action_name.sub(VERSION_REGEX, NewRelic::EMPTY_STR)
|
58
|
-
"#{class_name}-#{version}#{action_name} (#{method_name})"
|
59
|
-
else
|
60
|
-
"#{class_name}#{action_name} (#{method_name})"
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
def capture_params(endpoint)
|
65
|
-
txn = Transaction.tl_current
|
66
|
-
env = endpoint.request.env
|
67
|
-
params = ParameterFiltering::apply_filters(env, endpoint.params)
|
68
|
-
params.delete("route_info")
|
69
|
-
txn.filtered_params = params
|
70
|
-
txn.merge_request_parameters(params)
|
71
|
-
end
|
72
|
-
end
|
73
|
-
end
|
74
|
-
end
|
75
|
-
end
|
5
|
+
require_relative 'grape/instrumentation'
|
6
|
+
require_relative 'grape/chain'
|
7
|
+
require_relative 'grape/prepend'
|
76
8
|
|
77
9
|
DependencyDetection.defer do
|
78
10
|
# Why not just :grape? newrelic-grape used that name already, and while we're
|
79
11
|
# not shipping yet, overloading the name interferes with the plugin.
|
80
|
-
|
81
|
-
|
82
|
-
depends_on do
|
83
|
-
::NewRelic::Agent.config[:disable_grape] == false
|
84
|
-
end
|
12
|
+
@name = :grape_instrumentation
|
13
|
+
configure_with :grape
|
85
14
|
|
86
15
|
depends_on do
|
87
|
-
defined?(
|
88
|
-
Gem::Version.new(
|
16
|
+
defined?(Grape::VERSION) &&
|
17
|
+
Gem::Version.new(Grape::VERSION) >= NewRelic::Agent::Instrumentation::Grape::Instrumentation::MIN_VERSION
|
89
18
|
end
|
90
19
|
|
91
20
|
depends_on do
|
92
21
|
begin
|
93
|
-
if defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?(
|
94
|
-
|
22
|
+
if defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?('newrelic-grape')
|
23
|
+
NewRelic::Agent.logger.info('Not installing New Relic supported Grape instrumentation because the third party newrelic-grape gem is present')
|
95
24
|
false
|
96
25
|
else
|
97
26
|
true
|
98
27
|
end
|
99
28
|
rescue => e
|
100
|
-
|
29
|
+
NewRelic::Agent.logger.info('Could not determine if third party newrelic-grape gem is installed', e)
|
101
30
|
true
|
102
31
|
end
|
103
32
|
end
|
104
33
|
|
105
34
|
executes do
|
106
|
-
NewRelic::Agent.
|
107
|
-
instrument_call
|
108
|
-
end
|
35
|
+
NewRelic::Agent::Instrumentation::Grape::Instrumentation.prepare!
|
109
36
|
|
110
|
-
|
111
|
-
|
112
|
-
|
37
|
+
if use_prepend?
|
38
|
+
instrumented_class = NewRelic::Agent::Instrumentation::Grape::Instrumentation.instrumented_class
|
39
|
+
prepend_instrument instrumented_class, NewRelic::Agent::Instrumentation::Grape::Prepend
|
113
40
|
else
|
114
|
-
|
115
|
-
::NewRelic::Agent::Instrumentation::GrapeInstrumentation.send :alias_method, :name_for_transaction, :name_for_transaction_deprecated
|
116
|
-
end
|
117
|
-
|
118
|
-
# Since 1.2.0, the class `Grape::API` no longer refers to an API instance, rather, what used to be `Grape::API` is `Grape::API::Instance`
|
119
|
-
# https://github.com/ruby-grape/grape/blob/c20a73ac1e3f3ba1082005ed61bf69452373ba87/UPGRADING.md#upgrading-to--120
|
120
|
-
grape_api_class = defined?(Grape::API::Instance) ? ::Grape::API::Instance : ::Grape::API
|
121
|
-
|
122
|
-
grape_api_class.class_eval do
|
123
|
-
def call_with_new_relic(env)
|
124
|
-
begin
|
125
|
-
response = call_without_new_relic(env)
|
126
|
-
ensure
|
127
|
-
begin
|
128
|
-
endpoint = env[::NewRelic::Agent::Instrumentation::GrapeInstrumentation::API_ENDPOINT]
|
129
|
-
version = env[::NewRelic::Agent::Instrumentation::GrapeInstrumentation::API_VERSION]
|
130
|
-
|
131
|
-
api_class = (self.class.respond_to?(:base) && self.class.base) || self.class
|
132
|
-
::NewRelic::Agent::Instrumentation::GrapeInstrumentation.handle_transaction(endpoint, api_class.name, version)
|
133
|
-
rescue => e
|
134
|
-
::NewRelic::Agent.logger.warn("Error in Grape instrumentation", e)
|
135
|
-
end
|
136
|
-
end
|
137
|
-
|
138
|
-
response
|
139
|
-
end
|
140
|
-
|
141
|
-
alias_method :call_without_new_relic, :call
|
142
|
-
alias_method :call, :call_with_new_relic
|
41
|
+
chain_instrument NewRelic::Agent::Instrumentation::Grape::Chain
|
143
42
|
end
|
144
43
|
end
|
145
44
|
end
|
@@ -0,0 +1,97 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require_relative 'instrumentation'
|
6
|
+
|
7
|
+
module NewRelic::Agent::Instrumentation
|
8
|
+
module GRPC
|
9
|
+
module Client
|
10
|
+
module Chain
|
11
|
+
def self.instrument!
|
12
|
+
::GRPC::ClientStub.class_eval do
|
13
|
+
include NewRelic::Agent::Instrumentation::GRPC::Client
|
14
|
+
|
15
|
+
def bidi_streamer_with_new_relic_trace(method, requests, marshal, unmarshal,
|
16
|
+
deadline: nil,
|
17
|
+
return_op: false,
|
18
|
+
parent: nil,
|
19
|
+
credentials: nil,
|
20
|
+
metadata: {},
|
21
|
+
&blk)
|
22
|
+
|
23
|
+
issue_request_with_tracing(:bidi_streamer, method, requests, marshal, unmarshal,
|
24
|
+
deadline: deadline,
|
25
|
+
return_op: return_op,
|
26
|
+
parent: parent,
|
27
|
+
credentials: credentials,
|
28
|
+
metadata: metadata)
|
29
|
+
|
30
|
+
# TODO: gRPC - confirm that &blk is being invoked correctly
|
31
|
+
end
|
32
|
+
|
33
|
+
alias bidi_streamer_without_newrelic_trace bidi_streamer
|
34
|
+
alias bidi_streamer bidi_streamer_with_newrelic_trace
|
35
|
+
|
36
|
+
def client_streamer_with_newrelic_trace(method, requests, marshal, unmarshal,
|
37
|
+
deadline: nil,
|
38
|
+
return_op: false,
|
39
|
+
parent: nil,
|
40
|
+
credentials: nil,
|
41
|
+
metadata: {})
|
42
|
+
|
43
|
+
issue_request_with_tracing(:client_streamer, method, requests, marshal, unmarshal,
|
44
|
+
deadline: deadline,
|
45
|
+
return_op: return_op,
|
46
|
+
parent: parent,
|
47
|
+
credentials: credentials,
|
48
|
+
metadata: metadata)
|
49
|
+
end
|
50
|
+
|
51
|
+
alias client_streamer_without_newrelic_trace client_streamer
|
52
|
+
alias client_streamer client_streamer_with_newrelic_trace
|
53
|
+
|
54
|
+
def request_response_with_newrelic_trace(method, req, marshal, unmarshal,
|
55
|
+
deadline: nil,
|
56
|
+
return_op: false,
|
57
|
+
parent: nil,
|
58
|
+
credentials: nil,
|
59
|
+
metadata: {})
|
60
|
+
|
61
|
+
issue_request_with_tracing(:request_response, method, req, marshal, unmarshal,
|
62
|
+
deadline: deadline,
|
63
|
+
return_op: return_op,
|
64
|
+
parent: parent,
|
65
|
+
credentials: credentials,
|
66
|
+
metadata: metadata)
|
67
|
+
end
|
68
|
+
|
69
|
+
alias request_response_without_newrelic_trace request_response
|
70
|
+
alias request_response request_response_with_newrelic_trace
|
71
|
+
|
72
|
+
def server_streamer_with_newrelic_trace(method, req, marshal, unmarshal,
|
73
|
+
deadline: nil,
|
74
|
+
return_op: false,
|
75
|
+
parent: nil,
|
76
|
+
credentials: nil,
|
77
|
+
metadata: {},
|
78
|
+
&blk)
|
79
|
+
|
80
|
+
issue_request_with_tracing(:server_streamer, method, req, marshal, unmarshal,
|
81
|
+
deadline: deadline,
|
82
|
+
return_op: return_op,
|
83
|
+
parent: parent,
|
84
|
+
credentials: credentials,
|
85
|
+
metadata: metadata)
|
86
|
+
|
87
|
+
# TODO: gRPC - confirm that &blk is being invoked correctly
|
88
|
+
end
|
89
|
+
|
90
|
+
alias server_streamer_without_newrelic_trace server_streamer
|
91
|
+
alias server_streamer server_streamer_with_newrelic_trace
|
92
|
+
end
|
93
|
+
end
|
94
|
+
end
|
95
|
+
end
|
96
|
+
end
|
97
|
+
end
|
@@ -0,0 +1,94 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require_relative 'request_wrapper'
|
6
|
+
require_relative '../helper'
|
7
|
+
|
8
|
+
module NewRelic
|
9
|
+
module Agent
|
10
|
+
module Instrumentation
|
11
|
+
module GRPC
|
12
|
+
module Client
|
13
|
+
include NewRelic::Agent::Instrumentation::GRPC::Helper
|
14
|
+
|
15
|
+
INSTRUMENTATION_NAME = 'gRPC_Client'
|
16
|
+
|
17
|
+
def issue_request_with_tracing(grpc_type, method, requests, marshal, unmarshal,
|
18
|
+
deadline:, return_op:, parent:, credentials:, metadata:)
|
19
|
+
return yield unless trace_with_newrelic?
|
20
|
+
|
21
|
+
NewRelic::Agent.record_instrumentation_invocation(INSTRUMENTATION_NAME)
|
22
|
+
|
23
|
+
segment = request_segment(method)
|
24
|
+
request_wrapper = NewRelic::Agent::Instrumentation::GRPC::Client::RequestWrapper.new(@host)
|
25
|
+
# do not insert CAT headers for gRPC requests https://github.com/newrelic/newrelic-ruby-agent/issues/1730
|
26
|
+
segment.add_request_headers(request_wrapper) unless CrossAppTracing.cross_app_enabled?
|
27
|
+
metadata.merge!(request_wrapper.instance_variable_get(:@newrelic_metadata))
|
28
|
+
grpc_message = nil
|
29
|
+
grpc_status = 0
|
30
|
+
|
31
|
+
NewRelic::Agent.disable_all_tracing do
|
32
|
+
begin
|
33
|
+
yield
|
34
|
+
rescue => e
|
35
|
+
NewRelic::Agent.notice_error(e)
|
36
|
+
grpc_status, grpc_message = grpc_status_and_message_from_exception(e)
|
37
|
+
raise
|
38
|
+
end
|
39
|
+
end
|
40
|
+
ensure
|
41
|
+
add_attributes(segment, grpc_message: grpc_message, grpc_status: grpc_status, grpc_type: grpc_type)
|
42
|
+
::NewRelic::Agent::Transaction::Segment.finish(segment)
|
43
|
+
end
|
44
|
+
|
45
|
+
private
|
46
|
+
|
47
|
+
def add_attributes(segment, attributes_hash)
|
48
|
+
return unless segment
|
49
|
+
|
50
|
+
attributes_hash.each do |attr, value|
|
51
|
+
segment.add_agent_attribute(attr, value)
|
52
|
+
end
|
53
|
+
segment.record_agent_attributes = true
|
54
|
+
end
|
55
|
+
|
56
|
+
def grpc_status_and_message_from_exception(exception)
|
57
|
+
return unless exception.message =~ /^(\d+):(\w+)\./
|
58
|
+
|
59
|
+
[Regexp.last_match(1).to_i, Regexp.last_match(2)]
|
60
|
+
end
|
61
|
+
|
62
|
+
def request_segment(method)
|
63
|
+
cleaned = cleaned_method(method)
|
64
|
+
NewRelic::Agent::Tracer.start_external_request_segment(
|
65
|
+
library: 'gRPC',
|
66
|
+
uri: method_uri(cleaned),
|
67
|
+
procedure: cleaned
|
68
|
+
)
|
69
|
+
end
|
70
|
+
|
71
|
+
def method_uri(method)
|
72
|
+
return unless @host && method
|
73
|
+
|
74
|
+
"grpc://#{@host}/#{method}"
|
75
|
+
end
|
76
|
+
|
77
|
+
def interceptor?
|
78
|
+
self.class.name.eql?('GRPC::InterceptorRegistry')
|
79
|
+
end
|
80
|
+
|
81
|
+
def trace_with_newrelic?
|
82
|
+
return @trace_with_newrelic unless @trace_with_newrelic.nil? # check for nil, not false
|
83
|
+
|
84
|
+
@trace_with_newrelic = if interceptor?
|
85
|
+
false
|
86
|
+
else
|
87
|
+
!host_denylisted?(@host)
|
88
|
+
end
|
89
|
+
end
|
90
|
+
end
|
91
|
+
end
|
92
|
+
end
|
93
|
+
end
|
94
|
+
end
|
@@ -0,0 +1,111 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require_relative 'instrumentation'
|
6
|
+
|
7
|
+
module NewRelic
|
8
|
+
module Agent
|
9
|
+
module Instrumentation
|
10
|
+
module GRPC
|
11
|
+
module Client
|
12
|
+
module Prepend
|
13
|
+
include NewRelic::Agent::Instrumentation::GRPC::Client
|
14
|
+
|
15
|
+
def bidi_streamer(method, requests, marshal, unmarshal,
|
16
|
+
deadline: nil,
|
17
|
+
return_op: false,
|
18
|
+
parent: nil,
|
19
|
+
credentials: nil,
|
20
|
+
metadata: {},
|
21
|
+
&blk)
|
22
|
+
|
23
|
+
issue_request_with_tracing(:bidi_streamer, method, requests, marshal, unmarshal,
|
24
|
+
deadline: deadline,
|
25
|
+
return_op: return_op,
|
26
|
+
parent: parent,
|
27
|
+
credentials: credentials,
|
28
|
+
metadata: metadata) do
|
29
|
+
super(method, requests, marshal, unmarshal,
|
30
|
+
deadline: deadline,
|
31
|
+
return_op: return_op,
|
32
|
+
parent: parent,
|
33
|
+
credentials: credentials,
|
34
|
+
metadata: metadata,
|
35
|
+
&blk)
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
def client_streamer(method, requests, marshal, unmarshal,
|
40
|
+
deadline: nil,
|
41
|
+
return_op: false,
|
42
|
+
parent: nil,
|
43
|
+
credentials: nil,
|
44
|
+
metadata: {})
|
45
|
+
|
46
|
+
issue_request_with_tracing(:client_streamer, method, requests, marshal, unmarshal,
|
47
|
+
deadline: deadline,
|
48
|
+
return_op: return_op,
|
49
|
+
parent: parent,
|
50
|
+
credentials: credentials,
|
51
|
+
metadata: metadata) do
|
52
|
+
super(method, requests, marshal, unmarshal,
|
53
|
+
deadline: deadline,
|
54
|
+
return_op: return_op,
|
55
|
+
parent: parent,
|
56
|
+
credentials: credentials,
|
57
|
+
metadata: metadata)
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
def request_response(method, req, marshal, unmarshal,
|
62
|
+
deadline: nil,
|
63
|
+
return_op: false,
|
64
|
+
parent: nil,
|
65
|
+
credentials: nil,
|
66
|
+
metadata: {})
|
67
|
+
|
68
|
+
issue_request_with_tracing(:request_response, method, req, marshal, unmarshal,
|
69
|
+
deadline: deadline,
|
70
|
+
return_op: return_op,
|
71
|
+
parent: parent,
|
72
|
+
credentials: credentials,
|
73
|
+
metadata: metadata) do
|
74
|
+
super(method, req, marshal, unmarshal,
|
75
|
+
deadline: deadline,
|
76
|
+
return_op: return_op,
|
77
|
+
parent: parent,
|
78
|
+
credentials: credentials,
|
79
|
+
metadata: metadata)
|
80
|
+
end
|
81
|
+
end
|
82
|
+
|
83
|
+
def server_streamer(method, req, marshal, unmarshal,
|
84
|
+
deadline: nil,
|
85
|
+
return_op: false,
|
86
|
+
parent: nil,
|
87
|
+
credentials: nil,
|
88
|
+
metadata: {},
|
89
|
+
&blk)
|
90
|
+
|
91
|
+
issue_request_with_tracing(:server_streamer, method, req, marshal, unmarshal,
|
92
|
+
deadline: deadline,
|
93
|
+
return_op: return_op,
|
94
|
+
parent: parent,
|
95
|
+
credentials: credentials,
|
96
|
+
metadata: metadata) do
|
97
|
+
super(method, req, marshal, unmarshal,
|
98
|
+
deadline: deadline,
|
99
|
+
return_op: return_op,
|
100
|
+
parent: parent,
|
101
|
+
credentials: credentials,
|
102
|
+
metadata: metadata,
|
103
|
+
&blk)
|
104
|
+
end
|
105
|
+
end
|
106
|
+
end
|
107
|
+
end
|
108
|
+
end
|
109
|
+
end
|
110
|
+
end
|
111
|
+
end
|
@@ -0,0 +1,30 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
module Instrumentation
|
8
|
+
module GRPC
|
9
|
+
module Client
|
10
|
+
class RequestWrapper
|
11
|
+
attr_reader :newrelic_metadata
|
12
|
+
|
13
|
+
def initialize(host)
|
14
|
+
@host = host
|
15
|
+
@newrelic_metadata = {}
|
16
|
+
end
|
17
|
+
|
18
|
+
def host_from_header
|
19
|
+
@host
|
20
|
+
end
|
21
|
+
|
22
|
+
def []=(key, value)
|
23
|
+
@newrelic_metadata[key] = value
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
@@ -0,0 +1,32 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
module Instrumentation
|
8
|
+
module GRPC
|
9
|
+
module Helper
|
10
|
+
NR_8T_HOST_PATTERN = %r{tracing\.(?:staging-)?edge\.nr-data}.freeze
|
11
|
+
|
12
|
+
def cleaned_method(method)
|
13
|
+
method = method.to_s unless method.is_a?(String)
|
14
|
+
return method unless method.start_with?('/')
|
15
|
+
|
16
|
+
method[1..-1]
|
17
|
+
end
|
18
|
+
|
19
|
+
def host_denylisted?(host)
|
20
|
+
return false unless host
|
21
|
+
|
22
|
+
ignore_patterns.any? { |regex| host.match?(regex) }
|
23
|
+
end
|
24
|
+
|
25
|
+
def ignore_patterns
|
26
|
+
([NR_8T_HOST_PATTERN] + NewRelic::Agent.config[:'instrumentation.grpc.host_denylist']).freeze
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|