newrelic_rpm 6.15.0 → 9.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.build_ignore +26 -0
- data/CHANGELOG.md +4176 -2789
- data/CONTRIBUTING.md +32 -13
- data/Gemfile +1 -2
- data/LICENSE +0 -6
- data/README.md +29 -22
- data/Rakefile +33 -35
- data/THIRD_PARTY_NOTICES.md +14 -199
- data/Thorfile +5 -0
- data/bin/newrelic +4 -9
- data/bin/newrelic_rpm +15 -0
- data/bin/nrdebug +85 -62
- data/init.rb +6 -8
- data/install.rb +2 -2
- data/lib/new_relic/agent/adaptive_sampler.rb +13 -9
- data/lib/new_relic/agent/agent.rb +99 -941
- data/lib/new_relic/agent/agent_helpers/connect.rb +222 -0
- data/lib/new_relic/agent/agent_helpers/harvest.rb +153 -0
- data/lib/new_relic/agent/agent_helpers/shutdown.rb +72 -0
- data/lib/new_relic/agent/agent_helpers/special_startup.rb +74 -0
- data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +175 -0
- data/lib/new_relic/agent/agent_helpers/startup.rb +202 -0
- data/lib/new_relic/agent/agent_helpers/transmit.rb +76 -0
- data/lib/new_relic/agent/agent_logger.rb +27 -23
- data/lib/new_relic/agent/attribute_filter.rb +67 -50
- data/lib/new_relic/agent/attribute_pre_filtering.rb +109 -0
- data/lib/new_relic/agent/attribute_processing.rb +9 -9
- data/lib/new_relic/agent/attributes.rb +5 -4
- data/lib/new_relic/agent/audit_logger.rb +13 -8
- data/lib/new_relic/agent/autostart.rb +21 -20
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +4 -4
- data/lib/new_relic/agent/commands/agent_command_router.rb +15 -13
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +16 -14
- data/lib/new_relic/agent/configuration/default_source.rb +1608 -1182
- data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
- data/lib/new_relic/agent/configuration/environment_source.rb +13 -11
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +40 -17
- data/lib/new_relic/agent/configuration/high_security_source.rb +11 -12
- data/lib/new_relic/agent/configuration/manager.rb +103 -75
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
- data/lib/new_relic/agent/configuration/security_policy_source.rb +92 -95
- data/lib/new_relic/agent/configuration/server_source.rb +43 -41
- data/lib/new_relic/agent/configuration/yaml_source.rb +47 -10
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +18 -18
- data/lib/new_relic/agent/connect/response_handler.rb +5 -8
- data/lib/new_relic/agent/custom_event_aggregator.rb +42 -16
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +5 -6
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +16 -15
- data/lib/new_relic/agent/database/obfuscator.rb +4 -4
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
- data/lib/new_relic/agent/database.rb +45 -53
- data/lib/new_relic/agent/database_adapter.rb +3 -1
- data/lib/new_relic/agent/datastores/metric_helper.rb +21 -22
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +17 -21
- data/lib/new_relic/agent/datastores/mongo.rb +6 -11
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +9 -15
- data/lib/new_relic/agent/datastores.rb +13 -15
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +10 -10
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +45 -40
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -22
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +23 -23
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +52 -54
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +10 -11
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +82 -83
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +42 -41
- data/lib/new_relic/agent/distributed_tracing.rb +33 -101
- data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
- data/lib/new_relic/agent/error_collector.rb +105 -58
- data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +9 -7
- data/lib/new_relic/agent/event_aggregator.rb +22 -21
- data/lib/new_relic/agent/event_buffer.rb +7 -8
- data/lib/new_relic/agent/event_listener.rb +1 -2
- data/lib/new_relic/agent/event_loop.rb +27 -25
- data/lib/new_relic/agent/external.rb +11 -44
- data/lib/new_relic/agent/guid_generator.rb +13 -11
- data/lib/new_relic/agent/harvester.rb +5 -8
- data/lib/new_relic/agent/heap.rb +8 -9
- data/lib/new_relic/agent/hostname.rb +21 -14
- data/lib/new_relic/agent/http_clients/abstract.rb +22 -31
- data/lib/new_relic/agent/http_clients/async_http_wrappers.rb +80 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +14 -17
- data/lib/new_relic/agent/http_clients/ethon_wrappers.rb +109 -0
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +15 -17
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +7 -6
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +8 -9
- data/lib/new_relic/agent/http_clients/httpx_wrappers.rb +91 -0
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +13 -8
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +12 -13
- data/lib/new_relic/agent/http_clients/uri_util.rb +3 -5
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +9 -22
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +42 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +41 -33
- data/lib/new_relic/agent/instrumentation/action_dispatch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb +64 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb +33 -0
- data/lib/new_relic/agent/instrumentation/action_mailer.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb +85 -0
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +20 -21
- data/lib/new_relic/agent/instrumentation/active_job.rb +33 -13
- data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
- data/lib/new_relic/agent/instrumentation/active_record.rb +41 -38
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +87 -75
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +54 -66
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +6 -6
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +30 -22
- data/lib/new_relic/agent/instrumentation/active_storage.rb +7 -3
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +8 -33
- data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/instrumentation.rb +13 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/prepend.rb +37 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +24 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +26 -0
- data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/async_http/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/async_http/instrumentation.rb +37 -0
- data/lib/new_relic/agent/instrumentation/async_http/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/async_http.rb +28 -0
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +159 -0
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/bunny.rb +11 -154
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +20 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +74 -63
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +225 -0
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
- data/lib/new_relic/agent/instrumentation/curb.rb +14 -246
- data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
- data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +38 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +51 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +30 -53
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +70 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/ethon/chain.rb +39 -0
- data/lib/new_relic/agent/instrumentation/ethon/instrumentation.rb +105 -0
- data/lib/new_relic/agent/instrumentation/ethon/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/ethon.rb +39 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +11 -7
- data/lib/new_relic/agent/instrumentation/excon.rb +27 -29
- data/lib/new_relic/agent/instrumentation/fiber/chain.rb +27 -0
- data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +20 -0
- data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +25 -0
- data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +104 -0
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/grape.rb +16 -117
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +94 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +138 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +41 -0
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +10 -32
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +34 -0
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
- data/lib/new_relic/agent/instrumentation/httpx/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/httpx/instrumentation.rb +51 -0
- data/lib/new_relic/agent/instrumentation/httpx/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpx.rb +27 -0
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +5 -6
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +69 -0
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +59 -128
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +99 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +103 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +58 -74
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +15 -14
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +6 -8
- data/lib/new_relic/agent/instrumentation/mongo.rb +6 -137
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +24 -23
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/{net_prepend.rb → net_http/instrumentation.rb} +18 -14
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
- data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +56 -10
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +32 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +20 -58
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +6 -6
- data/lib/new_relic/agent/instrumentation/queue_time.rb +9 -10
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +81 -0
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +32 -142
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +25 -56
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +9 -8
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +18 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +8 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +146 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +17 -158
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +98 -0
- data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
- data/lib/new_relic/agent/instrumentation/redis.rb +19 -108
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +38 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +32 -43
- data/lib/new_relic/agent/instrumentation/roda/chain.rb +43 -0
- data/lib/new_relic/agent/instrumentation/roda/ignorer.rb +45 -0
- data/lib/new_relic/agent/instrumentation/roda/instrumentation.rb +68 -0
- data/lib/new_relic/agent/instrumentation/roda/prepend.rb +24 -0
- data/lib/new_relic/agent/instrumentation/roda/roda_transaction_namer.rb +29 -0
- data/lib/new_relic/agent/instrumentation/roda.rb +36 -0
- data/lib/new_relic/agent/instrumentation/sequel.rb +16 -19
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +12 -12
- data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +24 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +60 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +27 -65
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -36
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +130 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +4 -6
- data/lib/new_relic/agent/instrumentation/sinatra.rb +34 -163
- data/lib/new_relic/agent/instrumentation/stripe.rb +28 -0
- data/lib/new_relic/agent/instrumentation/stripe_subscriber.rb +77 -0
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +24 -0
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
- data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +46 -0
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +84 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +12 -91
- data/lib/new_relic/agent/instrumentation/view_component/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/view_component/instrumentation.rb +39 -0
- data/lib/new_relic/agent/instrumentation/view_component/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/view_component.rb +26 -0
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +2 -2
- data/lib/new_relic/agent/javascript_instrumentor.rb +58 -48
- data/lib/new_relic/agent/linking_metadata.rb +44 -0
- data/lib/new_relic/agent/local_log_decorator.rb +37 -0
- data/lib/new_relic/agent/log_event_aggregator.rb +282 -0
- data/lib/new_relic/agent/log_event_attributes.rb +115 -0
- data/lib/new_relic/agent/log_once.rb +1 -1
- data/lib/new_relic/agent/log_priority.rb +20 -0
- data/lib/new_relic/agent/logging.rb +95 -52
- data/lib/new_relic/agent/memory_logger.rb +2 -2
- data/lib/new_relic/agent/messaging.rb +72 -86
- data/lib/new_relic/agent/method_tracer.rb +159 -154
- data/lib/new_relic/agent/method_tracer_helpers.rb +109 -11
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +26 -19
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +5 -4
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -2
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +17 -9
- data/lib/new_relic/agent/monitors.rb +6 -7
- data/lib/new_relic/agent/new_relic_service/encoders.rb +9 -9
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +6 -6
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +4 -4
- data/lib/new_relic/agent/new_relic_service.rb +282 -213
- data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -5
- data/lib/new_relic/agent/null_logger.rb +7 -3
- data/lib/new_relic/agent/obfuscator.rb +7 -11
- data/lib/new_relic/agent/parameter_filtering.rb +29 -15
- data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
- data/lib/new_relic/agent/pipe_channel_manager.rb +34 -23
- data/lib/new_relic/agent/pipe_service.rb +13 -8
- data/lib/new_relic/agent/prepend_supportability.rb +2 -2
- data/lib/new_relic/agent/priority_sampled_buffer.rb +9 -12
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +12 -14
- data/lib/new_relic/agent/rules_engine.rb +6 -5
- data/lib/new_relic/agent/sampler.rb +5 -5
- data/lib/new_relic/agent/sampler_collection.rb +4 -5
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +8 -7
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +20 -17
- data/lib/new_relic/agent/samplers/memory_sampler.rb +32 -21
- data/lib/new_relic/agent/samplers/object_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
- data/lib/new_relic/agent/span_event_aggregator.rb +15 -15
- data/lib/new_relic/agent/span_event_primitive.rb +77 -59
- data/lib/new_relic/agent/sql_sampler.rb +20 -21
- data/lib/new_relic/agent/stats.rb +79 -42
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +9 -11
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +12 -13
- data/lib/new_relic/agent/stats_engine.rb +8 -8
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +8 -9
- data/lib/new_relic/agent/system_info.rb +113 -67
- data/lib/new_relic/agent/threading/agent_thread.rb +18 -14
- data/lib/new_relic/agent/threading/backtrace_node.rb +12 -13
- data/lib/new_relic/agent/threading/backtrace_service.rb +17 -21
- data/lib/new_relic/agent/threading/thread_profile.rb +24 -24
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +2 -2
- data/lib/new_relic/agent/tracer.rb +101 -96
- data/lib/new_relic/agent/transaction/abstract_segment.rb +176 -52
- data/lib/new_relic/agent/transaction/datastore_segment.rb +22 -18
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +65 -57
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +46 -48
- data/lib/new_relic/agent/transaction/external_request_segment.rb +52 -39
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +31 -37
- data/lib/new_relic/agent/transaction/request_attributes.rb +78 -42
- data/lib/new_relic/agent/transaction/segment.rb +20 -10
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +2 -2
- data/lib/new_relic/agent/transaction/trace.rb +16 -12
- data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
- data/lib/new_relic/agent/transaction/trace_context.rb +35 -35
- data/lib/new_relic/agent/transaction/trace_node.rb +30 -28
- data/lib/new_relic/agent/transaction/tracing.rb +32 -13
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +6 -6
- data/lib/new_relic/agent/transaction.rb +229 -178
- data/lib/new_relic/agent/transaction_error_primitive.rb +43 -25
- data/lib/new_relic/agent/transaction_event_aggregator.rb +16 -16
- data/lib/new_relic/agent/transaction_event_primitive.rb +51 -33
- data/lib/new_relic/agent/transaction_event_recorder.rb +16 -15
- data/lib/new_relic/agent/transaction_metrics.rb +10 -9
- data/lib/new_relic/agent/transaction_sampler.rb +7 -8
- data/lib/new_relic/agent/transaction_time_aggregator.rb +32 -27
- data/lib/new_relic/agent/utilization/aws.rb +34 -4
- data/lib/new_relic/agent/utilization/azure.rb +6 -6
- data/lib/new_relic/agent/utilization/gcp.rb +11 -13
- data/lib/new_relic/agent/utilization/pcf.rb +6 -5
- data/lib/new_relic/agent/utilization/vendor.rb +45 -32
- data/lib/new_relic/agent/utilization_data.rb +7 -5
- data/lib/new_relic/agent/vm/c_ruby_vm.rb +99 -0
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +3 -3
- data/lib/new_relic/agent/vm/snapshot.rb +5 -5
- data/lib/new_relic/agent/vm.rb +3 -3
- data/lib/new_relic/agent/worker_loop.rb +10 -12
- data/lib/new_relic/agent.rb +204 -111
- data/lib/new_relic/base64.rb +25 -0
- data/lib/new_relic/cli/command.rb +26 -25
- data/lib/new_relic/cli/commands/deployments.rb +100 -49
- data/lib/new_relic/cli/commands/install.rb +31 -34
- data/lib/new_relic/coerce.rb +15 -13
- data/lib/new_relic/collection_helper.rb +50 -48
- data/lib/new_relic/constants.rb +13 -12
- data/lib/new_relic/control/class_methods.rb +6 -12
- data/lib/new_relic/control/frameworks/external.rb +2 -2
- data/lib/new_relic/control/frameworks/rails.rb +60 -30
- data/lib/new_relic/control/frameworks/rails3.rb +3 -4
- data/lib/new_relic/control/frameworks/rails4.rb +1 -1
- data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
- data/lib/new_relic/control/frameworks/roda.rb +20 -0
- data/lib/new_relic/control/frameworks/ruby.rb +3 -3
- data/lib/new_relic/control/frameworks/sinatra.rb +7 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/instance_methods.rb +27 -45
- data/lib/new_relic/control/instrumentation.rb +25 -11
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +3 -4
- data/lib/new_relic/control.rb +1 -2
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +141 -32
- data/lib/new_relic/environment_report.rb +41 -33
- data/lib/new_relic/helper.rb +49 -7
- data/lib/new_relic/language_support.rb +39 -6
- data/lib/new_relic/latest_changes.rb +10 -9
- data/lib/new_relic/local_environment.rb +42 -37
- data/lib/new_relic/metric_data.rb +31 -26
- data/lib/new_relic/metric_spec.rb +8 -6
- data/lib/new_relic/noticed_error.rb +43 -46
- data/lib/new_relic/rack/agent_hooks.rb +2 -2
- data/lib/new_relic/rack/agent_middleware.rb +3 -17
- data/lib/new_relic/rack/browser_monitoring.rb +135 -121
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +4 -62
- data/lib/new_relic/recipes/capistrano_legacy.rb +24 -27
- data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +14 -12
- data/lib/new_relic/traced_thread.rb +38 -0
- data/lib/new_relic/version.rb +6 -17
- data/lib/newrelic_rpm.rb +20 -33
- data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +18 -21
- data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +9 -15
- data/lib/tasks/all.rb +3 -3
- data/lib/tasks/bump_version.rake +21 -0
- data/lib/tasks/config.rake +25 -119
- data/lib/tasks/coverage_report.rake +28 -0
- data/lib/tasks/helpers/config.html.erb +114 -0
- data/lib/tasks/helpers/format.rb +127 -0
- data/lib/tasks/helpers/matches.rb +12 -0
- data/lib/tasks/helpers/newrelicyml.rb +144 -0
- data/lib/tasks/helpers/prompt.rb +24 -0
- data/lib/tasks/helpers/version_bump.rb +62 -0
- data/lib/tasks/install.rake +8 -4
- data/lib/tasks/instrumentation_generator/README.md +63 -0
- data/lib/tasks/instrumentation_generator/TODO.md +33 -0
- data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
- data/lib/tasks/instrumentation_generator/templates/chain.tt +21 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +7 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
- data/lib/tasks/newrelic.rb +2 -1
- data/lib/tasks/newrelicyml.rake +13 -0
- data/lib/tasks/tests.rake +83 -17
- data/newrelic.yml +790 -4
- data/newrelic_rpm.gemspec +52 -43
- data/recipes/newrelic.rb +2 -2
- data/test/agent_helper.rb +252 -198
- metadata +275 -95
- data/.gitignore +0 -37
- data/.project +0 -23
- data/.yardopts +0 -26
- data/Guardfile +0 -25
- data/ROADMAP.md +0 -24
- data/bin/mongrel_rpm +0 -33
- data/bin/newrelic_cmd +0 -5
- data/cert/cacert.pem +0 -1177
- data/config/database.yml +0 -5
- data/config.dot +0 -278
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -75
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -204
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
- data/lib/new_relic/agent/instrumentation/http.rb +0 -49
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
- data/lib/new_relic/agent/instrumentation/net.rb +0 -70
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
- data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
- data/lib/new_relic/agent/range_extensions.rb +0 -47
- data/lib/new_relic/agent/supported_versions.rb +0 -275
- data/lib/new_relic/agent/vm/mri_vm.rb +0 -81
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/tasks/config.html.erb +0 -32
- data/lib/tasks/multiverse.rake +0 -2
- data/lib/tasks/multiverse.rb +0 -104
- /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,17 +1,16 @@
|
|
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
|
-
require 'new_relic/agent/range_extensions'
|
6
5
|
require 'new_relic/agent/guid_generator'
|
7
6
|
|
8
7
|
module NewRelic
|
9
8
|
module Agent
|
10
9
|
class Transaction
|
11
10
|
class AbstractSegment
|
12
|
-
# This class is the base class for all segments. It is
|
11
|
+
# This class is the base class for all segments. It is responsible for
|
13
12
|
# timing, naming, and defining lifecycle callbacks. One of the more
|
14
|
-
# complex
|
13
|
+
# complex responsibilities of this class is computing exclusive duration.
|
15
14
|
# One of the reasons for this complexity is that exclusive time will be
|
16
15
|
# computed using time ranges or by recording an aggregate value for
|
17
16
|
# a segments children time. The reason for this is that computing
|
@@ -20,13 +19,17 @@ module NewRelic
|
|
20
19
|
# after its parent. We will use the optimized exclusive duration
|
21
20
|
# calculation in all other cases.
|
22
21
|
#
|
23
|
-
attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid
|
22
|
+
attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid, :starting_segment_key
|
24
23
|
attr_accessor :name, :parent, :children_time, :transaction, :transaction_name
|
25
24
|
attr_writer :record_metrics, :record_scoped_metric, :record_on_finish
|
26
25
|
attr_reader :noticed_error
|
27
26
|
|
28
|
-
|
27
|
+
CALLBACK = :@callback
|
28
|
+
SEGMENT = 'segment'
|
29
|
+
|
30
|
+
def initialize(name = nil, start_time = nil)
|
29
31
|
@name = name
|
32
|
+
@starting_segment_key = NewRelic::Agent::Tracer.current_segment_key
|
30
33
|
@transaction_name = nil
|
31
34
|
@transaction = nil
|
32
35
|
@guid = NewRelic::Agent::GuidGenerator.generate_guid
|
@@ -36,8 +39,8 @@ module NewRelic
|
|
36
39
|
@end_time = nil
|
37
40
|
@duration = 0.0
|
38
41
|
@exclusive_duration = 0.0
|
42
|
+
@children_timings = []
|
39
43
|
@children_time = 0.0
|
40
|
-
@children_time_ranges = nil
|
41
44
|
@active_children = 0
|
42
45
|
@range_recorded = false
|
43
46
|
@concurrent_children = false
|
@@ -45,22 +48,30 @@ module NewRelic
|
|
45
48
|
@record_scoped_metric = true
|
46
49
|
@record_on_finish = false
|
47
50
|
@noticed_error = nil
|
51
|
+
@code_filepath = nil
|
52
|
+
@code_function = nil
|
53
|
+
@code_lineno = nil
|
54
|
+
@code_namespace = nil
|
55
|
+
invoke_callback
|
48
56
|
end
|
49
57
|
|
50
58
|
def start
|
51
|
-
@start_time ||=
|
59
|
+
@start_time ||= Process.clock_gettime(Process::CLOCK_REALTIME)
|
52
60
|
return unless transaction
|
53
|
-
|
61
|
+
|
62
|
+
parent&.child_start(self)
|
54
63
|
end
|
55
64
|
|
56
65
|
def finish
|
57
|
-
@end_time =
|
58
|
-
@duration = end_time
|
66
|
+
@end_time = Process.clock_gettime(Process::CLOCK_REALTIME)
|
67
|
+
@duration = end_time - start_time
|
68
|
+
|
59
69
|
return unless transaction
|
70
|
+
|
60
71
|
run_complete_callbacks
|
61
72
|
finalize if record_on_finish?
|
62
73
|
rescue => e
|
63
|
-
NewRelic::Agent.logger.error
|
74
|
+
NewRelic::Agent.logger.error("Exception finishing segment: #{name}", e)
|
64
75
|
end
|
65
76
|
|
66
77
|
def finished?
|
@@ -94,21 +105,39 @@ module NewRelic
|
|
94
105
|
end
|
95
106
|
|
96
107
|
def time_range
|
97
|
-
@start_time.to_f
|
98
|
-
end
|
99
|
-
|
100
|
-
def children_time_ranges
|
101
|
-
@children_time_ranges ||= []
|
108
|
+
@start_time.to_f..@end_time.to_f
|
102
109
|
end
|
103
110
|
|
104
111
|
def children_time_ranges?
|
105
|
-
|
112
|
+
!@children_timings.empty?
|
106
113
|
end
|
107
114
|
|
108
115
|
def concurrent_children?
|
109
116
|
@concurrent_children
|
110
117
|
end
|
111
118
|
|
119
|
+
def code_information=(info = {})
|
120
|
+
return unless info[:filepath]
|
121
|
+
|
122
|
+
@code_filepath = info[:filepath]
|
123
|
+
@code_function = info[:function]
|
124
|
+
@code_lineno = info[:lineno]
|
125
|
+
@code_namespace = info[:namespace]
|
126
|
+
end
|
127
|
+
|
128
|
+
def all_code_information_present?
|
129
|
+
@code_filepath && @code_function && @code_lineno && @code_namespace
|
130
|
+
end
|
131
|
+
|
132
|
+
def code_attributes
|
133
|
+
return ::NewRelic::EMPTY_HASH unless all_code_information_present?
|
134
|
+
|
135
|
+
@code_attributes ||= {'code.filepath' => @code_filepath,
|
136
|
+
'code.function' => @code_function,
|
137
|
+
'code.lineno' => @code_lineno,
|
138
|
+
'code.namespace' => @code_namespace}
|
139
|
+
end
|
140
|
+
|
112
141
|
INSPECT_IGNORE = [:@transaction, :@transaction_state].freeze
|
113
142
|
|
114
143
|
def inspect
|
@@ -122,27 +151,30 @@ module NewRelic
|
|
122
151
|
def transaction_assigned
|
123
152
|
end
|
124
153
|
|
125
|
-
def set_noticed_error
|
154
|
+
def set_noticed_error(noticed_error)
|
126
155
|
if @noticed_error
|
127
|
-
NewRelic::Agent.logger.debug \
|
156
|
+
NewRelic::Agent.logger.debug( \
|
128
157
|
"Segment: #{name} overwriting previously noticed " \
|
129
158
|
"error: #{@noticed_error.inspect} with: #{noticed_error.inspect}"
|
159
|
+
)
|
130
160
|
end
|
131
161
|
@noticed_error = noticed_error
|
132
162
|
end
|
133
163
|
|
134
|
-
def notice_error
|
164
|
+
def notice_error(exception, options = {})
|
135
165
|
if Agent.config[:high_security]
|
136
|
-
NewRelic::Agent.logger.debug \
|
166
|
+
NewRelic::Agent.logger.debug( \
|
137
167
|
"Segment: #{name} ignores notice_error for " \
|
138
168
|
"error: #{exception.inspect} because :high_security is enabled"
|
169
|
+
)
|
139
170
|
else
|
140
|
-
NewRelic::Agent.instance.error_collector.notice_segment_error
|
171
|
+
NewRelic::Agent.instance.error_collector.notice_segment_error(self, exception, options)
|
141
172
|
end
|
142
173
|
end
|
143
174
|
|
144
175
|
def noticed_error_attributes
|
145
176
|
return unless @noticed_error
|
177
|
+
|
146
178
|
@noticed_error.attributes_from_notice_error
|
147
179
|
end
|
148
180
|
|
@@ -154,20 +186,20 @@ module NewRelic
|
|
154
186
|
@range_recorded
|
155
187
|
end
|
156
188
|
|
157
|
-
def child_start
|
189
|
+
def child_start(segment)
|
158
190
|
@active_children += 1
|
159
|
-
@concurrent_children
|
191
|
+
@concurrent_children ||= @active_children > 1
|
160
192
|
|
161
193
|
transaction.async = true if @concurrent_children
|
162
194
|
end
|
163
195
|
|
164
|
-
def child_complete
|
196
|
+
def child_complete(segment)
|
165
197
|
@active_children -= 1
|
166
|
-
record_child_time
|
198
|
+
record_child_time(segment)
|
167
199
|
|
168
200
|
if finished?
|
169
201
|
transaction.async = true
|
170
|
-
parent
|
202
|
+
parent&.descendant_complete(self, segment)
|
171
203
|
end
|
172
204
|
end
|
173
205
|
|
@@ -177,71 +209,67 @@ module NewRelic
|
|
177
209
|
# an ancestor whose end time is greater than or equal to the descendant's
|
178
210
|
# we can stop the propagation. We pass along the direct child so we can
|
179
211
|
# make any corrections needed for exclusive time calculation.
|
212
|
+
def descendant_complete(child, descendant)
|
213
|
+
add_child_timing(descendant)
|
180
214
|
|
181
|
-
def descendant_complete child, descendant
|
182
|
-
RangeExtensions.merge_or_append descendant.time_range,
|
183
|
-
children_time_ranges
|
184
215
|
# If this child's time was previously added to this segment's
|
185
216
|
# aggregate children time, we need to re-record it using a time range
|
186
217
|
# for proper exclusive time calculation
|
187
218
|
unless child.range_recorded?
|
188
219
|
self.children_time -= child.duration
|
189
|
-
record_child_time_as_range
|
220
|
+
record_child_time_as_range(child)
|
190
221
|
end
|
191
222
|
|
192
223
|
if parent && finished? && descendant.end_time >= end_time
|
193
|
-
parent.descendant_complete
|
224
|
+
parent.descendant_complete(self, descendant)
|
194
225
|
end
|
195
226
|
end
|
196
227
|
|
197
228
|
private
|
198
229
|
|
230
|
+
def add_child_timing(segment)
|
231
|
+
@children_timings << [segment.start_time, segment.end_time]
|
232
|
+
end
|
233
|
+
|
199
234
|
def force_finish
|
200
235
|
finish
|
201
|
-
NewRelic::Agent.logger.warn "Segment: #{name} was unfinished at " \
|
202
|
-
"the end of transaction. Timing information for this segment's" \
|
203
|
-
"parent #{parent
|
236
|
+
NewRelic::Agent.logger.send(transaction.async? ? :debug : :warn, "Segment: #{name} was unfinished at " \
|
237
|
+
"the end of transaction. Timing information for this segment's " \
|
238
|
+
"parent #{parent&.name} in #{transaction.best_name} may be inaccurate.")
|
204
239
|
end
|
205
240
|
|
206
241
|
def run_complete_callbacks
|
207
242
|
segment_complete
|
208
|
-
parent
|
209
|
-
transaction.segment_complete
|
243
|
+
parent&.child_complete(self)
|
244
|
+
transaction.segment_complete(self)
|
210
245
|
end
|
211
246
|
|
212
247
|
def record_metrics
|
213
|
-
raise NotImplementedError,
|
248
|
+
raise NotImplementedError, 'Subclasses must implement record_metrics'
|
214
249
|
end
|
215
250
|
|
216
251
|
# callback for subclasses to override
|
217
252
|
def segment_complete
|
218
253
|
end
|
219
254
|
|
220
|
-
def record_child_time
|
255
|
+
def record_child_time(child)
|
221
256
|
if concurrent_children? || finished? && end_time < child.end_time
|
222
|
-
record_child_time_as_range
|
257
|
+
record_child_time_as_range(child)
|
223
258
|
else
|
224
|
-
record_child_time_as_number
|
259
|
+
record_child_time_as_number(child)
|
225
260
|
end
|
226
261
|
end
|
227
262
|
|
228
|
-
def record_child_time_as_range
|
229
|
-
|
230
|
-
children_time_ranges
|
263
|
+
def record_child_time_as_range(child)
|
264
|
+
add_child_timing(child)
|
231
265
|
child.range_recorded = true
|
232
266
|
end
|
233
267
|
|
234
|
-
def record_child_time_as_number
|
268
|
+
def record_child_time_as_number(child)
|
235
269
|
self.children_time += child.duration
|
236
270
|
end
|
237
271
|
|
238
272
|
def record_exclusive_duration
|
239
|
-
overlapping_duration = if children_time_ranges?
|
240
|
-
RangeExtensions.compute_overlap time_range, children_time_ranges
|
241
|
-
else
|
242
|
-
0.0
|
243
|
-
end
|
244
|
-
|
245
273
|
@exclusive_duration = duration - children_time - overlapping_duration
|
246
274
|
transaction.total_time += @exclusive_duration
|
247
275
|
params[:exclusive_duration_millis] = @exclusive_duration * 1000 if transaction.async?
|
@@ -251,6 +279,51 @@ module NewRelic
|
|
251
279
|
transaction.metrics
|
252
280
|
end
|
253
281
|
|
282
|
+
def ranges_intersect?(r1, r2)
|
283
|
+
r1.begin > r2.begin ? r2.cover?(r1.begin) : r1.cover?(r2.begin)
|
284
|
+
end
|
285
|
+
|
286
|
+
def range_overlap(range)
|
287
|
+
return 0.0 unless ranges_intersect?(range, time_range)
|
288
|
+
|
289
|
+
[range.end, time_range.end].min - [range.begin, time_range.begin].max
|
290
|
+
end
|
291
|
+
|
292
|
+
# Child segments operating concurrently with this segment may have
|
293
|
+
# start and end times that overlap with this segment's own times. The
|
294
|
+
# amount of overlap needs to be removed from the `children_time` total
|
295
|
+
# when calculating an `@exclusive_duration` value to be added to the
|
296
|
+
# transaction's total time.
|
297
|
+
#
|
298
|
+
# If there aren't any child segments, return 0.0. Otherwise, take the
|
299
|
+
# `@children_timings` array of arrays (each array holds a child
|
300
|
+
# segment's start time and end time), sort it by the first elements
|
301
|
+
# (start times), and use the start and finish times to create Range
|
302
|
+
# objects. Combine all of the child segment ranges that overlap with
|
303
|
+
# one another into new bigger ranges. Then take those bigger ranges
|
304
|
+
# and calculate how much overlap there is between them and this
|
305
|
+
# segment's own time range. Keep a running sum of all of the overlap
|
306
|
+
# amounts and then return it.
|
307
|
+
def overlapping_duration
|
308
|
+
sum = 0.0
|
309
|
+
return sum unless children_time_ranges?
|
310
|
+
|
311
|
+
@children_timings.sort_by!(&:first)
|
312
|
+
range = Range.new(*@children_timings.first)
|
313
|
+
(1..(@children_timings.size - 1)).each do |i|
|
314
|
+
possible = Range.new(*@children_timings[i])
|
315
|
+
|
316
|
+
if ranges_intersect?(range, possible)
|
317
|
+
range = range.begin..possible.end
|
318
|
+
else
|
319
|
+
sum += range_overlap(range)
|
320
|
+
range = possible
|
321
|
+
end
|
322
|
+
end
|
323
|
+
|
324
|
+
sum += range_overlap(range)
|
325
|
+
end
|
326
|
+
|
254
327
|
def transaction_state
|
255
328
|
@transaction_state ||= if @transaction
|
256
329
|
transaction.state
|
@@ -258,6 +331,57 @@ module NewRelic
|
|
258
331
|
Tracer.state
|
259
332
|
end
|
260
333
|
end
|
334
|
+
|
335
|
+
# for segment callback usage info, see self.set_segment_callback
|
336
|
+
def invoke_callback
|
337
|
+
return unless self.class.instance_variable_defined?(CALLBACK)
|
338
|
+
|
339
|
+
NewRelic::Agent.logger.debug("Invoking callback for #{self.class.name}...")
|
340
|
+
self.class.instance_variable_get(CALLBACK).call
|
341
|
+
rescue Exception => e
|
342
|
+
NewRelic::Agent.logger.error("Error encountered while invoking callback for #{self.class.name}: " +
|
343
|
+
"#{e.class} - #{e.message}")
|
344
|
+
end
|
345
|
+
|
346
|
+
# Setting and invoking a segment callback
|
347
|
+
# =======================================
|
348
|
+
# Each individual segment class such as `ExternalRequestSegment` allows
|
349
|
+
# for exactly one instance of a `Proc` (meaning a proc or lambda) to be
|
350
|
+
# set as a callback. A callback can be set on a segment class by calling
|
351
|
+
# `.set_segment_callback` with a proc or lambda as the only argument.
|
352
|
+
# If set, the callback will be invoked with `#call` at segment class
|
353
|
+
# initialization time.
|
354
|
+
#
|
355
|
+
# Example usage:
|
356
|
+
# callback = -> { puts 'Hello, World! }
|
357
|
+
# ExternalRequestSegment.set_segment_callback(callback)
|
358
|
+
# ExternalRequestSegment.new(library, uri, procedure)
|
359
|
+
#
|
360
|
+
# A callback set on a segment class will only be called when that
|
361
|
+
# specific segment class is initialized. Other segment classes will not
|
362
|
+
# be impacted.
|
363
|
+
#
|
364
|
+
# Great caution should be taken in the defining of the callback block
|
365
|
+
# to not have the block perform anything too time consuming or resource
|
366
|
+
# intensive in order to keep the New Relic Ruby agent operating
|
367
|
+
# normally.
|
368
|
+
#
|
369
|
+
# Given that callbacks are user defined, they must be set entirely at
|
370
|
+
# the user's own risk. It is recommended that each callback use
|
371
|
+
# conditional logic that only performs work for certain qualified
|
372
|
+
# segments. It is recommended that each callback be thoroughly tested
|
373
|
+
# in non-production environments before being introduced to production
|
374
|
+
# environments.
|
375
|
+
def self.set_segment_callback(callback_proc)
|
376
|
+
unless callback_proc.is_a?(Proc)
|
377
|
+
NewRelic::Agent.logger.error("#{self}.#{__method__}: expected an argument of type Proc, " \
|
378
|
+
"got #{callback_proc.class}")
|
379
|
+
return
|
380
|
+
end
|
381
|
+
|
382
|
+
NewRelic::Agent.record_api_supportability_metric(:set_segment_callback)
|
383
|
+
instance_variable_set(CALLBACK, callback_proc)
|
384
|
+
end
|
261
385
|
end
|
262
386
|
end
|
263
387
|
end
|
@@ -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 'new_relic/agent/transaction/segment'
|
6
6
|
require 'new_relic/agent/datastores/metric_helper'
|
@@ -11,33 +11,31 @@ module NewRelic
|
|
11
11
|
module Agent
|
12
12
|
class Transaction
|
13
13
|
class DatastoreSegment < Segment
|
14
|
-
|
15
14
|
UNKNOWN = 'unknown'.freeze
|
16
15
|
|
17
16
|
attr_reader :product, :operation, :collection, :sql_statement, :nosql_statement, :host, :port_path_or_id
|
18
17
|
attr_accessor :database_name, :record_sql
|
19
18
|
|
20
|
-
|
21
|
-
def initialize product, operation, collection = nil, host = nil, port_path_or_id = nil, database_name = nil, start_time = nil
|
19
|
+
def initialize(product, operation, collection = nil, host = nil, port_path_or_id = nil, database_name = nil, start_time = nil)
|
22
20
|
@product = product
|
23
21
|
@operation = operation
|
24
22
|
@collection = collection
|
25
23
|
@sql_statement = nil
|
26
24
|
@nosql_statement = nil
|
27
25
|
@record_sql = true
|
28
|
-
set_instance_info
|
29
|
-
@database_name = database_name
|
30
|
-
super
|
26
|
+
set_instance_info(host, port_path_or_id)
|
27
|
+
@database_name = database_name&.to_s
|
28
|
+
super(Datastores::MetricHelper.scoped_metric_for(product, operation, collection),
|
31
29
|
nil,
|
32
|
-
start_time
|
30
|
+
start_time)
|
33
31
|
end
|
34
32
|
|
35
|
-
def set_instance_info
|
33
|
+
def set_instance_info(host = nil, port_path_or_id = nil)
|
36
34
|
port_path_or_id = port_path_or_id.to_s if port_path_or_id
|
37
35
|
host_present = host && !host.empty?
|
38
36
|
ppi_present = port_path_or_id && !port_path_or_id.empty?
|
39
37
|
|
40
|
-
host = NewRelic::Agent::Hostname.get_external
|
38
|
+
host = NewRelic::Agent::Hostname.get_external(host) if host_present
|
41
39
|
|
42
40
|
case
|
43
41
|
when host_present && ppi_present
|
@@ -57,15 +55,16 @@ module NewRelic
|
|
57
55
|
end
|
58
56
|
end
|
59
57
|
|
60
|
-
def notice_sql
|
61
|
-
_notice_sql
|
58
|
+
def notice_sql(sql)
|
59
|
+
_notice_sql(sql)
|
62
60
|
nil
|
63
61
|
end
|
64
62
|
|
65
63
|
# @api private
|
66
|
-
def _notice_sql
|
64
|
+
def _notice_sql(sql, config = nil, explainer = nil, binds = nil, name = nil)
|
67
65
|
return unless record_sql?
|
68
|
-
|
66
|
+
|
67
|
+
@sql_statement = Database::Statement.new(sql, config, explainer, binds, name, host, port_path_or_id, database_name)
|
69
68
|
end
|
70
69
|
|
71
70
|
# Method for simplifying attaching non-SQL data statements to a
|
@@ -85,8 +84,9 @@ module NewRelic
|
|
85
84
|
# please ensure all data passed to this method is safe to transmit to
|
86
85
|
# New Relic.
|
87
86
|
|
88
|
-
def notice_nosql_statement
|
87
|
+
def notice_nosql_statement(nosql_statement)
|
89
88
|
return unless record_sql?
|
89
|
+
|
90
90
|
@nosql_statement = Database.truncate_query(nosql_statement)
|
91
91
|
nil
|
92
92
|
end
|
@@ -120,8 +120,9 @@ module NewRelic
|
|
120
120
|
NEWLINE = "\n".freeze
|
121
121
|
|
122
122
|
def add_backtrace_parameter
|
123
|
-
|
124
|
-
|
123
|
+
return unless duration >= Agent.config[:'transaction_tracer.stack_trace_threshold']
|
124
|
+
|
125
|
+
params[:backtrace] = caller.join(NEWLINE)
|
125
126
|
end
|
126
127
|
|
127
128
|
def notice_sql_statement
|
@@ -138,8 +139,11 @@ module NewRelic
|
|
138
139
|
end
|
139
140
|
|
140
141
|
def record_span_event
|
142
|
+
# don't record a span event if the transaction is ignored
|
143
|
+
return if transaction.ignore?
|
144
|
+
|
141
145
|
aggregator = ::NewRelic::Agent.agent.span_event_aggregator
|
142
|
-
priority
|
146
|
+
priority = transaction.priority
|
143
147
|
|
144
148
|
aggregator.record(priority: priority) do
|
145
149
|
SpanEventPrimitive.for_datastore_segment(self)
|