newrelic_rpm 6.8.0.360 → 9.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +14 -1
- data/.rubocop.yml +1845 -0
- data/.rubocop_todo.yml +61 -0
- data/.simplecov +16 -0
- data/.snyk +11 -0
- data/.yardopts +1 -0
- data/Brewfile +13 -0
- data/CHANGELOG.md +4029 -2514
- data/CONTRIBUTING.md +132 -19
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Gemfile +5 -2
- data/Guardfile +21 -8
- data/LICENSE +202 -38
- data/README.md +86 -87
- data/Rakefile +32 -32
- data/THIRD_PARTY_NOTICES.md +28 -0
- data/Thorfile +5 -0
- data/bin/newrelic +4 -2
- data/bin/newrelic_cmd +2 -0
- data/bin/nrdebug +86 -63
- data/config.dot +5 -5
- data/docker-compose.yml +107 -0
- data/init.rb +5 -7
- data/install.rb +3 -3
- data/lefthook.yml +9 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +14 -10
- data/lib/new_relic/agent/agent.rb +114 -942
- 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 +28 -24
- data/lib/new_relic/agent/attribute_filter.rb +66 -49
- data/lib/new_relic/agent/attribute_processing.rb +10 -10
- data/lib/new_relic/agent/attributes.rb +9 -8
- data/lib/new_relic/agent/audit_logger.rb +22 -7
- data/lib/new_relic/agent/autostart.rb +22 -21
- data/lib/new_relic/agent/chained_call.rb +2 -2
- data/lib/new_relic/agent/commands/agent_command.rb +5 -5
- data/lib/new_relic/agent/commands/agent_command_router.rb +16 -14
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +17 -15
- data/lib/new_relic/agent/configuration/default_source.rb +1444 -1167
- data/lib/new_relic/agent/configuration/dotted_hash.rb +7 -6
- data/lib/new_relic/agent/configuration/environment_source.rb +14 -12
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +41 -18
- data/lib/new_relic/agent/configuration/high_security_source.rb +12 -13
- data/lib/new_relic/agent/configuration/manager.rb +96 -70
- data/lib/new_relic/agent/configuration/manual_source.rb +2 -2
- data/lib/new_relic/agent/configuration/mask_defaults.rb +4 -4
- data/lib/new_relic/agent/configuration/security_policy_source.rb +93 -96
- data/lib/new_relic/agent/configuration/server_source.rb +44 -42
- data/lib/new_relic/agent/configuration/yaml_source.rb +36 -12
- data/lib/new_relic/agent/configuration.rb +2 -2
- data/lib/new_relic/agent/connect/request_builder.rb +19 -19
- data/lib/new_relic/agent/connect/response_handler.rb +6 -9
- data/lib/new_relic/agent/custom_event_aggregator.rb +16 -16
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +6 -7
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +18 -17
- data/lib/new_relic/agent/database/obfuscator.rb +5 -5
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +4 -4
- data/lib/new_relic/agent/database.rb +47 -56
- data/lib/new_relic/agent/database_adapter.rb +35 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +22 -23
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +8 -7
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +18 -22
- data/lib/new_relic/agent/datastores/mongo.rb +7 -12
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +10 -16
- data/lib/new_relic/agent/datastores.rb +14 -16
- data/lib/new_relic/agent/deprecator.rb +2 -2
- data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +13 -12
- data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +90 -70
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +163 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +38 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +245 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +127 -0
- data/lib/new_relic/agent/distributed_tracing.rb +113 -32
- data/lib/new_relic/agent/encoding_normalizer.rb +5 -3
- data/lib/new_relic/agent/error_collector.rb +129 -65
- data/lib/new_relic/agent/error_event_aggregator.rb +9 -8
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +10 -8
- data/lib/new_relic/agent/event_aggregator.rb +23 -22
- data/lib/new_relic/agent/event_buffer.rb +8 -9
- data/lib/new_relic/agent/event_listener.rb +2 -3
- data/lib/new_relic/agent/event_loop.rb +28 -26
- data/lib/new_relic/agent/external.rb +19 -52
- data/lib/new_relic/agent/guid_generator.rb +14 -12
- data/lib/new_relic/agent/harvester.rb +6 -9
- data/lib/new_relic/agent/heap.rb +9 -10
- data/lib/new_relic/agent/hostname.rb +22 -9
- data/lib/new_relic/agent/http_clients/abstract.rb +69 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +30 -26
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +37 -21
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +22 -23
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +18 -17
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +28 -8
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +17 -17
- data/lib/new_relic/agent/http_clients/uri_util.rb +13 -14
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +10 -25
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +42 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +46 -34
- 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 +28 -21
- data/lib/new_relic/agent/instrumentation/active_job.rb +34 -14
- data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +21 -7
- data/lib/new_relic/agent/instrumentation/active_record.rb +97 -47
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +97 -73
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +53 -66
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +36 -12
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +37 -24
- data/lib/new_relic/agent/instrumentation/active_storage.rb +8 -4
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +9 -30
- data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
- data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/bunny.rb +14 -138
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +75 -63
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
- data/lib/new_relic/agent/instrumentation/curb.rb +16 -201
- 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 +48 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +31 -52
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +67 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +10 -8
- data/lib/new_relic/agent/instrumentation/excon.rb +29 -31
- data/lib/new_relic/agent/instrumentation/fiber/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
- data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
- data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/grape.rb +17 -123
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +12 -32
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +6 -7
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +60 -125
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +103 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +57 -71
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +16 -15
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +11 -11
- data/lib/new_relic/agent/instrumentation/mongo.rb +7 -132
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +53 -17
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
- data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +75 -9
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +22 -58
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +7 -7
- data/lib/new_relic/agent/instrumentation/queue_time.rb +9 -10
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +33 -141
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +22 -57
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +5 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +10 -9
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +18 -6
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +9 -6
- data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +142 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +18 -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 +94 -0
- data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
- data/lib/new_relic/agent/instrumentation/redis.rb +20 -103
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +33 -41
- data/lib/new_relic/agent/instrumentation/sequel.rb +17 -20
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +13 -13
- data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +30 -46
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +31 -37
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +126 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +4 -4
- data/lib/new_relic/agent/instrumentation/sinatra.rb +35 -165
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
- data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +42 -0
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +14 -76
- data/lib/new_relic/agent/instrumentation.rb +2 -2
- data/lib/new_relic/agent/internal_agent_error.rb +3 -3
- data/lib/new_relic/agent/javascript_instrumentor.rb +59 -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 +235 -0
- data/lib/new_relic/agent/log_once.rb +2 -2
- data/lib/new_relic/agent/log_priority.rb +20 -0
- data/lib/new_relic/agent/logging.rb +104 -51
- data/lib/new_relic/agent/memory_logger.rb +3 -3
- data/lib/new_relic/agent/messaging.rb +74 -156
- data/lib/new_relic/agent/method_tracer.rb +157 -150
- data/lib/new_relic/agent/method_tracer_helpers.rb +89 -12
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +117 -0
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +28 -0
- data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +3 -4
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +8 -13
- data/lib/new_relic/agent/monitors.rb +26 -0
- data/lib/new_relic/agent/new_relic_service/encoders.rb +8 -8
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +7 -7
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +3 -3
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -5
- data/lib/new_relic/agent/new_relic_service.rb +266 -193
- data/lib/new_relic/agent/noticeable_error.rb +19 -0
- data/lib/new_relic/agent/null_logger.rb +8 -4
- data/lib/new_relic/agent/obfuscator.rb +9 -11
- data/lib/new_relic/agent/parameter_filtering.rb +30 -16
- data/lib/new_relic/agent/payload_metric_mapping.rb +10 -11
- data/lib/new_relic/agent/pipe_channel_manager.rb +34 -23
- data/lib/new_relic/agent/pipe_service.rb +14 -9
- data/lib/new_relic/agent/prepend_supportability.rb +3 -3
- data/lib/new_relic/agent/priority_sampled_buffer.rb +16 -16
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +12 -12
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -14
- data/lib/new_relic/agent/rules_engine.rb +6 -5
- data/lib/new_relic/agent/sampler.rb +6 -6
- data/lib/new_relic/agent/sampler_collection.rb +5 -6
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +9 -8
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +21 -18
- data/lib/new_relic/agent/samplers/memory_sampler.rb +33 -22
- data/lib/new_relic/agent/samplers/object_sampler.rb +3 -3
- data/lib/new_relic/agent/samplers/vm_sampler.rb +22 -20
- data/lib/new_relic/agent/span_event_aggregator.rb +16 -16
- data/lib/new_relic/agent/span_event_primitive.rb +106 -68
- data/lib/new_relic/agent/sql_sampler.rb +23 -23
- data/lib/new_relic/agent/stats.rb +80 -43
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +11 -13
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +13 -14
- data/lib/new_relic/agent/stats_engine.rb +9 -9
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +9 -10
- data/lib/new_relic/agent/system_info.rb +97 -68
- data/lib/new_relic/agent/threading/agent_thread.rb +19 -15
- data/lib/new_relic/agent/threading/backtrace_node.rb +13 -14
- data/lib/new_relic/agent/threading/backtrace_service.rb +18 -22
- data/lib/new_relic/agent/threading/thread_profile.rb +25 -25
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +3 -3
- data/lib/new_relic/agent/tracer.rb +127 -107
- data/lib/new_relic/agent/transaction/abstract_segment.rb +145 -49
- data/lib/new_relic/agent/transaction/datastore_segment.rb +23 -19
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +185 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +76 -86
- data/lib/new_relic/agent/transaction/external_request_segment.rb +67 -77
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +34 -46
- data/lib/new_relic/agent/transaction/request_attributes.rb +40 -40
- data/lib/new_relic/agent/transaction/segment.rb +41 -11
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +2 -4
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +3 -3
- data/lib/new_relic/agent/transaction/trace.rb +19 -17
- data/lib/new_relic/agent/transaction/trace_builder.rb +11 -11
- data/lib/new_relic/agent/transaction/trace_context.rb +102 -93
- data/lib/new_relic/agent/transaction/trace_node.rb +31 -32
- data/lib/new_relic/agent/transaction/tracing.rb +22 -13
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +7 -7
- data/lib/new_relic/agent/transaction.rb +239 -198
- data/lib/new_relic/agent/transaction_error_primitive.rb +32 -28
- data/lib/new_relic/agent/transaction_event_aggregator.rb +17 -17
- data/lib/new_relic/agent/transaction_event_primitive.rb +43 -47
- data/lib/new_relic/agent/transaction_event_recorder.rb +17 -16
- data/lib/new_relic/agent/transaction_metrics.rb +11 -10
- data/lib/new_relic/agent/transaction_sampler.rb +8 -9
- data/lib/new_relic/agent/transaction_time_aggregator.rb +33 -28
- data/lib/new_relic/agent/utilization/aws.rb +35 -5
- data/lib/new_relic/agent/utilization/azure.rb +7 -7
- data/lib/new_relic/agent/utilization/gcp.rb +11 -11
- data/lib/new_relic/agent/utilization/pcf.rb +7 -6
- data/lib/new_relic/agent/utilization/vendor.rb +45 -30
- data/lib/new_relic/agent/utilization_data.rb +8 -6
- data/lib/new_relic/agent/vm/jruby_vm.rb +2 -2
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +4 -4
- data/lib/new_relic/agent/vm/mri_vm.rb +54 -26
- data/lib/new_relic/agent/vm/snapshot.rb +6 -6
- data/lib/new_relic/agent/vm.rb +2 -2
- data/lib/new_relic/agent/worker_loop.rb +11 -13
- data/lib/new_relic/agent.rb +159 -109
- data/lib/new_relic/cli/command.rb +22 -24
- data/lib/new_relic/cli/commands/deployments.rb +101 -51
- data/lib/new_relic/cli/commands/install.rb +33 -35
- data/lib/new_relic/coerce.rb +19 -15
- data/lib/new_relic/collection_helper.rb +51 -49
- data/lib/new_relic/constants.rb +38 -0
- data/lib/new_relic/control/class_methods.rb +6 -6
- data/lib/new_relic/control/frameworks/external.rb +3 -3
- data/lib/new_relic/control/frameworks/rails.rb +50 -32
- data/lib/new_relic/control/frameworks/rails3.rb +4 -5
- data/lib/new_relic/control/frameworks/rails4.rb +2 -2
- data/lib/new_relic/control/frameworks/rails_notifications.rb +2 -2
- data/lib/new_relic/control/frameworks/ruby.rb +4 -4
- data/lib/new_relic/control/frameworks/sinatra.rb +8 -2
- data/lib/new_relic/control/frameworks.rb +2 -2
- data/lib/new_relic/control/instance_methods.rb +28 -46
- data/lib/new_relic/control/instrumentation.rb +26 -12
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +4 -5
- data/lib/new_relic/control.rb +2 -3
- data/lib/new_relic/delayed_job_injection.rb +2 -2
- data/lib/new_relic/dependency_detection.rb +138 -31
- data/lib/new_relic/environment_report.rb +42 -36
- data/lib/new_relic/helper.rb +50 -8
- data/lib/new_relic/language_support.rb +31 -7
- data/lib/new_relic/latest_changes.rb +11 -10
- data/lib/new_relic/local_environment.rb +23 -27
- data/lib/new_relic/metric_data.rb +32 -27
- data/lib/new_relic/metric_spec.rb +9 -7
- data/lib/new_relic/noticed_error.rb +58 -47
- data/lib/new_relic/rack/agent_hooks.rb +2 -2
- data/lib/new_relic/rack/agent_middleware.rb +6 -4
- data/lib/new_relic/rack/browser_monitoring.rb +136 -117
- data/lib/new_relic/rack.rb +2 -2
- data/lib/new_relic/recipes/capistrano3.rb +5 -63
- data/lib/new_relic/recipes/capistrano_legacy.rb +25 -28
- data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
- data/lib/new_relic/recipes.rb +2 -2
- data/lib/new_relic/supportability_helper.rb +23 -7
- data/lib/new_relic/traced_thread.rb +39 -0
- data/lib/new_relic/version.rb +7 -18
- data/lib/newrelic_rpm.rb +21 -34
- data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +18 -21
- data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +10 -16
- data/lib/tasks/all.rb +4 -4
- data/lib/tasks/config.rake +24 -119
- data/lib/tasks/coverage_report.rake +28 -0
- data/lib/tasks/helpers/config.html.erb +21 -0
- data/lib/tasks/helpers/format.rb +123 -0
- data/lib/tasks/helpers/matches.rb +12 -0
- data/lib/tasks/helpers/prompt.rb +24 -0
- data/lib/tasks/helpers/removers.rb +33 -0
- data/lib/tasks/install.rake +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 +22 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
- data/lib/tasks/multiverse.rake +4 -0
- data/lib/tasks/multiverse.rb +23 -9
- data/lib/tasks/newrelic.rb +3 -2
- data/lib/tasks/tests.rake +17 -17
- data/newrelic.yml +672 -3
- data/newrelic_rpm.gemspec +46 -39
- data/recipes/newrelic.rb +3 -3
- data/test/agent_helper.rb +340 -110
- metadata +272 -97
- data/.travis.yml +0 -210
- data/bin/mongrel_rpm +0 -33
- data/cert/cacert.pem +0 -1177
- data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
- data/lib/new_relic/agent/distributed_trace_intrinsics.rb +0 -90
- data/lib/new_relic/agent/distributed_trace_metrics.rb +0 -74
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -30
- data/lib/new_relic/agent/distributed_trace_payload.rb +0 -175
- data/lib/new_relic/agent/distributed_trace_transport_type.rb +0 -43
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -74
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -202
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -46
- data/lib/new_relic/agent/instrumentation/http.rb +0 -46
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
- data/lib/new_relic/agent/instrumentation/net.rb +0 -50
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
- data/lib/new_relic/agent/instrumentation/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/trace_context.rb +0 -244
- data/lib/new_relic/agent/trace_context_payload.rb +0 -134
- data/lib/new_relic/agent/trace_context_request_monitor.rb +0 -42
- data/lib/new_relic/build.rb +0 -2
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/new_relic/metrics.rb +0 -13
- data/lib/tasks/config.html.erb +0 -32
- data/true +0 -0
- /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
# This module was introduced and largely extracted from the transaction event aggregator
|
6
6
|
# when the synthetics container was extracted from it. Its purpose is to create the data
|
@@ -8,40 +8,41 @@
|
|
8
8
|
# the transaction event aggregator and the synthetics container.
|
9
9
|
|
10
10
|
require 'new_relic/agent/payload_metric_mapping'
|
11
|
-
require 'new_relic/agent/distributed_trace_payload'
|
12
|
-
require 'new_relic/agent/
|
11
|
+
require 'new_relic/agent/distributed_tracing/distributed_trace_payload'
|
12
|
+
require 'new_relic/agent/distributed_tracing/distributed_trace_attributes'
|
13
13
|
|
14
14
|
module NewRelic
|
15
15
|
module Agent
|
16
16
|
module TransactionErrorPrimitive
|
17
17
|
extend self
|
18
18
|
|
19
|
-
SAMPLE_TYPE
|
20
|
-
TYPE_KEY
|
21
|
-
ERROR_CLASS_KEY
|
22
|
-
ERROR_MESSAGE_KEY
|
23
|
-
ERROR_EXPECTED_KEY
|
24
|
-
TIMESTAMP_KEY
|
25
|
-
PORT_KEY
|
26
|
-
NAME_KEY
|
27
|
-
DURATION_KEY
|
28
|
-
SAMPLED_KEY
|
29
|
-
GUID_KEY
|
19
|
+
SAMPLE_TYPE = 'TransactionError'.freeze
|
20
|
+
TYPE_KEY = 'type'.freeze
|
21
|
+
ERROR_CLASS_KEY = 'error.class'.freeze
|
22
|
+
ERROR_MESSAGE_KEY = 'error.message'.freeze
|
23
|
+
ERROR_EXPECTED_KEY = 'error.expected'.freeze
|
24
|
+
TIMESTAMP_KEY = 'timestamp'.freeze
|
25
|
+
PORT_KEY = 'port'.freeze
|
26
|
+
NAME_KEY = 'transactionName'.freeze
|
27
|
+
DURATION_KEY = 'duration'.freeze
|
28
|
+
SAMPLED_KEY = 'sampled'.freeze
|
29
|
+
GUID_KEY = 'nr.transactionGuid'.freeze
|
30
30
|
REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
|
31
|
-
SYNTHETICS_RESOURCE_ID_KEY
|
32
|
-
SYNTHETICS_JOB_ID_KEY
|
33
|
-
SYNTHETICS_MONITOR_ID_KEY
|
34
|
-
PRIORITY_KEY
|
31
|
+
SYNTHETICS_RESOURCE_ID_KEY = 'nr.syntheticsResourceId'.freeze
|
32
|
+
SYNTHETICS_JOB_ID_KEY = 'nr.syntheticsJobId'.freeze
|
33
|
+
SYNTHETICS_MONITOR_ID_KEY = 'nr.syntheticsMonitorId'.freeze
|
34
|
+
PRIORITY_KEY = 'priority'.freeze
|
35
|
+
SPAN_ID_KEY = 'spanId'.freeze
|
35
36
|
|
36
|
-
def create
|
37
|
+
def create(noticed_error, payload, span_id)
|
37
38
|
[
|
38
|
-
intrinsic_attributes_for(noticed_error, payload),
|
39
|
+
intrinsic_attributes_for(noticed_error, payload, span_id),
|
39
40
|
noticed_error.custom_attributes,
|
40
41
|
noticed_error.agent_attributes
|
41
42
|
]
|
42
43
|
end
|
43
44
|
|
44
|
-
def intrinsic_attributes_for
|
45
|
+
def intrinsic_attributes_for(noticed_error, payload, span_id)
|
45
46
|
attrs = {
|
46
47
|
TYPE_KEY => SAMPLE_TYPE,
|
47
48
|
ERROR_CLASS_KEY => noticed_error.exception_class_name,
|
@@ -50,6 +51,7 @@ module NewRelic
|
|
50
51
|
TIMESTAMP_KEY => noticed_error.timestamp.to_f
|
51
52
|
}
|
52
53
|
|
54
|
+
attrs[SPAN_ID_KEY] = span_id if span_id
|
53
55
|
attrs[PORT_KEY] = noticed_error.request_port if noticed_error.request_port
|
54
56
|
|
55
57
|
if payload
|
@@ -57,22 +59,24 @@ module NewRelic
|
|
57
59
|
attrs[DURATION_KEY] = payload[:duration]
|
58
60
|
attrs[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
|
59
61
|
attrs[PRIORITY_KEY] = payload[:priority]
|
60
|
-
append_synthetics
|
61
|
-
append_cat
|
62
|
-
|
63
|
-
PayloadMetricMapping.append_mapped_metrics
|
62
|
+
append_synthetics(payload, attrs)
|
63
|
+
append_cat(payload, attrs)
|
64
|
+
DistributedTraceAttributes.copy_to_hash(payload, attrs)
|
65
|
+
PayloadMetricMapping.append_mapped_metrics(payload[:metrics], attrs)
|
66
|
+
else
|
67
|
+
attrs[PRIORITY_KEY] = rand.round(NewRelic::PRIORITY_PRECISION)
|
64
68
|
end
|
65
69
|
|
66
70
|
attrs
|
67
71
|
end
|
68
72
|
|
69
|
-
def append_synthetics
|
73
|
+
def append_synthetics(payload, sample)
|
70
74
|
sample[SYNTHETICS_RESOURCE_ID_KEY] = payload[:synthetics_resource_id] if payload[:synthetics_resource_id]
|
71
75
|
sample[SYNTHETICS_JOB_ID_KEY] = payload[:synthetics_job_id] if payload[:synthetics_job_id]
|
72
76
|
sample[SYNTHETICS_MONITOR_ID_KEY] = payload[:synthetics_monitor_id] if payload[:synthetics_monitor_id]
|
73
77
|
end
|
74
78
|
|
75
|
-
def append_cat
|
79
|
+
def append_cat(payload, sample)
|
76
80
|
sample[GUID_KEY] = payload[:guid] if payload[:guid]
|
77
81
|
sample[REFERRING_TRANSACTION_GUID_KEY] = payload[:referring_transaction_guid] if payload[:referring_transaction_guid]
|
78
82
|
end
|
@@ -1,44 +1,44 @@
|
|
1
1
|
# -*- ruby -*-
|
2
|
-
# encoding: utf-8
|
3
2
|
# This file is distributed under New Relic's license terms.
|
4
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
5
5
|
|
6
|
-
require 'newrelic_rpm' unless defined?(
|
7
|
-
require 'new_relic/agent' unless defined?(
|
6
|
+
require 'newrelic_rpm' unless defined?(NewRelic)
|
7
|
+
require 'new_relic/agent' unless defined?(NewRelic::Agent)
|
8
8
|
require 'new_relic/agent/event_aggregator'
|
9
9
|
require 'new_relic/agent/priority_sampled_buffer'
|
10
10
|
|
11
11
|
module NewRelic
|
12
12
|
module Agent
|
13
13
|
class TransactionEventAggregator < EventAggregator
|
14
|
-
|
15
14
|
named :TransactionEventAggregator
|
16
|
-
capacity_key :'
|
17
|
-
enabled_key :'
|
15
|
+
capacity_key :'transaction_events.max_samples_stored'
|
16
|
+
enabled_key :'transaction_events.enabled'
|
18
17
|
buffer_class PrioritySampledBuffer
|
19
18
|
|
20
|
-
def record
|
21
|
-
unless
|
22
|
-
raise ArgumentError,
|
19
|
+
def record(priority: nil, event: nil, &blk)
|
20
|
+
unless event || priority && blk
|
21
|
+
raise ArgumentError, 'Expected priority and block, or event'
|
23
22
|
end
|
24
23
|
|
25
24
|
return unless enabled?
|
26
25
|
|
27
26
|
@lock.synchronize do
|
28
|
-
@buffer.append
|
27
|
+
@buffer.append(priority: priority, event: event, &blk)
|
29
28
|
notify_if_full
|
30
29
|
end
|
31
30
|
end
|
32
31
|
|
33
32
|
private
|
34
33
|
|
35
|
-
def after_harvest
|
34
|
+
def after_harvest(metadata)
|
36
35
|
return unless enabled?
|
37
|
-
|
36
|
+
|
37
|
+
record_sampling_rate(metadata)
|
38
38
|
end
|
39
39
|
|
40
|
-
def record_sampling_rate(metadata) #THREAD_LOCAL_ACCESS
|
41
|
-
NewRelic::Agent.logger.debug(
|
40
|
+
def record_sampling_rate(metadata) # THREAD_LOCAL_ACCESS
|
41
|
+
NewRelic::Agent.logger.debug('Sampled %d / %d (%.1f %%) requests this cycle, %d / %d (%.1f %%) since startup' % [
|
42
42
|
metadata[:captured],
|
43
43
|
metadata[:seen],
|
44
44
|
(metadata[:captured].to_f / metadata[:seen] * 100.0),
|
@@ -48,8 +48,8 @@ module NewRelic
|
|
48
48
|
])
|
49
49
|
|
50
50
|
engine = NewRelic::Agent.instance.stats_engine
|
51
|
-
engine.tl_record_supportability_metric_count(
|
52
|
-
engine.tl_record_supportability_metric_count(
|
51
|
+
engine.tl_record_supportability_metric_count('TransactionEventAggregator/requests', metadata[:seen])
|
52
|
+
engine.tl_record_supportability_metric_count('TransactionEventAggregator/samples', metadata[:captured])
|
53
53
|
end
|
54
54
|
end
|
55
55
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
# This module was introduced and largely extracted from the transaction event aggregator
|
6
6
|
# when the synthetics container was extracted from it. Its purpose is to create the data
|
@@ -8,7 +8,7 @@
|
|
8
8
|
# the transaction event aggregator and the synthetics container.
|
9
9
|
|
10
10
|
require 'new_relic/agent/payload_metric_mapping'
|
11
|
-
require 'new_relic/agent/
|
11
|
+
require 'new_relic/agent/distributed_tracing/distributed_trace_attributes'
|
12
12
|
|
13
13
|
module NewRelic
|
14
14
|
module Agent
|
@@ -16,46 +16,44 @@ module NewRelic
|
|
16
16
|
include NewRelic::Coerce
|
17
17
|
extend self
|
18
18
|
|
19
|
+
COMMA = ','
|
20
|
+
|
19
21
|
# The type field of the sample
|
20
|
-
SAMPLE_TYPE
|
22
|
+
SAMPLE_TYPE = 'Transaction'
|
21
23
|
|
22
24
|
# Strings for static keys of the sample structure
|
23
|
-
TYPE_KEY
|
24
|
-
TIMESTAMP_KEY
|
25
|
-
NAME_KEY
|
26
|
-
DURATION_KEY
|
27
|
-
ERROR_KEY
|
28
|
-
SAMPLED_KEY
|
29
|
-
PRIORITY_KEY
|
30
|
-
GUID_KEY
|
31
|
-
REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'
|
32
|
-
CAT_PATH_HASH_KEY
|
33
|
-
CAT_REFERRING_PATH_HASH_KEY
|
34
|
-
CAT_ALTERNATE_PATH_HASHES_KEY
|
35
|
-
APDEX_PERF_ZONE_KEY
|
36
|
-
SYNTHETICS_RESOURCE_ID_KEY
|
37
|
-
SYNTHETICS_JOB_ID_KEY
|
38
|
-
SYNTHETICS_MONITOR_ID_KEY
|
39
|
-
|
40
|
-
|
41
|
-
# To avoid allocations when we have empty custom or agent attributes
|
42
|
-
EMPTY_HASH = {}.freeze
|
25
|
+
TYPE_KEY = 'type'
|
26
|
+
TIMESTAMP_KEY = 'timestamp'
|
27
|
+
NAME_KEY = 'name'
|
28
|
+
DURATION_KEY = 'duration'
|
29
|
+
ERROR_KEY = 'error'
|
30
|
+
SAMPLED_KEY = 'sampled'
|
31
|
+
PRIORITY_KEY = 'priority'
|
32
|
+
GUID_KEY = 'nr.guid'
|
33
|
+
REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'
|
34
|
+
CAT_PATH_HASH_KEY = 'nr.pathHash'
|
35
|
+
CAT_REFERRING_PATH_HASH_KEY = 'nr.referringPathHash'
|
36
|
+
CAT_ALTERNATE_PATH_HASHES_KEY = 'nr.alternatePathHashes'
|
37
|
+
APDEX_PERF_ZONE_KEY = 'nr.apdexPerfZone'
|
38
|
+
SYNTHETICS_RESOURCE_ID_KEY = 'nr.syntheticsResourceId'
|
39
|
+
SYNTHETICS_JOB_ID_KEY = 'nr.syntheticsJobId'
|
40
|
+
SYNTHETICS_MONITOR_ID_KEY = 'nr.syntheticsMonitorId'
|
43
41
|
|
44
42
|
def create(payload)
|
45
43
|
intrinsics = {
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
44
|
+
TIMESTAMP_KEY => float(payload[:start_timestamp]),
|
45
|
+
NAME_KEY => string(payload[:name]),
|
46
|
+
DURATION_KEY => float(payload[:duration]),
|
47
|
+
TYPE_KEY => SAMPLE_TYPE,
|
48
|
+
ERROR_KEY => payload[:error],
|
49
|
+
PRIORITY_KEY => payload[:priority]
|
52
50
|
}
|
53
51
|
|
54
52
|
intrinsics[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
|
55
53
|
|
56
|
-
|
54
|
+
PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
|
57
55
|
append_optional_attributes(intrinsics, payload)
|
58
|
-
|
56
|
+
DistributedTraceAttributes.copy_to_hash(payload, intrinsics)
|
59
57
|
|
60
58
|
attributes = payload[:attributes]
|
61
59
|
|
@@ -65,19 +63,17 @@ module NewRelic
|
|
65
63
|
private
|
66
64
|
|
67
65
|
def append_optional_attributes(sample, payload)
|
68
|
-
optionally_append(GUID_KEY,
|
66
|
+
optionally_append(GUID_KEY, :guid, sample, payload)
|
69
67
|
optionally_append(REFERRING_TRANSACTION_GUID_KEY, :referring_transaction_guid, sample, payload)
|
70
|
-
optionally_append(CAT_PATH_HASH_KEY,
|
71
|
-
optionally_append(CAT_REFERRING_PATH_HASH_KEY,
|
72
|
-
optionally_append(APDEX_PERF_ZONE_KEY,
|
73
|
-
optionally_append(SYNTHETICS_RESOURCE_ID_KEY,
|
74
|
-
optionally_append(SYNTHETICS_JOB_ID_KEY,
|
75
|
-
optionally_append(SYNTHETICS_MONITOR_ID_KEY,
|
68
|
+
optionally_append(CAT_PATH_HASH_KEY, :cat_path_hash, sample, payload)
|
69
|
+
optionally_append(CAT_REFERRING_PATH_HASH_KEY, :cat_referring_path_hash, sample, payload)
|
70
|
+
optionally_append(APDEX_PERF_ZONE_KEY, :apdex_perf_zone, sample, payload)
|
71
|
+
optionally_append(SYNTHETICS_RESOURCE_ID_KEY, :synthetics_resource_id, sample, payload)
|
72
|
+
optionally_append(SYNTHETICS_JOB_ID_KEY, :synthetics_job_id, sample, payload)
|
73
|
+
optionally_append(SYNTHETICS_MONITOR_ID_KEY, :synthetics_monitor_id, sample, payload)
|
76
74
|
append_cat_alternate_path_hashes(sample, payload)
|
77
75
|
end
|
78
76
|
|
79
|
-
COMMA = ','.freeze
|
80
|
-
|
81
77
|
def append_cat_alternate_path_hashes(sample, payload)
|
82
78
|
if payload.include?(:cat_alternate_path_hashes)
|
83
79
|
sample[CAT_ALTERNATE_PATH_HASHES_KEY] = payload[:cat_alternate_path_hashes].sort.join(COMMA)
|
@@ -90,21 +86,21 @@ module NewRelic
|
|
90
86
|
end
|
91
87
|
end
|
92
88
|
|
93
|
-
def custom_attributes
|
89
|
+
def custom_attributes(attributes)
|
94
90
|
if attributes
|
95
|
-
result = attributes.custom_attributes_for(
|
91
|
+
result = attributes.custom_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
|
96
92
|
result.freeze
|
97
93
|
else
|
98
|
-
EMPTY_HASH
|
94
|
+
NewRelic::EMPTY_HASH
|
99
95
|
end
|
100
96
|
end
|
101
97
|
|
102
|
-
def agent_attributes
|
98
|
+
def agent_attributes(attributes)
|
103
99
|
if attributes
|
104
|
-
result = attributes.agent_attributes_for(
|
100
|
+
result = attributes.agent_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
|
105
101
|
result.freeze
|
106
102
|
else
|
107
|
-
EMPTY_HASH
|
103
|
+
NewRelic::EMPTY_HASH
|
108
104
|
end
|
109
105
|
end
|
110
106
|
end
|
@@ -1,42 +1,43 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
4
5
|
require 'new_relic/agent/transaction_event_aggregator'
|
5
6
|
require 'new_relic/agent/synthetics_event_aggregator'
|
6
7
|
require 'new_relic/agent/transaction_event_primitive'
|
7
8
|
|
8
9
|
module NewRelic
|
9
10
|
module Agent
|
10
|
-
# This is
|
11
|
+
# This is responsible for recording transaction events and managing
|
11
12
|
# the relationship between events generated from synthetics requests
|
12
13
|
# vs normal requests.
|
13
14
|
class TransactionEventRecorder
|
14
15
|
attr_reader :transaction_event_aggregator
|
15
16
|
attr_reader :synthetics_event_aggregator
|
16
17
|
|
17
|
-
def initialize
|
18
|
-
@transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new
|
19
|
-
@synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new
|
18
|
+
def initialize(events)
|
19
|
+
@transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new(events)
|
20
|
+
@synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new(events)
|
20
21
|
end
|
21
22
|
|
22
|
-
def record
|
23
|
-
return unless NewRelic::Agent.config[:'
|
23
|
+
def record(payload)
|
24
|
+
return unless NewRelic::Agent.config[:'transaction_events.enabled']
|
24
25
|
|
25
|
-
if synthetics_event?
|
26
|
-
event = create_event
|
27
|
-
result = synthetics_event_aggregator.record
|
28
|
-
transaction_event_aggregator.record
|
26
|
+
if synthetics_event?(payload)
|
27
|
+
event = create_event(payload)
|
28
|
+
result = synthetics_event_aggregator.record(event)
|
29
|
+
transaction_event_aggregator.record(event: event) if result.nil?
|
29
30
|
else
|
30
31
|
transaction_event_aggregator.record(priority: payload[:priority]) { create_event(payload) }
|
31
32
|
end
|
32
33
|
end
|
33
34
|
|
34
|
-
def create_event
|
35
|
-
TransactionEventPrimitive.create
|
35
|
+
def create_event(payload)
|
36
|
+
TransactionEventPrimitive.create(payload)
|
36
37
|
end
|
37
38
|
|
38
|
-
def synthetics_event?
|
39
|
-
payload.key?
|
39
|
+
def synthetics_event?(payload)
|
40
|
+
payload.key?(:synthetics_resource_id)
|
40
41
|
end
|
41
42
|
|
42
43
|
def drop_buffered_data
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
# This class represents a set of metrics that were recorded during a single
|
6
6
|
# transaction. Since the name of the transaction is not known until its end, we
|
@@ -10,11 +10,12 @@
|
|
10
10
|
module NewRelic
|
11
11
|
module Agent
|
12
12
|
class TransactionMetrics
|
13
|
-
DEFAULT_PROC =
|
13
|
+
DEFAULT_PROC = proc { |hash, name| hash[name] = NewRelic::Agent::Stats.new }
|
14
14
|
|
15
15
|
def initialize
|
16
|
+
@lock = Mutex.new
|
16
17
|
@unscoped = Hash.new(&DEFAULT_PROC)
|
17
|
-
@scoped
|
18
|
+
@scoped = Hash.new(&DEFAULT_PROC)
|
18
19
|
end
|
19
20
|
|
20
21
|
# As a general rule, when recording a scoped metric, the corresponding
|
@@ -25,11 +26,11 @@ module NewRelic
|
|
25
26
|
# propagate them into unscoped metrics as well when instances of this
|
26
27
|
# class are merged into the global metric store.
|
27
28
|
#
|
28
|
-
def record_scoped_and_unscoped(names, value=nil, aux=nil, &blk)
|
29
|
+
def record_scoped_and_unscoped(names, value = nil, aux = nil, &blk)
|
29
30
|
_record_metrics(names, value, aux, @scoped, &blk)
|
30
31
|
end
|
31
32
|
|
32
|
-
def record_unscoped(names, value=nil, aux=nil, &blk)
|
33
|
+
def record_unscoped(names, value = nil, aux = nil, &blk)
|
33
34
|
_record_metrics(names, value, aux, @unscoped, &blk)
|
34
35
|
end
|
35
36
|
|
@@ -42,11 +43,11 @@ module NewRelic
|
|
42
43
|
end
|
43
44
|
|
44
45
|
def each_unscoped
|
45
|
-
@unscoped.each { |name, stats| yield
|
46
|
+
@lock.synchronize { @unscoped.each { |name, stats| yield(name, stats) } }
|
46
47
|
end
|
47
48
|
|
48
49
|
def each_scoped
|
49
|
-
@scoped.each { |name, stats| yield
|
50
|
+
@lock.synchronize { @scoped.each { |name, stats| yield(name, stats) } }
|
50
51
|
end
|
51
52
|
|
52
53
|
def _record_metrics(names, value, aux, target, &blk)
|
@@ -54,10 +55,10 @@ module NewRelic
|
|
54
55
|
case names
|
55
56
|
when Array
|
56
57
|
names.each do |name|
|
57
|
-
target[name].record(value, aux, &blk)
|
58
|
+
@lock.synchronize { target[name].record(value, aux, &blk) }
|
58
59
|
end
|
59
60
|
else
|
60
|
-
target[names].record(value, aux, &blk)
|
61
|
+
@lock.synchronize { target[names].record(value, aux, &blk) }
|
61
62
|
end
|
62
63
|
end
|
63
64
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/transaction/slowest_sample_buffer'
|
6
6
|
require 'new_relic/agent/transaction/synthetics_sample_buffer'
|
@@ -8,7 +8,6 @@ require 'new_relic/agent/transaction/trace_builder'
|
|
8
8
|
|
9
9
|
module NewRelic
|
10
10
|
module Agent
|
11
|
-
|
12
11
|
# This class contains the logic for recording and storing transaction
|
13
12
|
# traces (sometimes referred to as 'transaction samples').
|
14
13
|
#
|
@@ -33,15 +32,15 @@ module NewRelic
|
|
33
32
|
Agent.config.register_callback(:'transaction_tracer.enabled') do |enabled|
|
34
33
|
if enabled
|
35
34
|
threshold = Agent.config[:'transaction_tracer.transaction_threshold']
|
36
|
-
::NewRelic::Agent.logger.debug
|
35
|
+
::NewRelic::Agent.logger.debug("Transaction tracing threshold is #{threshold} seconds.")
|
37
36
|
else
|
38
|
-
::NewRelic::Agent.logger.debug
|
37
|
+
::NewRelic::Agent.logger.debug('Transaction traces will not be sent to the New Relic service.')
|
39
38
|
end
|
40
39
|
end
|
41
40
|
|
42
41
|
Agent.config.register_callback(:'transaction_tracer.record_sql') do |config|
|
43
42
|
if config == 'raw'
|
44
|
-
::NewRelic::Agent.logger.warn(
|
43
|
+
::NewRelic::Agent.logger.warn('Agent is configured to send raw SQL to the service')
|
45
44
|
end
|
46
45
|
end
|
47
46
|
end
|
@@ -68,7 +67,7 @@ module NewRelic
|
|
68
67
|
|
69
68
|
# Gather transaction traces that we'd like to transmit to the server.
|
70
69
|
def harvest!
|
71
|
-
return
|
70
|
+
return NewRelic::EMPTY_ARRAY unless enabled?
|
72
71
|
|
73
72
|
samples = @samples_lock.synchronize do
|
74
73
|
@last_sample = nil
|
@@ -82,7 +81,7 @@ module NewRelic
|
|
82
81
|
begin
|
83
82
|
sample.prepare_to_send!
|
84
83
|
rescue => e
|
85
|
-
NewRelic::Agent.logger.error(
|
84
|
+
NewRelic::Agent.logger.error('Failed to prepare transaction trace. Error: ', e)
|
86
85
|
false
|
87
86
|
else
|
88
87
|
true
|
@@ -114,7 +113,7 @@ module NewRelic
|
|
114
113
|
result.uniq!
|
115
114
|
result.map! do |sample|
|
116
115
|
if Transaction === sample
|
117
|
-
Transaction::TraceBuilder.build_trace
|
116
|
+
Transaction::TraceBuilder.build_trace(sample)
|
118
117
|
else
|
119
118
|
sample
|
120
119
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
# This module powers the Busy calculation for the Capacity report in
|
6
6
|
# APM (https://rpm.newrelic.com/accounts/.../applications/.../optimize/capacity_analysis).
|
@@ -12,36 +12,36 @@
|
|
12
12
|
module NewRelic
|
13
13
|
module Agent
|
14
14
|
module TransactionTimeAggregator
|
15
|
-
TransactionStats = Struct.new
|
15
|
+
TransactionStats = Struct.new(:transaction_started_at, :elapsed_transaction_time)
|
16
16
|
|
17
|
-
@lock
|
18
|
-
@harvest_cycle_started_at =
|
17
|
+
@lock = Mutex.new
|
18
|
+
@harvest_cycle_started_at = Process.clock_gettime(Process::CLOCK_REALTIME)
|
19
19
|
|
20
20
|
@stats = Hash.new do |h, k|
|
21
|
-
h[k] = TransactionStats.new
|
21
|
+
h[k] = TransactionStats.new(nil, 0.0)
|
22
22
|
end
|
23
23
|
|
24
|
-
def reset!(timestamp =
|
24
|
+
def reset!(timestamp = Process.clock_gettime(Process::CLOCK_REALTIME))
|
25
25
|
@harvest_cycle_started_at = timestamp
|
26
26
|
@stats.clear
|
27
27
|
end
|
28
28
|
|
29
|
-
def transaction_start(timestamp =
|
29
|
+
def transaction_start(timestamp = Process.clock_gettime(Process::CLOCK_REALTIME))
|
30
30
|
@lock.synchronize do
|
31
|
-
set_transaction_start_time
|
31
|
+
set_transaction_start_time(timestamp)
|
32
32
|
end
|
33
33
|
end
|
34
34
|
|
35
|
-
def transaction_stop(timestamp =
|
35
|
+
def transaction_stop(timestamp = Process.clock_gettime(Process::CLOCK_REALTIME), starting_thread_id = current_thread)
|
36
36
|
@lock.synchronize do
|
37
|
-
record_elapsed_transaction_time_until
|
38
|
-
set_transaction_start_time
|
37
|
+
record_elapsed_transaction_time_until(timestamp, starting_thread_id)
|
38
|
+
set_transaction_start_time(nil, starting_thread_id)
|
39
39
|
end
|
40
40
|
end
|
41
41
|
|
42
42
|
INSTANCE_BUSY_METRIC = 'Instance/Busy'.freeze
|
43
43
|
|
44
|
-
def harvest!(timestamp =
|
44
|
+
def harvest!(timestamp = Process.clock_gettime(Process::CLOCK_REALTIME))
|
45
45
|
active_threads = 0
|
46
46
|
result = @lock.synchronize do
|
47
47
|
# Sum up the transaction times spent in each thread
|
@@ -50,7 +50,7 @@ module NewRelic
|
|
50
50
|
end
|
51
51
|
|
52
52
|
active_threads = @stats.size
|
53
|
-
elapsed_harvest_time
|
53
|
+
elapsed_harvest_time = (timestamp - @harvest_cycle_started_at) * active_threads
|
54
54
|
@harvest_cycle_started_at = timestamp
|
55
55
|
|
56
56
|
# Clear out the stats for all threads, _except_ the live ones
|
@@ -75,9 +75,9 @@ module NewRelic
|
|
75
75
|
end
|
76
76
|
|
77
77
|
module_function :reset!,
|
78
|
-
|
79
|
-
|
80
|
-
|
78
|
+
:transaction_start,
|
79
|
+
:transaction_stop,
|
80
|
+
:harvest!
|
81
81
|
|
82
82
|
class << self
|
83
83
|
private
|
@@ -100,23 +100,24 @@ module NewRelic
|
|
100
100
|
end
|
101
101
|
|
102
102
|
def thread_is_alive?(thread_id)
|
103
|
-
thread = thread_by_id
|
104
|
-
|
103
|
+
thread = thread_by_id(thread_id)
|
104
|
+
# needs else branch coverage
|
105
|
+
thread && thread.alive? # rubocop:disable Style/SafeNavigation
|
105
106
|
rescue StandardError
|
106
107
|
false
|
107
108
|
end
|
108
109
|
|
109
110
|
# ObjectSpace is faster on MRI, but disabled by default on JRuby for
|
110
|
-
#
|
111
|
+
# performance reasons. We have two implementations of `thread_by_id`
|
111
112
|
# based on ruby implementation.
|
112
113
|
if RUBY_ENGINE == 'jruby'
|
113
|
-
def thread_by_id
|
114
|
+
def thread_by_id(thread_id)
|
114
115
|
Thread.list.detect { |t| t.object_id == thread_id }
|
115
116
|
end
|
116
117
|
else
|
117
118
|
require 'objspace'
|
118
119
|
|
119
|
-
def thread_by_id
|
120
|
+
def thread_by_id(thread_id)
|
120
121
|
ObjectSpace._id2ref(thread_id)
|
121
122
|
end
|
122
123
|
end
|
@@ -127,26 +128,30 @@ module NewRelic
|
|
127
128
|
|
128
129
|
def split_transaction_at_harvest(timestamp, thread_id = nil)
|
129
130
|
raise ArgumentError, 'thread_id required' unless thread_id
|
131
|
+
|
130
132
|
@stats[thread_id].transaction_started_at = timestamp
|
131
133
|
@stats[thread_id].elapsed_transaction_time = 0.0
|
132
134
|
end
|
133
135
|
|
134
|
-
def transaction_time_in_thread
|
135
|
-
return entry.elapsed_transaction_time unless in_transaction?
|
136
|
+
def transaction_time_in_thread(timestamp, thread_id, entry)
|
137
|
+
return entry.elapsed_transaction_time unless in_transaction?(thread_id)
|
136
138
|
|
137
139
|
# Count the portion of the transaction that's elapsed so far,...
|
138
|
-
elapsed = record_elapsed_transaction_time_until
|
140
|
+
elapsed = record_elapsed_transaction_time_until(timestamp, thread_id)
|
139
141
|
|
140
142
|
# ...then readjust the transaction start time to the next harvest
|
141
|
-
split_transaction_at_harvest
|
143
|
+
split_transaction_at_harvest(timestamp, thread_id)
|
142
144
|
|
143
145
|
elapsed
|
144
146
|
end
|
145
147
|
|
148
|
+
# this method has no test coverage
|
146
149
|
def log_missing_elapsed_transaction_time
|
147
|
-
|
150
|
+
# rubocop:disable Style/SafeNavigation
|
151
|
+
transaction_name = transaction_name = Tracer.current_transaction &&
|
148
152
|
Tracer.current_transaction.best_name ||
|
149
|
-
|
153
|
+
'unknown'
|
154
|
+
# rubocop:enable Style/SafeNavigation
|
150
155
|
NewRelic::Agent.logger.warn("Unable to calculate elapsed transaction time for #{transaction_name}")
|
151
156
|
end
|
152
157
|
end
|