newrelic_rpm 6.3.0.355 → 9.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +15 -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 +4102 -2416
- data/CONTRIBUTING.md +132 -19
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Gemfile +5 -2
- data/Guardfile +25 -6
- 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 +115 -882
- 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 +30 -22
- data/lib/new_relic/agent/attribute_filter.rb +70 -53
- data/lib/new_relic/agent/attribute_processing.rb +10 -10
- data/lib/new_relic/agent/attributes.rb +153 -0
- data/lib/new_relic/agent/audit_logger.rb +22 -7
- data/lib/new_relic/agent/autostart.rb +34 -28
- 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 +18 -35
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +17 -15
- data/lib/new_relic/agent/configuration/default_source.rb +1456 -1100
- data/lib/new_relic/agent/configuration/dotted_hash.rb +7 -6
- data/lib/new_relic/agent/configuration/environment_source.rb +17 -13
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +68 -0
- data/lib/new_relic/agent/configuration/high_security_source.rb +12 -12
- data/lib/new_relic/agent/configuration/manager.rb +97 -80
- 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 +66 -40
- data/lib/new_relic/agent/configuration/yaml_source.rb +44 -15
- data/lib/new_relic/agent/configuration.rb +2 -2
- data/lib/new_relic/agent/connect/request_builder.rb +25 -27
- data/lib/new_relic/agent/connect/response_handler.rb +7 -10
- 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 +9 -8
- 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 +10 -8
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +11 -8
- data/lib/new_relic/agent/event_aggregator.rb +43 -48
- 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 +30 -0
- 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 +22 -55
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +42 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +60 -72
- 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 +86 -62
- 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 +70 -76
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +36 -12
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +65 -66
- data/lib/new_relic/agent/instrumentation/active_storage.rb +8 -4
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +11 -32
- 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 -124
- 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 +142 -0
- 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 -10
- 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 +60 -49
- 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 +182 -0
- 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} +5 -6
- 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 +273 -202
- 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 +17 -15
- 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 +17 -19
- data/lib/new_relic/agent/span_event_primitive.rb +118 -58
- 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 +21 -25
- data/lib/new_relic/agent/threading/thread_profile.rb +32 -46
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +3 -3
- data/lib/new_relic/agent/tracer.rb +159 -107
- data/lib/new_relic/agent/transaction/abstract_segment.rb +147 -51
- 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 +73 -164
- data/lib/new_relic/agent/transaction/external_request_segment.rb +67 -64
- 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 +46 -10
- 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 +22 -25
- data/lib/new_relic/agent/transaction/trace_builder.rb +11 -12
- data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
- data/lib/new_relic/agent/transaction/trace_node.rb +36 -32
- data/lib/new_relic/agent/transaction/tracing.rb +16 -13
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +7 -7
- data/lib/new_relic/agent/transaction.rb +248 -205
- data/lib/new_relic/agent/transaction_error_primitive.rb +34 -37
- data/lib/new_relic/agent/transaction_event_aggregator.rb +17 -17
- data/lib/new_relic/agent/transaction_event_primitive.rb +44 -56
- 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 +9 -14
- 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 +219 -89
- data/lib/new_relic/cli/command.rb +22 -24
- data/lib/new_relic/cli/commands/deployments.rb +102 -52
- data/lib/new_relic/cli/commands/install.rb +33 -35
- data/lib/new_relic/coerce.rb +42 -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 +33 -42
- data/lib/new_relic/control/instrumentation.rb +40 -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 +129 -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 +60 -45
- 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 -115
- 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 -120
- 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 +50 -34
- data/recipes/newrelic.rb +3 -3
- data/test/agent_helper.rb +414 -98
- metadata +302 -93
- data/.travis.yml +0 -170
- data/bin/mongrel_rpm +0 -33
- data/cert/cacert.pem +0 -1177
- data/lib/new_relic/agent/commands/xray_session.rb +0 -55
- data/lib/new_relic/agent/commands/xray_session_collection.rb +0 -161
- data/lib/new_relic/agent/configuration/event_data.rb +0 -39
- 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_monitor.rb +0 -40
- data/lib/new_relic/agent/distributed_trace_payload.rb +0 -242
- 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/evented_subscriber.rb +0 -135
- 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/transaction/attributes.rb +0 -154
- data/lib/new_relic/agent/transaction/xray_sample_buffer.rb +0 -64
- 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/lib/tasks/versions.html.erb +0 -28
- data/lib/tasks/versions.postface.html +0 -8
- data/lib/tasks/versions.preface.html +0 -9
- data/lib/tasks/versions.rake +0 -65
- data/lib/tasks/versions.txt.erb +0 -14
- /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -0,0 +1,168 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
class Transaction
|
8
|
+
module TraceContext
|
9
|
+
include NewRelic::Coerce
|
10
|
+
|
11
|
+
module AccountHelpers
|
12
|
+
extend self
|
13
|
+
|
14
|
+
def trace_state_entry_key
|
15
|
+
@trace_state_entry_key ||= if Agent.config[:trusted_account_key]
|
16
|
+
"#{Agent.config[:trusted_account_key]}@nr".freeze
|
17
|
+
elsif Agent.config[:account_id]
|
18
|
+
"#{Agent.config[:account_id]}@nr".freeze
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
SUPPORTABILITY_PREFIX = 'Supportability/TraceContext'
|
24
|
+
CREATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/Create"
|
25
|
+
ACCEPT_PREFIX = "#{SUPPORTABILITY_PREFIX}/Accept"
|
26
|
+
TRACESTATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/TraceState"
|
27
|
+
|
28
|
+
CREATE_SUCCESS_METRIC = "#{CREATE_PREFIX}/Success"
|
29
|
+
CREATE_EXCEPTION_METRIC = "#{CREATE_PREFIX}/Exception"
|
30
|
+
|
31
|
+
ACCEPT_SUCCESS_METRIC = "#{ACCEPT_PREFIX}/Success"
|
32
|
+
ACCEPT_EXCEPTION_METRIC = "#{ACCEPT_PREFIX}/Exception"
|
33
|
+
IGNORE_MULTIPLE_ACCEPT_METRIC = "#{ACCEPT_PREFIX}/Ignored/Multiple"
|
34
|
+
IGNORE_ACCEPT_AFTER_CREATE_METRIC = "#{ACCEPT_PREFIX}/Ignored/CreateBeforeAccept"
|
35
|
+
|
36
|
+
NO_NR_ENTRY_TRACESTATE_METRIC = "#{TRACESTATE_PREFIX}/NoNrEntry"
|
37
|
+
INVALID_TRACESTATE_PAYLOAD_METRIC = "#{TRACESTATE_PREFIX}/InvalidNrEntry"
|
38
|
+
|
39
|
+
attr_accessor :trace_context_header_data
|
40
|
+
attr_reader :trace_state_payload
|
41
|
+
|
42
|
+
def trace_parent_header_present?(request)
|
43
|
+
request[NewRelic::HTTP_TRACEPARENT_KEY]
|
44
|
+
end
|
45
|
+
|
46
|
+
def accept_trace_context_incoming_request(request)
|
47
|
+
header_data = NewRelic::Agent::DistributedTracing::TraceContext.parse(
|
48
|
+
format: NewRelic::FORMAT_RACK,
|
49
|
+
carrier: request,
|
50
|
+
trace_state_entry_key: AccountHelpers.trace_state_entry_key
|
51
|
+
)
|
52
|
+
return if header_data.nil?
|
53
|
+
|
54
|
+
accept_trace_context(header_data)
|
55
|
+
end
|
56
|
+
private :accept_trace_context_incoming_request
|
57
|
+
|
58
|
+
def insert_trace_context_header(header, format = NewRelic::FORMAT_NON_RACK)
|
59
|
+
return unless Agent.config[:'distributed_tracing.enabled']
|
60
|
+
|
61
|
+
NewRelic::Agent::DistributedTracing::TraceContext.insert( \
|
62
|
+
format: format,
|
63
|
+
carrier: header,
|
64
|
+
trace_id: transaction.trace_id.rjust(32, '0').downcase,
|
65
|
+
parent_id: transaction.current_segment.guid,
|
66
|
+
trace_flags: transaction.sampled? ? 0x1 : 0x0,
|
67
|
+
trace_state: create_trace_state
|
68
|
+
)
|
69
|
+
|
70
|
+
@trace_context_inserted = true
|
71
|
+
|
72
|
+
NewRelic::Agent.increment_metric(CREATE_SUCCESS_METRIC)
|
73
|
+
true
|
74
|
+
rescue Exception => e
|
75
|
+
NewRelic::Agent.increment_metric(CREATE_EXCEPTION_METRIC)
|
76
|
+
NewRelic::Agent.logger.warn('Failed to create trace context payload', e)
|
77
|
+
false
|
78
|
+
end
|
79
|
+
|
80
|
+
def create_trace_state
|
81
|
+
entry_key = AccountHelpers.trace_state_entry_key.dup
|
82
|
+
payload = create_trace_state_payload
|
83
|
+
|
84
|
+
if payload
|
85
|
+
entry = NewRelic::Agent::DistributedTracing::TraceContext.create_trace_state_entry( \
|
86
|
+
entry_key,
|
87
|
+
payload.to_s
|
88
|
+
)
|
89
|
+
else
|
90
|
+
entry = NewRelic::EMPTY_STR
|
91
|
+
end
|
92
|
+
|
93
|
+
trace_context_header_data ? trace_context_header_data.trace_state(entry) : entry
|
94
|
+
end
|
95
|
+
|
96
|
+
def create_trace_state_payload
|
97
|
+
unless Agent.config[:'distributed_tracing.enabled']
|
98
|
+
NewRelic::Agent.logger.warn('Not configured to create WC3 trace context payload')
|
99
|
+
return
|
100
|
+
end
|
101
|
+
|
102
|
+
span_guid = Agent.config[:'span_events.enabled'] ? transaction.current_segment.guid : nil
|
103
|
+
transaction_guid = Agent.config[:'transaction_events.enabled'] ? transaction.guid : nil
|
104
|
+
|
105
|
+
TraceContextPayload.create( \
|
106
|
+
parent_account_id: Agent.config[:account_id],
|
107
|
+
parent_app_id: Agent.config[:primary_application_id],
|
108
|
+
transaction_id: transaction_guid,
|
109
|
+
sampled: transaction.sampled?,
|
110
|
+
priority: float!(transaction.priority, NewRelic::PRIORITY_PRECISION),
|
111
|
+
id: span_guid
|
112
|
+
)
|
113
|
+
end
|
114
|
+
|
115
|
+
def assign_trace_state_payload
|
116
|
+
payload = @trace_context_header_data.trace_state_payload
|
117
|
+
unless payload
|
118
|
+
NewRelic::Agent.increment_metric(NO_NR_ENTRY_TRACESTATE_METRIC)
|
119
|
+
return false
|
120
|
+
end
|
121
|
+
unless payload.valid?
|
122
|
+
NewRelic::Agent.increment_metric(INVALID_TRACESTATE_PAYLOAD_METRIC)
|
123
|
+
return false
|
124
|
+
end
|
125
|
+
@trace_state_payload = payload
|
126
|
+
end
|
127
|
+
|
128
|
+
def accept_trace_context(header_data)
|
129
|
+
return if ignore_trace_context?
|
130
|
+
|
131
|
+
@trace_context_header_data = header_data
|
132
|
+
transaction.trace_id = header_data.trace_id
|
133
|
+
transaction.parent_span_id = header_data.parent_id
|
134
|
+
|
135
|
+
return false unless payload = assign_trace_state_payload
|
136
|
+
|
137
|
+
transaction.distributed_tracer.parent_transaction_id = payload.transaction_id
|
138
|
+
|
139
|
+
unless payload.sampled.nil?
|
140
|
+
transaction.sampled = payload.sampled
|
141
|
+
transaction.priority = payload.priority if payload.priority
|
142
|
+
end
|
143
|
+
NewRelic::Agent.increment_metric(ACCEPT_SUCCESS_METRIC)
|
144
|
+
true
|
145
|
+
rescue => e
|
146
|
+
NewRelic::Agent.increment_metric(ACCEPT_EXCEPTION_METRIC)
|
147
|
+
NewRelic::Agent.logger.warn('Failed to accept trace context payload', e)
|
148
|
+
false
|
149
|
+
end
|
150
|
+
|
151
|
+
def ignore_trace_context?
|
152
|
+
if trace_context_header_data
|
153
|
+
NewRelic::Agent.increment_metric(IGNORE_MULTIPLE_ACCEPT_METRIC)
|
154
|
+
return true
|
155
|
+
elsif trace_context_inserted?
|
156
|
+
NewRelic::Agent.increment_metric(IGNORE_ACCEPT_AFTER_CREATE_METRIC)
|
157
|
+
return true
|
158
|
+
end
|
159
|
+
false
|
160
|
+
end
|
161
|
+
|
162
|
+
def trace_context_inserted?
|
163
|
+
@trace_context_inserted ||= false
|
164
|
+
end
|
165
|
+
end
|
166
|
+
end
|
167
|
+
end
|
168
|
+
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
|
module NewRelic
|
6
6
|
module Agent
|
@@ -17,15 +17,21 @@ module NewRelic
|
|
17
17
|
|
18
18
|
UNKNOWN_NODE_NAME = '<unknown>'.freeze
|
19
19
|
|
20
|
-
def initialize(metric_name, relative_start, relative_end=nil, params=nil, parent=nil)
|
20
|
+
def initialize(metric_name, relative_start, relative_end = nil, params = nil, parent = nil)
|
21
21
|
@entry_timestamp = relative_start
|
22
|
-
@metric_name
|
23
|
-
@exit_timestamp
|
24
|
-
@children
|
25
|
-
@params
|
26
|
-
|
27
|
-
|
28
|
-
|
22
|
+
@metric_name = metric_name || UNKNOWN_NODE_NAME
|
23
|
+
@exit_timestamp = relative_end
|
24
|
+
@children = nil
|
25
|
+
@params = select_allowed_params(params)
|
26
|
+
@parent_node = parent
|
27
|
+
end
|
28
|
+
|
29
|
+
def select_allowed_params(params)
|
30
|
+
return unless params
|
31
|
+
|
32
|
+
params.select do |p|
|
33
|
+
NewRelic::Agent.instance.attribute_filter.allows_key?(p, AttributeFilter::DST_TRANSACTION_SEGMENTS)
|
34
|
+
end
|
29
35
|
end
|
30
36
|
|
31
37
|
# sets the final timestamp on a node to indicate the exit
|
@@ -38,47 +44,44 @@ module NewRelic
|
|
38
44
|
to_debug_str(0)
|
39
45
|
end
|
40
46
|
|
41
|
-
EMPTY_HASH = {}.freeze
|
42
|
-
EMPTY_ARRAY = [].freeze
|
43
|
-
|
44
47
|
def to_array
|
45
|
-
params = @params
|
46
|
-
[
|
48
|
+
params = @params || NewRelic::EMPTY_HASH
|
49
|
+
[NewRelic::Helper.time_to_millis(@entry_timestamp),
|
47
50
|
NewRelic::Helper.time_to_millis(@exit_timestamp),
|
48
51
|
NewRelic::Coerce.string(@metric_name),
|
49
|
-
params
|
50
|
-
[
|
52
|
+
params] +
|
53
|
+
[(@children ? @children.map { |s| s.to_array } : NewRelic::EMPTY_ARRAY)]
|
51
54
|
end
|
52
55
|
|
53
56
|
def path_string
|
54
|
-
"#{metric_name}[#{children.collect {|node| node.path_string }.join('')}]"
|
57
|
+
"#{metric_name}[#{children.collect { |node| node.path_string }.join('')}]"
|
55
58
|
end
|
56
59
|
|
57
60
|
def to_s_compact
|
58
|
-
str =
|
61
|
+
str = +''
|
59
62
|
str << metric_name
|
60
63
|
if children.any?
|
61
|
-
str << "{#{children.map { |
|
64
|
+
str << "{#{children.map { |cs| cs.to_s_compact }.join(',')}}"
|
62
65
|
end
|
63
66
|
str
|
64
67
|
end
|
65
68
|
|
66
69
|
def to_debug_str(depth)
|
67
|
-
tab =
|
70
|
+
tab = (+' ') * depth
|
68
71
|
s = tab.clone
|
69
|
-
s << ">> #{'%3i ms' % (@entry_timestamp*1000)} [#{self.class.name.split(
|
72
|
+
s << ">> #{'%3i ms' % (@entry_timestamp * 1000)} [#{self.class.name.split('::').last}] #{metric_name} \n"
|
70
73
|
unless params.empty?
|
71
|
-
params.each do |k,v|
|
74
|
+
params.each do |k, v|
|
72
75
|
s << "#{tab} -#{'%-16s' % k}: #{v.to_s[0..80]}\n"
|
73
76
|
end
|
74
77
|
end
|
75
78
|
children.each do |cs|
|
76
79
|
s << cs.to_debug_str(depth + 1)
|
77
80
|
end
|
78
|
-
s << tab +
|
81
|
+
s << tab + '<< '
|
79
82
|
s << case @exit_timestamp
|
80
83
|
when nil then ' n/a'
|
81
|
-
when Numeric then '%3i ms' % (@exit_timestamp*1000)
|
84
|
+
when Numeric then '%3i ms' % (@exit_timestamp * 1000)
|
82
85
|
else @exit_timestamp.to_s
|
83
86
|
end
|
84
87
|
s << " #{metric_name}\n"
|
@@ -108,7 +111,7 @@ module NewRelic
|
|
108
111
|
|
109
112
|
def count_nodes
|
110
113
|
count = 1
|
111
|
-
children.each { |
|
114
|
+
children.each { |node| count += node.count_nodes }
|
112
115
|
count
|
113
116
|
end
|
114
117
|
|
@@ -131,26 +134,27 @@ module NewRelic
|
|
131
134
|
# call the provided block for this node and each
|
132
135
|
# of the called nodes
|
133
136
|
def each_node(&block)
|
134
|
-
|
137
|
+
yield(self)
|
135
138
|
|
136
|
-
|
137
|
-
|
138
|
-
node.each_node(&block)
|
139
|
-
end
|
139
|
+
@children&.each do |node|
|
140
|
+
node.each_node(&block)
|
140
141
|
end
|
141
142
|
end
|
142
143
|
|
143
144
|
# call the provided block for this node and each
|
144
145
|
# of the called nodes while keeping track of nested nodes
|
145
146
|
def each_node_with_nest_tracking(&block)
|
146
|
-
summary =
|
147
|
+
summary = yield(self)
|
147
148
|
summary.current_nest_count += 1 if summary
|
148
149
|
|
150
|
+
# no then branch coverage
|
151
|
+
# rubocop:disable Style/SafeNavigation
|
149
152
|
if @children
|
150
153
|
@children.each do |node|
|
151
154
|
node.each_node_with_nest_tracking(&block)
|
152
155
|
end
|
153
156
|
end
|
157
|
+
# rubocop:enable Style/SafeNavigation
|
154
158
|
|
155
159
|
summary.current_nest_count -= 1 if summary
|
156
160
|
end
|
@@ -1,13 +1,12 @@
|
|
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
|
module NewRelic
|
6
6
|
module Agent
|
7
7
|
class Transaction
|
8
8
|
module Tracing
|
9
|
-
|
10
|
-
attr_reader :current_segment
|
9
|
+
attr_reader :current_segment_by_thread
|
11
10
|
|
12
11
|
def async?
|
13
12
|
@async ||= false
|
@@ -21,10 +20,10 @@ module NewRelic
|
|
21
20
|
|
22
21
|
attr_writer :total_time
|
23
22
|
|
24
|
-
def add_segment
|
23
|
+
def add_segment(segment, parent = nil)
|
25
24
|
segment.transaction = self
|
26
25
|
segment.parent = parent || current_segment
|
27
|
-
|
26
|
+
set_current_segment(segment)
|
28
27
|
if @segments.length < segment_limit
|
29
28
|
@segments << segment
|
30
29
|
else
|
@@ -34,8 +33,13 @@ module NewRelic
|
|
34
33
|
segment.transaction_assigned
|
35
34
|
end
|
36
35
|
|
37
|
-
def segment_complete
|
38
|
-
|
36
|
+
def segment_complete(segment)
|
37
|
+
# if parent was in another thread, remove the current_segment entry for this thread
|
38
|
+
if segment.parent && segment.parent.starting_segment_key != NewRelic::Agent::Tracer.current_segment_key
|
39
|
+
remove_current_segment_by_thread_id(NewRelic::Agent::Tracer.current_segment_key)
|
40
|
+
else
|
41
|
+
set_current_segment(segment.parent)
|
42
|
+
end
|
39
43
|
end
|
40
44
|
|
41
45
|
def segment_limit
|
@@ -48,9 +52,8 @@ module NewRelic
|
|
48
52
|
segments.each { |s| s.finalize }
|
49
53
|
end
|
50
54
|
|
51
|
-
|
52
|
-
|
53
|
-
OTHER_TRANSACTION_TOTAL_TIME = "OtherTransactionTotalTime".freeze
|
55
|
+
WEB_TRANSACTION_TOTAL_TIME = 'WebTransactionTotalTime'.freeze
|
56
|
+
OTHER_TRANSACTION_TOTAL_TIME = 'OtherTransactionTotalTime'.freeze
|
54
57
|
|
55
58
|
def record_total_time_metrics
|
56
59
|
total_time_metric = if recording_web_transaction?
|
@@ -59,8 +62,8 @@ module NewRelic
|
|
59
62
|
OTHER_TRANSACTION_TOTAL_TIME
|
60
63
|
end
|
61
64
|
|
62
|
-
@metrics.record_unscoped
|
63
|
-
@metrics.record_unscoped
|
65
|
+
@metrics.record_unscoped(total_time_metric, total_time)
|
66
|
+
@metrics.record_unscoped("#{total_time_metric}/#{@frozen_name}", total_time)
|
64
67
|
end
|
65
68
|
end
|
66
69
|
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
|
module NewRelic
|
6
6
|
module Agent
|
@@ -9,7 +9,6 @@ module NewRelic
|
|
9
9
|
attr_reader :samples
|
10
10
|
|
11
11
|
SINGLE_BUFFER_MAX = 20
|
12
|
-
NO_SAMPLES = [].freeze
|
13
12
|
|
14
13
|
def initialize
|
15
14
|
@samples = []
|
@@ -35,6 +34,7 @@ module NewRelic
|
|
35
34
|
|
36
35
|
def store(sample)
|
37
36
|
return unless enabled?
|
37
|
+
|
38
38
|
if allow_sample?(sample)
|
39
39
|
add_sample(sample)
|
40
40
|
truncate_samples_if_needed
|
@@ -43,6 +43,7 @@ module NewRelic
|
|
43
43
|
|
44
44
|
def store_previous(previous_samples)
|
45
45
|
return unless enabled?
|
46
|
+
|
46
47
|
previous_samples.each do |sample|
|
47
48
|
add_sample(sample) if allow_sample?(sample)
|
48
49
|
end
|
@@ -62,7 +63,7 @@ module NewRelic
|
|
62
63
|
#
|
63
64
|
# This value will be forcibly capped by the max_capacity
|
64
65
|
def capacity
|
65
|
-
raise NotImplementedError.new(
|
66
|
+
raise NotImplementedError.new('TransactionSampleBuffer subclasses must provide a capacity override')
|
66
67
|
end
|
67
68
|
|
68
69
|
# Apply hard upper limit to the capacity to prevent users from
|
@@ -71,7 +72,7 @@ module NewRelic
|
|
71
72
|
# A typical buffer should NOT override this method (although we do for
|
72
73
|
# odd things like dev-mode)
|
73
74
|
def max_capacity
|
74
|
-
capacity
|
75
|
+
[capacity, SINGLE_BUFFER_MAX].min
|
75
76
|
end
|
76
77
|
|
77
78
|
# Our default truncation strategy is to keep max_capacity
|
@@ -81,7 +82,7 @@ module NewRelic
|
|
81
82
|
# This doesn't use the more convenient #last and #sort_by to avoid
|
82
83
|
# additional array allocations (and abundant alliteration)
|
83
84
|
def truncate_samples
|
84
|
-
@samples.sort!{|a,b| a.duration <=> b.duration}
|
85
|
+
@samples.sort! { |a, b| a.duration <=> b.duration }
|
85
86
|
@samples.slice!(0..-(max_capacity + 1))
|
86
87
|
end
|
87
88
|
|
@@ -98,7 +99,6 @@ module NewRelic
|
|
98
99
|
def add_sample(sample)
|
99
100
|
@samples << sample
|
100
101
|
end
|
101
|
-
|
102
102
|
end
|
103
103
|
end
|
104
104
|
end
|