newrelic_rpm 6.15.0 → 8.13.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +7 -1
- data/.rubocop.yml +1817 -0
- data/.rubocop_todo.yml +59 -0
- data/.simplecov +15 -0
- data/.snyk +11 -0
- data/.yardopts +1 -0
- data/Brewfile +12 -0
- data/CHANGELOG.md +754 -40
- data/CONTRIBUTING.md +32 -5
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Gemfile +0 -1
- data/Guardfile +9 -8
- data/LICENSE +0 -6
- data/README.md +21 -20
- data/Rakefile +27 -29
- data/THIRD_PARTY_NOTICES.md +14 -199
- data/Thorfile +5 -0
- data/bin/newrelic +3 -2
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +76 -53
- data/config.dot +5 -5
- data/docker-compose.yml +107 -0
- data/init.rb +4 -6
- data/install.rb +2 -2
- data/lefthook.yml +9 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +13 -9
- data/lib/new_relic/agent/agent/shutdown.rb +35 -0
- data/lib/new_relic/agent/agent/special_startup.rb +72 -0
- data/lib/new_relic/agent/agent/start_worker_thread.rb +163 -0
- data/lib/new_relic/agent/agent/startup.rb +197 -0
- data/lib/new_relic/agent/agent.rb +178 -555
- data/lib/new_relic/agent/agent_logger.rb +23 -19
- data/lib/new_relic/agent/attribute_filter.rb +66 -47
- data/lib/new_relic/agent/attribute_processing.rb +7 -7
- data/lib/new_relic/agent/attributes.rb +5 -4
- data/lib/new_relic/agent/audit_logger.rb +8 -3
- data/lib/new_relic/agent/autostart.rb +20 -19
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +3 -3
- data/lib/new_relic/agent/commands/agent_command_router.rb +12 -11
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +9 -7
- data/lib/new_relic/agent/configuration/default_source.rb +1728 -1194
- data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
- data/lib/new_relic/agent/configuration/environment_source.rb +11 -9
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +40 -17
- data/lib/new_relic/agent/configuration/high_security_source.rb +9 -8
- data/lib/new_relic/agent/configuration/manager.rb +82 -69
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
- data/lib/new_relic/agent/configuration/security_policy_source.rb +90 -77
- data/lib/new_relic/agent/configuration/server_source.rb +21 -19
- data/lib/new_relic/agent/configuration/yaml_source.rb +31 -7
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +18 -18
- data/lib/new_relic/agent/connect/response_handler.rb +5 -8
- data/lib/new_relic/agent/custom_event_aggregator.rb +14 -14
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +4 -5
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +14 -13
- data/lib/new_relic/agent/database/obfuscator.rb +2 -2
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
- data/lib/new_relic/agent/database.rb +53 -47
- data/lib/new_relic/agent/database_adapter.rb +3 -1
- data/lib/new_relic/agent/datastores/metric_helper.rb +17 -18
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +6 -10
- data/lib/new_relic/agent/datastores/mongo.rb +6 -11
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +5 -11
- data/lib/new_relic/agent/datastores.rb +11 -13
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +10 -10
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +39 -32
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -22
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +19 -19
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +50 -52
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +5 -6
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +76 -77
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +39 -38
- data/lib/new_relic/agent/distributed_tracing.rb +32 -100
- data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
- data/lib/new_relic/agent/error_collector.rb +73 -54
- data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +4 -3
- data/lib/new_relic/agent/event_aggregator.rb +22 -21
- data/lib/new_relic/agent/event_buffer.rb +7 -8
- data/lib/new_relic/agent/event_listener.rb +1 -2
- data/lib/new_relic/agent/event_loop.rb +25 -23
- data/lib/new_relic/agent/external.rb +11 -44
- data/lib/new_relic/agent/guid_generator.rb +4 -11
- data/lib/new_relic/agent/harvester.rb +4 -5
- data/lib/new_relic/agent/heap.rb +6 -8
- data/lib/new_relic/agent/hostname.rb +20 -13
- data/lib/new_relic/agent/http_clients/abstract.rb +10 -11
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +6 -11
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +8 -9
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -5
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +2 -4
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +8 -4
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +4 -5
- data/lib/new_relic/agent/http_clients/uri_util.rb +1 -3
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +8 -8
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +38 -31
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +12 -13
- data/lib/new_relic/agent/instrumentation/active_job.rb +14 -7
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
- data/lib/new_relic/agent/instrumentation/active_record.rb +29 -27
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +71 -61
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +31 -44
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +4 -4
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +27 -20
- data/lib/new_relic/agent/instrumentation/active_storage.rb +2 -2
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +18 -15
- 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/acts_as_solr.rb +18 -10
- data/lib/new_relic/agent/instrumentation/authlogic.rb +10 -2
- 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 +11 -154
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +68 -58
- 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 +11 -243
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +65 -54
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +35 -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 +29 -53
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -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 +5 -5
- data/lib/new_relic/agent/instrumentation/excon.rb +22 -24
- 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 +11 -112
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -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 +10 -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 +4 -5
- 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 +57 -128
- 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 +101 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +56 -72
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +13 -12
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +5 -7
- data/lib/new_relic/agent/instrumentation/mongo.rb +5 -136
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +21 -18
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/{net_prepend.rb → net_http/instrumentation.rb} +13 -13
- 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 +10 -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 +20 -58
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +3 -3
- data/lib/new_relic/agent/instrumentation/queue_time.rb +8 -9
- 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 +30 -140
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +16 -52
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +5 -4
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +3 -3
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +3 -2
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +13 -3
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +149 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +16 -157
- 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 +72 -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 +18 -107
- 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 +28 -39
- data/lib/new_relic/agent/instrumentation/sequel.rb +14 -16
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +2 -2
- 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 +23 -64
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -36
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +125 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -2
- data/lib/new_relic/agent/instrumentation/sinatra.rb +34 -163
- data/lib/new_relic/agent/instrumentation/sunspot.rb +11 -3
- 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 +41 -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 +12 -91
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +2 -2
- data/lib/new_relic/agent/javascript_instrumentor.rb +47 -41
- 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 +1 -1
- data/lib/new_relic/agent/log_priority.rb +20 -0
- data/lib/new_relic/agent/logging.rb +24 -21
- data/lib/new_relic/agent/memory_logger.rb +2 -2
- data/lib/new_relic/agent/messaging.rb +65 -81
- data/lib/new_relic/agent/method_tracer.rb +154 -149
- data/lib/new_relic/agent/method_tracer_helpers.rb +85 -3
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +25 -17
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +5 -4
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -2
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +6 -9
- data/lib/new_relic/agent/monitors.rb +6 -7
- data/lib/new_relic/agent/new_relic_service/encoders.rb +6 -6
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +5 -5
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -4
- data/lib/new_relic/agent/new_relic_service.rb +248 -196
- data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -5
- data/lib/new_relic/agent/null_logger.rb +7 -3
- data/lib/new_relic/agent/obfuscator.rb +8 -10
- data/lib/new_relic/agent/parameter_filtering.rb +24 -10
- data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
- data/lib/new_relic/agent/pipe_channel_manager.rb +27 -17
- data/lib/new_relic/agent/pipe_service.rb +8 -5
- data/lib/new_relic/agent/prepend_supportability.rb +2 -2
- data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -11
- data/lib/new_relic/agent/range_extensions.rb +8 -28
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -13
- data/lib/new_relic/agent/rules_engine.rb +5 -4
- data/lib/new_relic/agent/sampler.rb +3 -4
- data/lib/new_relic/agent/sampler_collection.rb +3 -4
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +3 -2
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +12 -9
- data/lib/new_relic/agent/samplers/memory_sampler.rb +24 -13
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
- data/lib/new_relic/agent/span_event_aggregator.rb +12 -12
- data/lib/new_relic/agent/span_event_primitive.rb +62 -56
- data/lib/new_relic/agent/sql_sampler.rb +18 -18
- data/lib/new_relic/agent/stats.rb +78 -41
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +9 -11
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +12 -13
- data/lib/new_relic/agent/stats_engine.rb +8 -8
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +7 -8
- data/lib/new_relic/agent/system_info.rb +85 -65
- data/lib/new_relic/agent/threading/agent_thread.rb +18 -14
- data/lib/new_relic/agent/threading/backtrace_node.rb +12 -13
- data/lib/new_relic/agent/threading/backtrace_service.rb +14 -14
- data/lib/new_relic/agent/threading/thread_profile.rb +23 -23
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +76 -85
- data/lib/new_relic/agent/transaction/abstract_segment.rb +103 -40
- data/lib/new_relic/agent/transaction/datastore_segment.rb +21 -17
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +63 -56
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +43 -44
- data/lib/new_relic/agent/transaction/external_request_segment.rb +44 -34
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +31 -36
- data/lib/new_relic/agent/transaction/request_attributes.rb +35 -35
- data/lib/new_relic/agent/transaction/segment.rb +14 -10
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/trace.rb +15 -11
- data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
- data/lib/new_relic/agent/transaction/trace_context.rb +35 -35
- data/lib/new_relic/agent/transaction/trace_node.rb +25 -24
- data/lib/new_relic/agent/transaction/tracing.rb +14 -11
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +4 -4
- data/lib/new_relic/agent/transaction.rb +164 -145
- data/lib/new_relic/agent/transaction_error_primitive.rb +27 -25
- data/lib/new_relic/agent/transaction_event_aggregator.rb +12 -12
- data/lib/new_relic/agent/transaction_event_primitive.rb +32 -33
- data/lib/new_relic/agent/transaction_event_recorder.rb +16 -15
- data/lib/new_relic/agent/transaction_metrics.rb +10 -9
- data/lib/new_relic/agent/transaction_sampler.rb +5 -6
- data/lib/new_relic/agent/transaction_time_aggregator.rb +26 -25
- data/lib/new_relic/agent/utilization/aws.rb +33 -3
- data/lib/new_relic/agent/utilization/azure.rb +3 -3
- data/lib/new_relic/agent/utilization/gcp.rb +7 -7
- data/lib/new_relic/agent/utilization/pcf.rb +5 -4
- data/lib/new_relic/agent/utilization/vendor.rb +43 -28
- data/lib/new_relic/agent/utilization_data.rb +7 -5
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +2 -2
- data/lib/new_relic/agent/vm/mri_vm.rb +40 -15
- data/lib/new_relic/agent/vm/snapshot.rb +5 -5
- data/lib/new_relic/agent/vm.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +10 -12
- data/lib/new_relic/agent.rb +64 -75
- data/lib/new_relic/cli/command.rb +20 -22
- data/lib/new_relic/cli/commands/deployments.rb +92 -42
- data/lib/new_relic/cli/commands/install.rb +12 -15
- data/lib/new_relic/coerce.rb +15 -13
- data/lib/new_relic/collection_helper.rb +50 -48
- data/lib/new_relic/constants.rb +1 -4
- data/lib/new_relic/control/class_methods.rb +3 -3
- data/lib/new_relic/control/frameworks/external.rb +2 -2
- data/lib/new_relic/control/frameworks/rails.rb +23 -17
- data/lib/new_relic/control/frameworks/rails3.rb +3 -4
- data/lib/new_relic/control/frameworks/rails4.rb +1 -1
- data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
- data/lib/new_relic/control/frameworks/ruby.rb +3 -3
- data/lib/new_relic/control/frameworks/sinatra.rb +7 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/instance_methods.rb +23 -45
- data/lib/new_relic/control/instrumentation.rb +39 -11
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +3 -4
- data/lib/new_relic/control.rb +1 -2
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +126 -19
- data/lib/new_relic/environment_report.rb +40 -32
- data/lib/new_relic/helper.rb +48 -7
- data/lib/new_relic/language_support.rb +29 -5
- data/lib/new_relic/latest_changes.rb +7 -6
- data/lib/new_relic/local_environment.rb +24 -18
- data/lib/new_relic/metric_data.rb +31 -26
- data/lib/new_relic/metric_spec.rb +8 -6
- data/lib/new_relic/noticed_error.rb +22 -30
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +5 -3
- data/lib/new_relic/rack/browser_monitoring.rb +133 -123
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +3 -61
- data/lib/new_relic/recipes/capistrano_legacy.rb +23 -26
- data/lib/new_relic/recipes/helpers/send_deployment.rb +69 -0
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +9 -10
- data/lib/new_relic/traced_thread.rb +35 -0
- data/lib/new_relic/version.rb +6 -17
- data/lib/newrelic_rpm.rb +11 -35
- data/lib/sequel/extensions/newrelic_instrumentation.rb +12 -15
- data/lib/sequel/plugins/newrelic_instrumentation.rb +4 -10
- data/lib/tasks/all.rb +3 -3
- data/lib/tasks/config.rake +22 -117
- data/lib/tasks/coverage_report.rake +28 -0
- data/lib/tasks/helpers/config.html.erb +21 -0
- data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -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 +4 -0
- 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 +124 -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 +5 -32
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +10 -15
- data/newrelic.yml +648 -3
- data/newrelic_rpm.gemspec +25 -25
- data/recipes/newrelic.rb +2 -2
- data/test/agent_helper.rb +219 -178
- metadata +164 -122
- data/ROADMAP.md +0 -24
- data/bin/mongrel_rpm +0 -33
- data/cert/cacert.pem +0 -1177
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
- data/lib/new_relic/agent/instrumentation/http.rb +0 -49
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
- data/lib/new_relic/agent/instrumentation/net.rb +0 -70
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
- data/lib/new_relic/agent/supported_versions.rb +0 -275
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/tasks/config.html.erb +0 -32
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
# This module is intended to provide access to information about the host OS and
|
6
6
|
# [virtual] machine. It intentionally does no caching and maintains no state -
|
@@ -39,54 +39,69 @@ module NewRelic
|
|
39
39
|
@processor_info = nil
|
40
40
|
end
|
41
41
|
|
42
|
-
def self.
|
43
|
-
if @processor_info
|
44
|
-
if darwin?
|
45
|
-
@processor_info = {
|
46
|
-
:num_physical_packages => sysctl_value('hw.packages').to_i,
|
47
|
-
:num_physical_cores => sysctl_value('hw.physicalcpu_max').to_i,
|
48
|
-
:num_logical_processors => sysctl_value('hw.logicalcpu_max').to_i
|
49
|
-
}
|
50
|
-
# in case those don't work, try backup values
|
51
|
-
if @processor_info[:num_physical_cores] <= 0
|
52
|
-
@processor_info[:num_physical_cores] = sysctl_value('hw.physicalcpu').to_i
|
53
|
-
end
|
54
|
-
if @processor_info[:num_logical_processors] <= 0
|
55
|
-
@processor_info[:num_logical_processors] = sysctl_value('hw.logicalcpu').to_i
|
56
|
-
end
|
57
|
-
if @processor_info[:num_logical_processors] <= 0
|
58
|
-
@processor_info[:num_logical_processors] = sysctl_value('hw.ncpu').to_i
|
59
|
-
end
|
60
|
-
|
61
|
-
elsif linux?
|
62
|
-
cpuinfo = proc_try_read('/proc/cpuinfo')
|
63
|
-
@processor_info = cpuinfo ? parse_cpuinfo(cpuinfo) : {}
|
42
|
+
def self.processor_info
|
43
|
+
return @processor_info if @processor_info
|
64
44
|
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
# give nils for obviously wrong values
|
74
|
-
@processor_info.keys.each do |key|
|
75
|
-
value = @processor_info[key]
|
76
|
-
if value.is_a?(Numeric) && value <= 0
|
77
|
-
@processor_info[key] = nil
|
78
|
-
end
|
79
|
-
end
|
45
|
+
if darwin?
|
46
|
+
processor_info_darwin
|
47
|
+
elsif linux?
|
48
|
+
processor_info_linux
|
49
|
+
elsif bsd?
|
50
|
+
processor_info_bsd
|
51
|
+
else
|
52
|
+
raise "Couldn't determine OS"
|
80
53
|
end
|
54
|
+
remove_bad_values
|
81
55
|
|
82
56
|
@processor_info
|
83
57
|
rescue
|
84
|
-
|
58
|
+
@processor_info = NewRelic::EMPTY_HASH
|
59
|
+
end
|
60
|
+
|
61
|
+
def self.processor_info_darwin
|
62
|
+
@processor_info = {
|
63
|
+
num_physical_packages: sysctl_value('hw.packages'),
|
64
|
+
num_physical_cores: sysctl_value('hw.physicalcpu_max'),
|
65
|
+
num_logical_processors: sysctl_value('hw.logicalcpu_max')
|
66
|
+
}
|
67
|
+
# in case those don't work, try backup values
|
68
|
+
if @processor_info[:num_physical_cores] <= 0
|
69
|
+
@processor_info[:num_physical_cores] = sysctl_value('hw.physicalcpu')
|
70
|
+
end
|
71
|
+
if @processor_info[:num_logical_processors] <= 0
|
72
|
+
@processor_info[:num_logical_processors] = sysctl_value('hw.logicalcpu')
|
73
|
+
end
|
74
|
+
if @processor_info[:num_logical_processors] <= 0
|
75
|
+
@processor_info[:num_logical_processors] = sysctl_value('hw.ncpu')
|
76
|
+
end
|
77
|
+
end
|
78
|
+
|
79
|
+
def self.processor_info_linux
|
80
|
+
cpuinfo = proc_try_read('/proc/cpuinfo')
|
81
|
+
@processor_info = cpuinfo ? parse_cpuinfo(cpuinfo) : NewRelic::EMPTY_HASH
|
82
|
+
end
|
83
|
+
|
84
|
+
def self.processor_info_bsd
|
85
|
+
@processor_info = {
|
86
|
+
num_physical_packages: nil,
|
87
|
+
num_physical_cores: nil,
|
88
|
+
num_logical_processors: sysctl_value('hw.ncpu')
|
89
|
+
}
|
90
|
+
end
|
91
|
+
|
92
|
+
def self.remove_bad_values
|
93
|
+
# give nils for obviously wrong values
|
94
|
+
@processor_info.keys.each do |key|
|
95
|
+
value = @processor_info[key]
|
96
|
+
if value.is_a?(Numeric) && value <= 0
|
97
|
+
@processor_info[key] = nil
|
98
|
+
end
|
99
|
+
end
|
85
100
|
end
|
86
101
|
|
87
102
|
def self.sysctl_value(name)
|
88
103
|
# make sure to redirect stderr so we don't spew if the name is unknown
|
89
|
-
`sysctl -n #{name} 2>/dev/null
|
104
|
+
`sysctl -n #{name} 2>/dev/null`.to_i
|
90
105
|
end
|
91
106
|
|
92
107
|
def self.parse_cpuinfo(cpuinfo)
|
@@ -111,9 +126,9 @@ module NewRelic
|
|
111
126
|
end
|
112
127
|
cores[[phys_id, core_id]] += 1 if phys_id && core_id
|
113
128
|
|
114
|
-
num_physical_packages
|
115
|
-
num_physical_cores
|
116
|
-
num_logical_processors = cores.values.reduce(0
|
129
|
+
num_physical_packages = cores.keys.map(&:first).uniq.size
|
130
|
+
num_physical_cores = cores.size
|
131
|
+
num_logical_processors = cores.values.reduce(0, :+)
|
117
132
|
|
118
133
|
if num_physical_cores == 0
|
119
134
|
num_logical_processors = total_processors
|
@@ -127,25 +142,27 @@ module NewRelic
|
|
127
142
|
# Some older, single-core processors might not list ids,
|
128
143
|
# so we'll just mark them all 1.
|
129
144
|
num_physical_packages = 1
|
130
|
-
num_physical_cores
|
145
|
+
num_physical_cores = 1
|
131
146
|
else
|
132
147
|
# We have no way of knowing how many packages or cores
|
133
148
|
# we have, even though we know how many processors there are.
|
134
149
|
num_physical_packages = nil
|
135
|
-
num_physical_cores
|
150
|
+
num_physical_cores = nil
|
136
151
|
end
|
137
152
|
end
|
138
153
|
|
139
154
|
{
|
140
|
-
:num_physical_packages
|
141
|
-
:num_physical_cores
|
155
|
+
:num_physical_packages => num_physical_packages,
|
156
|
+
:num_physical_cores => num_physical_cores,
|
142
157
|
:num_logical_processors => num_logical_processors
|
143
158
|
}
|
144
159
|
end
|
145
160
|
|
146
|
-
def self.num_physical_packages
|
147
|
-
|
148
|
-
def self.
|
161
|
+
def self.num_physical_packages; processor_info[:num_physical_packages] end
|
162
|
+
|
163
|
+
def self.num_physical_cores; processor_info[:num_physical_cores] end
|
164
|
+
|
165
|
+
def self.num_logical_processors; processor_info[:num_logical_processors] end
|
149
166
|
|
150
167
|
def self.processor_arch
|
151
168
|
RbConfig::CONFIG['target_cpu']
|
@@ -156,7 +173,7 @@ module NewRelic
|
|
156
173
|
end
|
157
174
|
|
158
175
|
def self.docker_container_id
|
159
|
-
return unless ruby_os_identifier
|
176
|
+
return unless ruby_os_identifier.include?('linux')
|
160
177
|
|
161
178
|
cgroup_info = proc_try_read('/proc/self/cgroup')
|
162
179
|
return unless cgroup_info
|
@@ -178,14 +195,14 @@ module NewRelic
|
|
178
195
|
return
|
179
196
|
end
|
180
197
|
# docker native driver with systemd
|
181
|
-
when '/'
|
198
|
+
when '/' then nil
|
182
199
|
# in a cgroup, but we don't recognize its format
|
183
|
-
when /docker\/.*[^0-9a-f]/
|
200
|
+
when /docker\/.*[^0-9a-f]/
|
184
201
|
::NewRelic::Agent.logger.debug("Cgroup indicates docker but container_id has invalid characters: '#{cpu_cgroup}'")
|
185
202
|
return
|
186
|
-
when /docker/
|
203
|
+
when /docker/
|
187
204
|
::NewRelic::Agent.logger.debug("Cgroup indicates docker but container_id unrecognized: '#{cpu_cgroup}'")
|
188
|
-
::NewRelic::Agent.increment_metric
|
205
|
+
::NewRelic::Agent.increment_metric("Supportability/utilization/docker/error")
|
189
206
|
return
|
190
207
|
else
|
191
208
|
::NewRelic::Agent.logger.debug("Ignoring unrecognized cgroup ID format: '#{cpu_cgroup}'")
|
@@ -194,7 +211,7 @@ module NewRelic
|
|
194
211
|
|
195
212
|
if container_id && container_id.size != 64
|
196
213
|
::NewRelic::Agent.logger.debug("Found docker container_id with invalid length: #{container_id}")
|
197
|
-
::NewRelic::Agent.increment_metric
|
214
|
+
::NewRelic::Agent.increment_metric("Supportability/utilization/docker/error")
|
198
215
|
nil
|
199
216
|
else
|
200
217
|
container_id
|
@@ -207,6 +224,7 @@ module NewRelic
|
|
207
224
|
cgroup_info.split("\n").each do |line|
|
208
225
|
parts = line.split(':')
|
209
226
|
next unless parts.size == 3
|
227
|
+
|
210
228
|
_, subsystems, cgroup_id = parts
|
211
229
|
subsystems = subsystems.split(',')
|
212
230
|
subsystems.each do |subsystem|
|
@@ -223,7 +241,8 @@ module NewRelic
|
|
223
241
|
# for details on why we do it this way.
|
224
242
|
def self.proc_try_read(path)
|
225
243
|
return nil unless File.exist?(path)
|
226
|
-
|
244
|
+
|
245
|
+
content = String.new('')
|
227
246
|
File.open(path) do |f|
|
228
247
|
loop do
|
229
248
|
begin
|
@@ -241,12 +260,12 @@ module NewRelic
|
|
241
260
|
|
242
261
|
def self.ram_in_mib
|
243
262
|
if darwin?
|
244
|
-
(sysctl_value('hw.memsize')
|
263
|
+
(sysctl_value('hw.memsize') / (1024**2))
|
245
264
|
elsif linux?
|
246
265
|
meminfo = proc_try_read('/proc/meminfo')
|
247
266
|
parse_linux_meminfo_in_mib(meminfo)
|
248
267
|
elsif bsd?
|
249
|
-
(sysctl_value('hw.realmem')
|
268
|
+
(sysctl_value('hw.realmem') / (1024**2))
|
250
269
|
else
|
251
270
|
::NewRelic::Agent.logger.debug("Unable to determine ram_in_mib for host os: #{ruby_os_identifier}")
|
252
271
|
nil
|
@@ -254,7 +273,7 @@ module NewRelic
|
|
254
273
|
end
|
255
274
|
|
256
275
|
def self.parse_linux_meminfo_in_mib(meminfo)
|
257
|
-
if meminfo && mem_total = meminfo[/MemTotal:\s*(\d*)\skB/,1]
|
276
|
+
if meminfo && mem_total = meminfo[/MemTotal:\s*(\d*)\skB/, 1]
|
258
277
|
(mem_total.to_i / 1024).to_i
|
259
278
|
else
|
260
279
|
::NewRelic::Agent.logger.debug("Failed to parse MemTotal from /proc/meminfo: #{meminfo}")
|
@@ -264,13 +283,14 @@ module NewRelic
|
|
264
283
|
|
265
284
|
def self.boot_id
|
266
285
|
return nil unless linux?
|
286
|
+
|
267
287
|
if bid = proc_try_read('/proc/sys/kernel/random/boot_id')
|
268
288
|
bid.chomp!
|
269
289
|
|
270
290
|
if bid.ascii_only?
|
271
291
|
if bid.empty?
|
272
292
|
::NewRelic::Agent.logger.debug("boot_id not found in /proc/sys/kernel/random/boot_id")
|
273
|
-
::NewRelic::Agent.increment_metric
|
293
|
+
::NewRelic::Agent.increment_metric("Supportability/utilization/boot_id/error")
|
274
294
|
nil
|
275
295
|
|
276
296
|
elsif bid.bytesize == 36
|
@@ -278,19 +298,19 @@ module NewRelic
|
|
278
298
|
|
279
299
|
else
|
280
300
|
::NewRelic::Agent.logger.debug("Found boot_id with invalid length: #{bid}")
|
281
|
-
::NewRelic::Agent.increment_metric
|
282
|
-
bid[0,128]
|
301
|
+
::NewRelic::Agent.increment_metric("Supportability/utilization/boot_id/error")
|
302
|
+
bid[0, 128]
|
283
303
|
|
284
304
|
end
|
285
305
|
else
|
286
306
|
::NewRelic::Agent.logger.debug("Found boot_id with non-ASCII characters: #{bid}")
|
287
|
-
::NewRelic::Agent.increment_metric
|
307
|
+
::NewRelic::Agent.increment_metric("Supportability/utilization/boot_id/error")
|
288
308
|
nil
|
289
309
|
|
290
310
|
end
|
291
311
|
else
|
292
312
|
::NewRelic::Agent.logger.debug("boot_id not found in /proc/sys/kernel/random/boot_id")
|
293
|
-
::NewRelic::Agent.increment_metric
|
313
|
+
::NewRelic::Agent.increment_metric("Supportability/utilization/boot_id/error")
|
294
314
|
nil
|
295
315
|
|
296
316
|
end
|
@@ -1,28 +1,31 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
7
7
|
module Threading
|
8
8
|
class AgentThread
|
9
|
-
|
10
9
|
def self.create(label, &blk)
|
11
|
-
::NewRelic::Agent.logger.debug("Creating
|
12
|
-
wrapped_blk =
|
10
|
+
::NewRelic::Agent.logger.debug("Creating AgentThread: #{label}")
|
11
|
+
wrapped_blk = proc do
|
12
|
+
if ::Thread.current[:newrelic_tracer_state] && Thread.current[:newrelic_tracer_state].current_transaction
|
13
|
+
txn = ::Thread.current[:newrelic_tracer_state].current_transaction
|
14
|
+
::NewRelic::Agent.logger.warn("AgentThread created with current transaction #{txn.best_name}")
|
15
|
+
end
|
13
16
|
begin
|
14
|
-
|
17
|
+
yield
|
15
18
|
rescue => e
|
16
|
-
::NewRelic::Agent.logger.error("
|
19
|
+
::NewRelic::Agent.logger.error("AgentThread #{label} exited with error", e)
|
17
20
|
rescue Exception => e
|
18
|
-
::NewRelic::Agent.logger.error("
|
21
|
+
::NewRelic::Agent.logger.error("AgentThread #{label} exited with exception. Re-raising in case of interrupt.", e)
|
19
22
|
raise
|
20
23
|
ensure
|
21
|
-
::NewRelic::Agent.logger.debug("Exiting
|
24
|
+
::NewRelic::Agent.logger.debug("Exiting AgentThread: #{label}")
|
22
25
|
end
|
23
26
|
end
|
24
|
-
|
25
|
-
thread = backing_thread_class.new(&wrapped_blk)
|
27
|
+
thread = nil
|
28
|
+
NewRelic::Agent.disable_all_tracing { thread = backing_thread_class.new(&wrapped_blk) }
|
26
29
|
thread[:newrelic_label] = label
|
27
30
|
thread
|
28
31
|
end
|
@@ -33,16 +36,16 @@ module NewRelic
|
|
33
36
|
backing_thread_class.list
|
34
37
|
end
|
35
38
|
|
36
|
-
def self.bucket_thread(thread, profile_agent_code) #THREAD_LOCAL_ACCESS
|
39
|
+
def self.bucket_thread(thread, profile_agent_code) # THREAD_LOCAL_ACCESS
|
37
40
|
if thread.key?(:newrelic_label)
|
38
41
|
profile_agent_code ? :agent : :ignore
|
39
42
|
else
|
40
43
|
state = Tracer.state_for(thread)
|
41
|
-
txn
|
44
|
+
txn = state.current_transaction
|
42
45
|
|
43
|
-
if
|
46
|
+
if txn && !txn.recording_web_transaction?
|
44
47
|
:background
|
45
|
-
elsif txn &&
|
48
|
+
elsif txn && txn.recording_web_transaction?
|
46
49
|
:request
|
47
50
|
else
|
48
51
|
:other
|
@@ -57,6 +60,7 @@ module NewRelic
|
|
57
60
|
::NewRelic::Agent.logger.debug("Failed to backtrace #{thread.inspect}: #{e.class.name}: #{e.to_s}")
|
58
61
|
end
|
59
62
|
return nil unless bt
|
63
|
+
|
60
64
|
bt.reject! { |t| t.include?('/newrelic_rpm-') } unless profile_agent_code
|
61
65
|
bt
|
62
66
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -13,12 +13,12 @@ module NewRelic
|
|
13
13
|
|
14
14
|
def initialize
|
15
15
|
@children = []
|
16
|
-
@depth
|
16
|
+
@depth = 0
|
17
17
|
end
|
18
18
|
|
19
19
|
def add_child_unless_present(child)
|
20
20
|
child.depth = @depth + 1
|
21
|
-
@children << child unless @children.include?
|
21
|
+
@children << child unless @children.include?(child)
|
22
22
|
end
|
23
23
|
|
24
24
|
def add_child(child)
|
@@ -31,7 +31,6 @@ module NewRelic
|
|
31
31
|
end
|
32
32
|
end
|
33
33
|
|
34
|
-
|
35
34
|
class BacktraceRoot < BacktraceBase
|
36
35
|
attr_reader :flattened
|
37
36
|
|
@@ -71,16 +70,15 @@ module NewRelic
|
|
71
70
|
end
|
72
71
|
|
73
72
|
def dump_string
|
74
|
-
result = "#<BacktraceRoot:#{object_id}>"
|
73
|
+
result = String.new("#<BacktraceRoot:#{object_id}>")
|
75
74
|
child_results = @children.map { |c| c.dump_string(2) }.join("\n")
|
76
75
|
result << "\n" unless child_results.empty?
|
77
76
|
result << child_results
|
78
77
|
end
|
79
78
|
end
|
80
79
|
|
81
|
-
|
82
80
|
class BacktraceNode < BacktraceBase
|
83
|
-
attr_reader
|
81
|
+
attr_reader :file, :method, :line_no, :raw_line, :as_array
|
84
82
|
attr_accessor :runnable_count, :depth
|
85
83
|
|
86
84
|
def initialize(line)
|
@@ -92,8 +90,8 @@ module NewRelic
|
|
92
90
|
|
93
91
|
def ==(other)
|
94
92
|
(
|
95
|
-
@raw_line
|
96
|
-
@depth
|
93
|
+
@raw_line == other.raw_line &&
|
94
|
+
@depth == other.depth &&
|
97
95
|
@runnable_count == other.runnable_count
|
98
96
|
)
|
99
97
|
end
|
@@ -115,10 +113,12 @@ module NewRelic
|
|
115
113
|
@as_array << child_arrays
|
116
114
|
end
|
117
115
|
|
118
|
-
def dump_string(indent=0)
|
116
|
+
def dump_string(indent = 0)
|
119
117
|
@file, @method, @line_no = parse_backtrace_frame(@raw_line)
|
120
|
-
|
121
|
-
|
118
|
+
indentation = ' ' * indent
|
119
|
+
result = String.new("#{indentation}#<BacktraceNode:#{object_id} ) + \
|
120
|
+
[#{@runnable_count}] #{@file}:#{@line_no} in #{@method}>")
|
121
|
+
child_results = @children.map { |c| c.dump_string(indent + 2) }.join("\n")
|
122
122
|
result << "\n" unless child_results.empty?
|
123
123
|
result << child_results
|
124
124
|
end
|
@@ -129,7 +129,6 @@ module NewRelic
|
|
129
129
|
[$1, $4, $3] # sic
|
130
130
|
end
|
131
131
|
end
|
132
|
-
|
133
132
|
end
|
134
133
|
end
|
135
134
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -20,10 +20,10 @@ module NewRelic
|
|
20
20
|
end
|
21
21
|
|
22
22
|
attr_reader :worker_loop, :buffer, :effective_polling_period,
|
23
|
-
|
23
|
+
:overhead_percent_threshold
|
24
24
|
attr_accessor :worker_thread, :profile_agent_code
|
25
25
|
|
26
|
-
def initialize(event_listener=nil)
|
26
|
+
def initialize(event_listener = nil)
|
27
27
|
@profiles = {}
|
28
28
|
@buffer = {}
|
29
29
|
@last_poll = nil
|
@@ -52,7 +52,7 @@ module NewRelic
|
|
52
52
|
@running
|
53
53
|
end
|
54
54
|
|
55
|
-
def subscribe(transaction_name, command_arguments={})
|
55
|
+
def subscribe(transaction_name, command_arguments = {})
|
56
56
|
if self.class.is_resque?
|
57
57
|
NewRelic::Agent.logger.info("Backtracing threads on Resque is not supported, so not subscribing transaction '#{transaction_name}'")
|
58
58
|
return
|
@@ -105,7 +105,7 @@ module NewRelic
|
|
105
105
|
@lock.synchronize do
|
106
106
|
if @profiles[transaction_name]
|
107
107
|
profile = @profiles.delete(transaction_name)
|
108
|
-
profile.finished_at =
|
108
|
+
profile.finished_at = Process.clock_gettime(Process::CLOCK_REALTIME)
|
109
109
|
@profiles[transaction_name] = ThreadProfile.new(profile.command_arguments)
|
110
110
|
profile
|
111
111
|
end
|
@@ -113,11 +113,11 @@ module NewRelic
|
|
113
113
|
end
|
114
114
|
|
115
115
|
def on_transaction_finished(payload)
|
116
|
-
name
|
117
|
-
start
|
116
|
+
name = payload[:name]
|
117
|
+
start = payload[:start_timestamp]
|
118
118
|
duration = payload[:duration]
|
119
|
-
thread
|
120
|
-
bucket
|
119
|
+
thread = payload[:thread] || Thread.current
|
120
|
+
bucket = payload[:bucket]
|
121
121
|
@lock.synchronize do
|
122
122
|
backtraces = @buffer.delete(thread)
|
123
123
|
if backtraces && @profiles.has_key?(name)
|
@@ -151,6 +151,7 @@ module NewRelic
|
|
151
151
|
# This method is expected to be called with @lock held
|
152
152
|
def stop
|
153
153
|
return unless @running
|
154
|
+
|
154
155
|
@running = false
|
155
156
|
self.worker_loop.stop
|
156
157
|
|
@@ -163,7 +164,7 @@ module NewRelic
|
|
163
164
|
end
|
164
165
|
|
165
166
|
def poll
|
166
|
-
poll_start =
|
167
|
+
poll_start = Process.clock_gettime(Process::CLOCK_REALTIME)
|
167
168
|
|
168
169
|
@lock.synchronize do
|
169
170
|
AgentThread.list.each do |thread|
|
@@ -173,7 +174,7 @@ module NewRelic
|
|
173
174
|
@buffer.delete_if { |thread, _| !thread.alive? }
|
174
175
|
end
|
175
176
|
|
176
|
-
end_time =
|
177
|
+
end_time = Process.clock_gettime(Process::CLOCK_REALTIME)
|
177
178
|
adjust_polling_time(end_time, poll_start)
|
178
179
|
record_supportability_metrics(end_time, poll_start)
|
179
180
|
end
|
@@ -197,7 +198,7 @@ module NewRelic
|
|
197
198
|
# This method is expected to be called with @lock held
|
198
199
|
def watching_for_transaction?
|
199
200
|
@profiles.size > 1 ||
|
200
|
-
|
201
|
+
(@profiles.size == 1 && @profiles[ALL_TRANSACTIONS].nil?)
|
201
202
|
end
|
202
203
|
|
203
204
|
def allowed_bucket?(bucket)
|
@@ -230,7 +231,7 @@ module NewRelic
|
|
230
231
|
bucket = AgentThread.bucket_thread(thread, @profile_agent_code)
|
231
232
|
|
232
233
|
if need_backtrace?(bucket)
|
233
|
-
timestamp =
|
234
|
+
timestamp = Process.clock_gettime(Process::CLOCK_REALTIME)
|
234
235
|
backtrace = AgentThread.scrub_backtrace(thread, @profile_agent_code)
|
235
236
|
aggregate_global_backtrace(backtrace, bucket, thread)
|
236
237
|
buffer_backtrace_for_thread(thread, timestamp, backtrace, bucket)
|
@@ -277,7 +278,6 @@ module NewRelic
|
|
277
278
|
end
|
278
279
|
@last_poll = poll_start
|
279
280
|
end
|
280
|
-
|
281
281
|
end
|
282
282
|
end
|
283
283
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'set'
|
6
6
|
require 'new_relic/agent/worker_loop'
|
@@ -11,27 +11,25 @@ require 'new_relic/agent/threading/backtrace_node'
|
|
11
11
|
module NewRelic
|
12
12
|
module Agent
|
13
13
|
module Threading
|
14
|
-
|
15
14
|
class ThreadProfile
|
16
|
-
|
17
15
|
attr_reader :profile_id, :traces, :sample_period,
|
18
16
|
:duration, :poll_count, :backtrace_count, :failure_count,
|
19
17
|
:created_at, :command_arguments, :profile_agent_code
|
20
18
|
attr_accessor :finished_at
|
21
19
|
|
22
|
-
def initialize(command_arguments={})
|
23
|
-
@command_arguments
|
24
|
-
@profile_id
|
25
|
-
@duration
|
26
|
-
@sample_period
|
20
|
+
def initialize(command_arguments = {})
|
21
|
+
@command_arguments = command_arguments
|
22
|
+
@profile_id = command_arguments.fetch('profile_id', -1)
|
23
|
+
@duration = command_arguments.fetch('duration', 120)
|
24
|
+
@sample_period = command_arguments.fetch('sample_period', 0.1)
|
27
25
|
@profile_agent_code = command_arguments.fetch('profile_agent_code', false)
|
28
26
|
@finished = false
|
29
27
|
|
30
28
|
@traces = {
|
31
|
-
:agent
|
29
|
+
:agent => BacktraceRoot.new,
|
32
30
|
:background => BacktraceRoot.new,
|
33
|
-
:other
|
34
|
-
:request
|
31
|
+
:other => BacktraceRoot.new,
|
32
|
+
:request => BacktraceRoot.new
|
35
33
|
}
|
36
34
|
|
37
35
|
@poll_count = 0
|
@@ -39,7 +37,7 @@ module NewRelic
|
|
39
37
|
@failure_count = 0
|
40
38
|
@unique_threads = []
|
41
39
|
|
42
|
-
@created_at =
|
40
|
+
@created_at = Process.clock_gettime(Process::CLOCK_REALTIME)
|
43
41
|
end
|
44
42
|
|
45
43
|
def requested_period
|
@@ -56,6 +54,7 @@ module NewRelic
|
|
56
54
|
|
57
55
|
def unique_thread_count
|
58
56
|
return 0 if @unique_threads.nil?
|
57
|
+
|
59
58
|
@unique_threads.length
|
60
59
|
end
|
61
60
|
|
@@ -69,27 +68,29 @@ module NewRelic
|
|
69
68
|
end
|
70
69
|
end
|
71
70
|
|
72
|
-
def convert_N_trace_nodes_to_arrays(count_to_keep) #THREAD_LOCAL_ACCESS
|
71
|
+
def convert_N_trace_nodes_to_arrays(count_to_keep) # THREAD_LOCAL_ACCESS
|
73
72
|
all_nodes = @traces.values.map { |n| n.flattened }.flatten
|
74
73
|
|
75
|
-
NewRelic::Agent.instance.stats_engine
|
76
|
-
tl_record_supportability_metric_count("ThreadProfiler/NodeCount", all_nodes.size)
|
74
|
+
NewRelic::Agent.instance.stats_engine
|
75
|
+
.tl_record_supportability_metric_count("ThreadProfiler/NodeCount", all_nodes.size)
|
77
76
|
|
78
77
|
all_nodes.sort! do |a, b|
|
79
78
|
# we primarily prefer higher runnable_count
|
80
79
|
comparison = b.runnable_count <=> a.runnable_count
|
81
80
|
# we secondarily prefer lower depth
|
82
|
-
comparison = a.depth
|
83
|
-
# it is thus impossible for any child to
|
81
|
+
comparison = a.depth <=> b.depth if comparison == 0
|
82
|
+
# it is thus impossible for any child to precede their parent
|
84
83
|
comparison
|
85
84
|
end
|
86
85
|
|
87
86
|
all_nodes.each_with_index do |n, i|
|
88
87
|
break if i >= count_to_keep
|
88
|
+
|
89
89
|
n.mark_for_array_conversion
|
90
90
|
end
|
91
91
|
all_nodes.each_with_index do |n, i|
|
92
92
|
break if i >= count_to_keep
|
93
|
+
|
93
94
|
n.complete_array_conversion
|
94
95
|
end
|
95
96
|
end
|
@@ -102,9 +103,9 @@ module NewRelic
|
|
102
103
|
convert_N_trace_nodes_to_arrays(THREAD_PROFILER_NODES)
|
103
104
|
|
104
105
|
{
|
105
|
-
"OTHER"
|
106
|
-
"REQUEST"
|
107
|
-
"AGENT"
|
106
|
+
"OTHER" => @traces[:other].as_array,
|
107
|
+
"REQUEST" => @traces[:request].as_array,
|
108
|
+
"AGENT" => @traces[:agent].as_array,
|
108
109
|
"BACKGROUND" => @traces[:background].as_array
|
109
110
|
}
|
110
111
|
end
|
@@ -124,11 +125,10 @@ module NewRelic
|
|
124
125
|
end
|
125
126
|
|
126
127
|
def to_log_description
|
127
|
-
"#<ThreadProfile:#{object_id} "\
|
128
|
-
"@profile_id: #{profile_id} "\
|
128
|
+
"#<ThreadProfile:#{object_id} " \
|
129
|
+
"@profile_id: #{profile_id} " \
|
129
130
|
"@command_arguments=#{@command_arguments.inspect}>"
|
130
131
|
end
|
131
|
-
|
132
132
|
end
|
133
133
|
end
|
134
134
|
end
|