newrelic_rpm 6.8.0.360 → 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 +14 -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 +1142 -15
- data/CONTRIBUTING.md +133 -19
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Gemfile +5 -2
- data/Guardfile +18 -6
- data/LICENSE +202 -38
- data/README.md +84 -87
- data/Rakefile +27 -27
- data/THIRD_PARTY_NOTICES.md +28 -0
- data/Thorfile +5 -0
- data/bin/newrelic +3 -2
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +77 -54
- 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/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 +199 -562
- data/lib/new_relic/agent/agent_logger.rb +24 -20
- data/lib/new_relic/agent/attribute_filter.rb +67 -48
- data/lib/new_relic/agent/attribute_processing.rb +8 -8
- data/lib/new_relic/agent/attributes.rb +9 -8
- data/lib/new_relic/agent/audit_logger.rb +19 -4
- data/lib/new_relic/agent/autostart.rb +21 -20
- data/lib/new_relic/agent/chained_call.rb +2 -2
- data/lib/new_relic/agent/commands/agent_command.rb +4 -4
- data/lib/new_relic/agent/commands/agent_command_router.rb +13 -12
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +10 -8
- data/lib/new_relic/agent/configuration/default_source.rb +1731 -1143
- data/lib/new_relic/agent/configuration/dotted_hash.rb +7 -6
- data/lib/new_relic/agent/configuration/environment_source.rb +12 -10
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +41 -18
- data/lib/new_relic/agent/configuration/high_security_source.rb +10 -9
- data/lib/new_relic/agent/configuration/manager.rb +83 -70
- data/lib/new_relic/agent/configuration/manual_source.rb +2 -2
- data/lib/new_relic/agent/configuration/mask_defaults.rb +4 -4
- data/lib/new_relic/agent/configuration/security_policy_source.rb +91 -78
- data/lib/new_relic/agent/configuration/server_source.rb +23 -21
- data/lib/new_relic/agent/configuration/yaml_source.rb +33 -9
- data/lib/new_relic/agent/configuration.rb +2 -2
- data/lib/new_relic/agent/connect/request_builder.rb +19 -19
- data/lib/new_relic/agent/connect/response_handler.rb +6 -9
- data/lib/new_relic/agent/custom_event_aggregator.rb +15 -15
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +5 -6
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +16 -15
- data/lib/new_relic/agent/database/obfuscator.rb +3 -3
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +4 -4
- data/lib/new_relic/agent/database.rb +55 -50
- data/lib/new_relic/agent/database_adapter.rb +35 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +18 -19
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +8 -7
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +7 -11
- 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 +6 -12
- data/lib/new_relic/agent/datastores.rb +12 -14
- 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} +86 -64
- 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 +98 -62
- data/lib/new_relic/agent/error_event_aggregator.rb +9 -8
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +5 -4
- data/lib/new_relic/agent/event_aggregator.rb +23 -22
- data/lib/new_relic/agent/event_buffer.rb +8 -9
- data/lib/new_relic/agent/event_listener.rb +2 -3
- data/lib/new_relic/agent/event_loop.rb +26 -24
- data/lib/new_relic/agent/external.rb +19 -52
- data/lib/new_relic/agent/guid_generator.rb +5 -12
- data/lib/new_relic/agent/harvester.rb +5 -6
- data/lib/new_relic/agent/heap.rb +7 -9
- data/lib/new_relic/agent/hostname.rb +21 -8
- data/lib/new_relic/agent/http_clients/abstract.rb +81 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +26 -26
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +31 -17
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -23
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +12 -15
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +24 -8
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +9 -12
- data/lib/new_relic/agent/http_clients/uri_util.rb +12 -13
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +12 -14
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +43 -32
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +21 -14
- data/lib/new_relic/agent/instrumentation/active_job.rb +15 -8
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +21 -7
- data/lib/new_relic/agent/instrumentation/active_record.rb +89 -40
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +82 -61
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +32 -45
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +36 -12
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +34 -22
- data/lib/new_relic/agent/instrumentation/active_storage.rb +3 -3
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +25 -18
- 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 +12 -3
- data/lib/new_relic/agent/instrumentation/authlogic.rb +11 -3
- 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/controller_instrumentation.rb +69 -59
- 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 +13 -198
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +68 -55
- 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 +30 -52
- 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 +7 -6
- data/lib/new_relic/agent/instrumentation/excon.rb +24 -26
- 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 +12 -118
- 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 +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 +5 -6
- 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 +58 -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 +101 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +57 -71
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +14 -13
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +10 -10
- data/lib/new_relic/agent/instrumentation/mongo.rb +6 -131
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +49 -13
- 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 +34 -9
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +22 -58
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +4 -4
- 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 +31 -139
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +17 -53
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +2 -2
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +6 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +4 -3
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +14 -4
- 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 +17 -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 +19 -102
- 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 +29 -37
- data/lib/new_relic/agent/instrumentation/sequel.rb +15 -17
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +3 -3
- 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 +28 -45
- 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 +125 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +3 -3
- data/lib/new_relic/agent/instrumentation/sinatra.rb +35 -165
- data/lib/new_relic/agent/instrumentation/sunspot.rb +12 -4
- 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 +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 +48 -42
- 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 +39 -26
- data/lib/new_relic/agent/memory_logger.rb +3 -3
- data/lib/new_relic/agent/messaging.rb +70 -154
- data/lib/new_relic/agent/method_tracer.rb +152 -145
- data/lib/new_relic/agent/method_tracer_helpers.rb +87 -5
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +118 -0
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +28 -0
- data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +3 -4
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +8 -13
- data/lib/new_relic/agent/monitors.rb +26 -0
- data/lib/new_relic/agent/new_relic_service/encoders.rb +7 -7
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +6 -6
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +3 -3
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +6 -5
- data/lib/new_relic/agent/new_relic_service.rb +258 -184
- 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 +25 -11
- data/lib/new_relic/agent/payload_metric_mapping.rb +10 -11
- data/lib/new_relic/agent/pipe_channel_manager.rb +28 -18
- data/lib/new_relic/agent/pipe_service.rb +9 -6
- data/lib/new_relic/agent/prepend_supportability.rb +3 -3
- data/lib/new_relic/agent/priority_sampled_buffer.rb +15 -15
- data/lib/new_relic/agent/range_extensions.rb +9 -29
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +12 -12
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +14 -14
- data/lib/new_relic/agent/rules_engine.rb +6 -5
- data/lib/new_relic/agent/sampler.rb +4 -5
- data/lib/new_relic/agent/sampler_collection.rb +4 -5
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +4 -3
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +13 -10
- data/lib/new_relic/agent/samplers/memory_sampler.rb +26 -15
- data/lib/new_relic/agent/samplers/object_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/vm_sampler.rb +22 -20
- data/lib/new_relic/agent/span_event_aggregator.rb +13 -13
- data/lib/new_relic/agent/span_event_primitive.rb +106 -68
- data/lib/new_relic/agent/sql_sampler.rb +22 -22
- data/lib/new_relic/agent/stats.rb +79 -42
- 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 +8 -9
- data/lib/new_relic/agent/system_info.rb +95 -66
- 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 +15 -15
- data/lib/new_relic/agent/threading/thread_profile.rb +24 -24
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +2 -2
- data/lib/new_relic/agent/tracer.rb +107 -101
- data/lib/new_relic/agent/transaction/abstract_segment.rb +128 -38
- data/lib/new_relic/agent/transaction/datastore_segment.rb +22 -18
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +184 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +75 -84
- data/lib/new_relic/agent/transaction/external_request_segment.rb +66 -76
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +34 -46
- data/lib/new_relic/agent/transaction/request_attributes.rb +36 -36
- data/lib/new_relic/agent/transaction/segment.rb +35 -11
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +2 -4
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +2 -2
- data/lib/new_relic/agent/transaction/trace.rb +18 -16
- data/lib/new_relic/agent/transaction/trace_builder.rb +11 -11
- data/lib/new_relic/agent/transaction/trace_context.rb +102 -93
- data/lib/new_relic/agent/transaction/trace_node.rb +26 -28
- data/lib/new_relic/agent/transaction/tracing.rb +15 -12
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +5 -5
- data/lib/new_relic/agent/transaction.rb +210 -177
- data/lib/new_relic/agent/transaction_error_primitive.rb +32 -28
- data/lib/new_relic/agent/transaction_event_aggregator.rb +13 -13
- data/lib/new_relic/agent/transaction_event_primitive.rb +43 -47
- data/lib/new_relic/agent/transaction_event_recorder.rb +17 -16
- data/lib/new_relic/agent/transaction_metrics.rb +11 -10
- data/lib/new_relic/agent/transaction_sampler.rb +6 -7
- data/lib/new_relic/agent/transaction_time_aggregator.rb +27 -26
- data/lib/new_relic/agent/utilization/aws.rb +34 -4
- data/lib/new_relic/agent/utilization/azure.rb +4 -4
- data/lib/new_relic/agent/utilization/gcp.rb +8 -8
- data/lib/new_relic/agent/utilization/pcf.rb +6 -5
- data/lib/new_relic/agent/utilization/vendor.rb +44 -29
- 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 +3 -3
- data/lib/new_relic/agent/vm/mri_vm.rb +46 -19
- 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 +78 -79
- data/lib/new_relic/cli/command.rb +21 -23
- data/lib/new_relic/cli/commands/deployments.rb +93 -44
- data/lib/new_relic/cli/commands/install.rb +15 -17
- data/lib/new_relic/coerce.rb +19 -15
- data/lib/new_relic/collection_helper.rb +51 -49
- data/lib/new_relic/constants.rb +39 -0
- data/lib/new_relic/control/class_methods.rb +4 -4
- data/lib/new_relic/control/frameworks/external.rb +3 -3
- data/lib/new_relic/control/frameworks/rails.rb +24 -18
- 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 +24 -46
- 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 -18
- data/lib/new_relic/environment_report.rb +41 -35
- data/lib/new_relic/helper.rb +49 -8
- data/lib/new_relic/language_support.rb +30 -6
- data/lib/new_relic/latest_changes.rb +9 -8
- data/lib/new_relic/local_environment.rb +25 -19
- 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 +44 -35
- 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 +134 -119
- data/lib/new_relic/rack.rb +2 -2
- data/lib/new_relic/recipes/capistrano3.rb +4 -62
- data/lib/new_relic/recipes/capistrano_legacy.rb +24 -27
- data/lib/new_relic/recipes/helpers/send_deployment.rb +69 -0
- data/lib/new_relic/recipes.rb +2 -2
- data/lib/new_relic/supportability_helper.rb +21 -6
- data/lib/new_relic/traced_thread.rb +35 -0
- data/lib/new_relic/version.rb +7 -18
- data/lib/newrelic_rpm.rb +12 -36
- data/lib/sequel/extensions/newrelic_instrumentation.rb +13 -16
- data/lib/sequel/plugins/newrelic_instrumentation.rb +5 -11
- data/lib/tasks/all.rb +4 -4
- 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 +12 -5
- data/lib/tasks/newrelic.rb +2 -2
- data/lib/tasks/tests.rake +14 -14
- data/newrelic.yml +648 -3
- data/newrelic_rpm.gemspec +28 -25
- data/recipes/newrelic.rb +3 -3
- data/test/agent_helper.rb +332 -103
- metadata +192 -119
- data/.travis.yml +0 -210
- data/bin/mongrel_rpm +0 -33
- data/cert/cacert.pem +0 -1177
- data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
- data/lib/new_relic/agent/distributed_trace_intrinsics.rb +0 -90
- data/lib/new_relic/agent/distributed_trace_metrics.rb +0 -74
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -30
- data/lib/new_relic/agent/distributed_trace_payload.rb +0 -175
- data/lib/new_relic/agent/distributed_trace_transport_type.rb +0 -43
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/agent/instrumentation/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/supported_versions.rb +0 -275
- data/lib/new_relic/agent/trace_context.rb +0 -244
- data/lib/new_relic/agent/trace_context_payload.rb +0 -134
- data/lib/new_relic/agent/trace_context_request_monitor.rb +0 -42
- data/lib/new_relic/build.rb +0 -2
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/new_relic/metrics.rb +0 -13
- data/lib/tasks/config.html.erb +0 -32
- data/true +0 -0
data/lib/tasks/config.rake
CHANGED
@@ -1,130 +1,35 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require_relative 'helpers/format'
|
6
|
+
include Format
|
7
|
+
|
1
8
|
namespace :newrelic do
|
2
9
|
namespace :config do
|
3
|
-
|
4
|
-
|
5
|
-
GENERAL = "general"
|
6
|
-
DISABLING = "disabling"
|
10
|
+
GENERAL = "general"
|
11
|
+
DISABLING = "disabling"
|
7
12
|
ATTRIBUTES = "attributes"
|
8
13
|
|
14
|
+
# these configuration options are not able to be set using environment variables
|
15
|
+
NON_ENV_CONFIGS = ['error_collector.ignore_classes', 'error_collector.ignore_messages', 'error_collector.expected_classes', 'error_collector.expected_messages']
|
16
|
+
|
9
17
|
SECTION_DESCRIPTIONS = {
|
10
|
-
GENERAL
|
11
|
-
DISABLING
|
12
|
-
ATTRIBUTES
|
13
|
-
"transaction_tracer" => 'The
|
14
|
-
"error_collector"
|
15
|
-
"browser_monitoring" =>
|
16
|
-
"analytics_events"
|
18
|
+
GENERAL => 'These settings are available for agent configuration. Some settings depend on your New Relic subscription level.',
|
19
|
+
DISABLING => 'Use these settings to toggle instrumentation types during agent startup.',
|
20
|
+
ATTRIBUTES => '[Attributes](/docs/features/agent-attributes) are key-value pairs containing information that determines the properties of an event or transaction. These key-value pairs can be viewed within transaction traces in APM, traced errors in APM, transaction events in dashboards, and page views in dashboards. You can customize exactly which attributes will be sent to each of these destinations',
|
21
|
+
"transaction_tracer" => 'The [transaction traces](/docs/apm/traces/transaction-traces/transaction-traces) feature collects detailed information from a selection of transactions, including a summary of the calling sequence, a breakdown of time spent, and a list of SQL queries and their query plans (on mysql and postgresql). Available features depend on your New Relic subscription level.',
|
22
|
+
"error_collector" => "The agent collects and reports all uncaught exceptions by default. These configuration options allow you to customize the error collection.\n\nFor information on ignored and expected errors, [see this page on Error Analytics in APM](/docs/agents/manage-apm-agents/agent-data/manage-errors-apm-collect-ignore-or-mark-expected/). To set expected errors via the `NewRelic::Agent.notice_error` Ruby method, [consult the Ruby Agent API](/docs/agents/ruby-agent/api-guides/sending-handled-errors-new-relic/).",
|
23
|
+
"browser_monitoring" => "The browser monitoring [page load timing](/docs/browser/new-relic-browser/page-load-timing/page-load-timing-process) feature (sometimes referred to as real user monitoring or RUM) gives you insight into the performance real users are experiencing with your website. This is accomplished by measuring the time it takes for your users' browsers to download and render your web pages by injecting a small amount of JavaScript code into the header and footer of each page.",
|
24
|
+
"analytics_events" => '[New Relic dashboards](/docs/query-your-data/explore-query-data/dashboards/introduction-new-relic-one-dashboards) is a resource to gather and visualize data about your software and what it says about your business. With it you can quickly and easily create real-time dashboards to get immediate answers about end-user experiences, clickstreams, mobile activities, and server transactions.'
|
17
25
|
}
|
18
26
|
|
19
27
|
NAME_OVERRIDES = {
|
20
|
-
"slow_sql"
|
28
|
+
"slow_sql" => "Slow SQL",
|
29
|
+
"custom_insights_events" => "Custom Events"
|
21
30
|
}
|
22
31
|
|
23
|
-
|
24
|
-
config_hash = build_config_hash
|
25
|
-
sections = flatten_config_hash(config_hash)
|
26
|
-
|
27
|
-
puts build_erb(format).result(binding)
|
28
|
-
sections # silences unused warning to return this
|
29
|
-
end
|
30
|
-
|
31
|
-
def build_config_hash
|
32
|
-
sections = Hash.new {|hash, key| hash[key] = []}
|
33
|
-
NewRelic::Agent::Configuration::DEFAULTS.each do |key, value|
|
34
|
-
next unless value[:public]
|
35
|
-
|
36
|
-
section_key = GENERAL
|
37
|
-
key = key.to_s
|
38
|
-
components = key.split(".")
|
39
|
-
|
40
|
-
if key.match(/^disable_/) # "disable_httpclient"
|
41
|
-
section_key = DISABLING
|
42
|
-
elsif components.length == 2 # "analytics_events.enabled"
|
43
|
-
section_key = components.first
|
44
|
-
elsif components[1] == "attributes" # "transaction_tracer.attributes.enabled"
|
45
|
-
section_key = ATTRIBUTES
|
46
|
-
end
|
47
|
-
|
48
|
-
sections[section_key] << {
|
49
|
-
:key => key,
|
50
|
-
:type => format_type(value[:type]),
|
51
|
-
:description => format_description(value),
|
52
|
-
:default => format_default_value(value),
|
53
|
-
:env_var => format_env_var(key)
|
54
|
-
}
|
55
|
-
end
|
56
|
-
sections
|
57
|
-
end
|
58
|
-
|
59
|
-
def flatten_config_hash(config_hash)
|
60
|
-
sections = []
|
61
|
-
sections << pluck(GENERAL, config_hash)
|
62
|
-
sections << pluck("transaction_tracer", config_hash)
|
63
|
-
sections << pluck("error_collector", config_hash)
|
64
|
-
sections << pluck("browser_monitoring", config_hash)
|
65
|
-
sections << pluck("analytics_events", config_hash)
|
66
|
-
sections.concat(config_hash.to_a.sort_by { |a| a.first})
|
67
|
-
|
68
|
-
add_data_to_sections(sections)
|
69
|
-
|
70
|
-
sections
|
71
|
-
end
|
72
|
-
|
73
|
-
def add_data_to_sections(sections)
|
74
|
-
sections.each do |section|
|
75
|
-
section_key = section[0]
|
76
|
-
section.insert(1, format_name(section_key))
|
77
|
-
section.insert(2, SECTION_DESCRIPTIONS[section_key])
|
78
|
-
end
|
79
|
-
end
|
80
|
-
|
81
|
-
def format_name(key)
|
82
|
-
name = NAME_OVERRIDES[key]
|
83
|
-
return name if name
|
84
|
-
|
85
|
-
key.split("_").
|
86
|
-
each { |fragment| fragment[0] = fragment[0].upcase }.
|
87
|
-
join(" ")
|
88
|
-
end
|
89
|
-
|
90
|
-
def format_type(type)
|
91
|
-
if type == NewRelic::Agent::Configuration::Boolean
|
92
|
-
"Boolean"
|
93
|
-
else
|
94
|
-
type
|
95
|
-
end
|
96
|
-
end
|
97
|
-
|
98
|
-
def format_description(value)
|
99
|
-
description = value[:description]
|
100
|
-
description = "<b>DEPRECATED</b> #{description}" if value[:deprecated]
|
101
|
-
description
|
102
|
-
end
|
103
|
-
|
104
|
-
def format_default_value(spec)
|
105
|
-
if spec[:default].is_a?(Proc)
|
106
|
-
'(Dynamic)'
|
107
|
-
else
|
108
|
-
"<code>#{spec[:default].inspect}</code>"
|
109
|
-
end
|
110
|
-
end
|
111
|
-
|
112
|
-
def format_env_var(key)
|
113
|
-
"NEW_RELIC_#{key.gsub(".", "_").upcase}"
|
114
|
-
end
|
115
|
-
|
116
|
-
def pluck(key, config_hash)
|
117
|
-
value = config_hash.delete(key)
|
118
|
-
[key, value]
|
119
|
-
end
|
120
|
-
|
121
|
-
def build_erb(format)
|
122
|
-
require 'erb'
|
123
|
-
path = File.join(File.dirname(__FILE__), "config.#{format}.erb")
|
124
|
-
template = File.read(File.expand_path(path))
|
125
|
-
ERB.new(template)
|
126
|
-
end
|
127
|
-
|
32
|
+
desc "Describe available New Relic configuration settings"
|
128
33
|
task :docs, [:format] => [] do |t, args|
|
129
34
|
require File.expand_path(File.join(File.dirname(__FILE__), "..", "new_relic", "agent", "configuration", "default_source.rb"))
|
130
35
|
format = args[:format] || "text"
|
@@ -0,0 +1,28 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
if ENV['CI']
|
6
|
+
namespace :coverage do
|
7
|
+
desc "Collates all result sets generated by the different test runners"
|
8
|
+
task :report do
|
9
|
+
require 'simplecov'
|
10
|
+
require 'fileutils'
|
11
|
+
|
12
|
+
SimpleCov.coverage_dir('coverage_results')
|
13
|
+
|
14
|
+
SimpleCov.collate(Dir['*/coverage_*/.resultset.json']) do
|
15
|
+
formatter SimpleCov::Formatter::HTMLFormatter
|
16
|
+
refuse_coverage_drop
|
17
|
+
end
|
18
|
+
|
19
|
+
Dir['lib/coverage_{[!r][!e][!s][!u][!l][!t][!s]}*'].each { |dir| FileUtils.rm_rf(dir) }
|
20
|
+
end
|
21
|
+
|
22
|
+
desc "Removes all coverage_* directories"
|
23
|
+
task :clear do
|
24
|
+
require 'fileutils'
|
25
|
+
Dir["lib/coverage_*"].each { |dir| FileUtils.rm_rf(dir) }
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
@@ -0,0 +1,21 @@
|
|
1
|
+
<% sections.each do |(section_key, section_name, section_description, configs)| %>
|
2
|
+
## <%=section_name%>
|
3
|
+
|
4
|
+
<%= "#{section_description}" unless section_description.nil? %>
|
5
|
+
|
6
|
+
<CollapserGroup>
|
7
|
+
<% configs.each do |config|%>
|
8
|
+
<Collapser id="<%= config[:key].gsub('.', '-') %>" title="<%=config[:key]%>">
|
9
|
+
<table>
|
10
|
+
<tbody>
|
11
|
+
<tr><th>Type</th><td><%=config[:type]%></td></tr>
|
12
|
+
<tr><th>Default</th><td>`<%=config[:default]%>`</td></tr>
|
13
|
+
<tr><th>Environ variable</th><td>`<%=config[:env_var]%>`</td></tr>
|
14
|
+
</tbody>
|
15
|
+
</table>
|
16
|
+
|
17
|
+
<%=config[:description]%>
|
18
|
+
</Collapser>
|
19
|
+
<% end %>
|
20
|
+
</CollapserGroup>
|
21
|
+
<% end %>
|
File without changes
|
@@ -0,0 +1,123 @@
|
|
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 Format
|
6
|
+
def output(format)
|
7
|
+
config_hash = build_config_hash
|
8
|
+
sections = flatten_config_hash(config_hash)
|
9
|
+
|
10
|
+
puts build_erb(format).result(binding).split("\n").map(&:rstrip).join("\n").gsub('. ', '. ')
|
11
|
+
sections # silences unused warning to return this
|
12
|
+
end
|
13
|
+
|
14
|
+
private
|
15
|
+
|
16
|
+
def add_data_to_sections(sections)
|
17
|
+
sections.each do |section|
|
18
|
+
section_key = section[0]
|
19
|
+
section.insert(1, format_name(section_key))
|
20
|
+
section.insert(2, SECTION_DESCRIPTIONS[section_key])
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
def build_config_hash
|
25
|
+
sections = Hash.new { |hash, key| hash[key] = [] }
|
26
|
+
NewRelic::Agent::Configuration::DEFAULTS.each do |key, value|
|
27
|
+
next unless value[:public]
|
28
|
+
|
29
|
+
key = key.to_s
|
30
|
+
section_key = section_key(key, key.split('.'))
|
31
|
+
sections[section_key] << format_sections(key, value)
|
32
|
+
end
|
33
|
+
sections
|
34
|
+
end
|
35
|
+
|
36
|
+
def build_erb(format)
|
37
|
+
require 'erb'
|
38
|
+
path = File.join(File.dirname(__FILE__), "config.#{format}.erb")
|
39
|
+
template = File.read(File.expand_path(path))
|
40
|
+
ERB.new(template)
|
41
|
+
end
|
42
|
+
|
43
|
+
def flatten_config_hash(config_hash)
|
44
|
+
sections = []
|
45
|
+
config = [GENERAL, 'transaction_tracer', 'error_collector',
|
46
|
+
'browser_monitoring', 'analytics_events', 'transaction_events',
|
47
|
+
'application_logging']
|
48
|
+
|
49
|
+
config.each { |config| sections << pluck(config, config_hash) }
|
50
|
+
|
51
|
+
sections.concat(config_hash.to_a.sort_by { |a| a.first })
|
52
|
+
add_data_to_sections(sections)
|
53
|
+
|
54
|
+
sections
|
55
|
+
end
|
56
|
+
|
57
|
+
def format_default_value(spec)
|
58
|
+
return spec[:documentation_default] if !spec[:documentation_default].nil?
|
59
|
+
|
60
|
+
if spec[:default].is_a?(Proc)
|
61
|
+
'(Dynamic)'
|
62
|
+
else
|
63
|
+
"#{spec[:default].inspect}"
|
64
|
+
end
|
65
|
+
end
|
66
|
+
|
67
|
+
def format_description(value)
|
68
|
+
description = ''
|
69
|
+
description += "<b>DEPRECATED</b> " if value[:deprecated]
|
70
|
+
description += value[:description]
|
71
|
+
description
|
72
|
+
end
|
73
|
+
|
74
|
+
def format_env_var(key)
|
75
|
+
return "None" if NON_ENV_CONFIGS.include?(key)
|
76
|
+
|
77
|
+
"NEW_RELIC_#{key.tr(".", "_").upcase}"
|
78
|
+
end
|
79
|
+
|
80
|
+
def format_name(key)
|
81
|
+
name = NAME_OVERRIDES[key]
|
82
|
+
return name if name
|
83
|
+
|
84
|
+
key.split("_")
|
85
|
+
.each { |fragment| fragment[0] = fragment[0].upcase }
|
86
|
+
.join(" ")
|
87
|
+
end
|
88
|
+
|
89
|
+
def format_sections(key, value)
|
90
|
+
{
|
91
|
+
:key => key,
|
92
|
+
:type => format_type(value[:type]),
|
93
|
+
:description => format_description(value),
|
94
|
+
:default => format_default_value(value),
|
95
|
+
:env_var => format_env_var(key)
|
96
|
+
}
|
97
|
+
end
|
98
|
+
|
99
|
+
def format_type(type)
|
100
|
+
if type == NewRelic::Agent::Configuration::Boolean
|
101
|
+
"Boolean"
|
102
|
+
else
|
103
|
+
type
|
104
|
+
end
|
105
|
+
end
|
106
|
+
|
107
|
+
def pluck(key, config_hash)
|
108
|
+
value = config_hash.delete(key)
|
109
|
+
[key, value]
|
110
|
+
end
|
111
|
+
|
112
|
+
def section_key(key, components)
|
113
|
+
if key =~ /^disable_/ # "disable_httpclient"
|
114
|
+
DISABLING
|
115
|
+
elsif components.length >= 2 && !(components[1] == "attributes") # "analytics_events.enabled"
|
116
|
+
components.first
|
117
|
+
elsif components[1] == "attributes" # "transaction_tracer.attributes.enabled"
|
118
|
+
ATTRIBUTES
|
119
|
+
else
|
120
|
+
GENERAL
|
121
|
+
end
|
122
|
+
end
|
123
|
+
end
|
@@ -0,0 +1,12 @@
|
|
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 Matches
|
6
|
+
def look_for_seed(tasks)
|
7
|
+
matches = tasks.map { |t| /(seed=.*?)[,\]]/.match(t) }.compact
|
8
|
+
if matches.any?
|
9
|
+
matches.first[1]
|
10
|
+
end
|
11
|
+
end
|
12
|
+
end
|
@@ -0,0 +1,24 @@
|
|
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 Prompt
|
6
|
+
def prompt_to_continue(command, destination = 'local')
|
7
|
+
puts "The following rsync command will be executed to update the #{destination} copy of the specs:"
|
8
|
+
puts
|
9
|
+
puts command
|
10
|
+
puts
|
11
|
+
puts "CAUTION: Any unsaved changes that exist within the #{destination} content will be OVERWRITTEN!"
|
12
|
+
if destination.eql?('local')
|
13
|
+
puts 'CAUTION 2: Before continuing, make sure your local repo is on the correct, synced branch!'
|
14
|
+
end
|
15
|
+
puts
|
16
|
+
print "Do you wish to continue? ('y' to continue, return to cancel) [n] "
|
17
|
+
continue = STDIN.gets.chomp
|
18
|
+
if continue.casecmp('y') == 0
|
19
|
+
system(command)
|
20
|
+
else
|
21
|
+
puts 'Cancelled'
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
@@ -0,0 +1,33 @@
|
|
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 Removers
|
6
|
+
def remove_local_multiverse_databases
|
7
|
+
list_databases_command = %(echo "show databases" | mysql -u root)
|
8
|
+
databases = `#{list_databases_command}`.chomp!.split("\n").select { |s| s.include?('multiverse') }
|
9
|
+
databases.each do |database|
|
10
|
+
puts "Dropping #{database}"
|
11
|
+
`echo "drop database #{database}" | mysql -u root`
|
12
|
+
end
|
13
|
+
rescue => error
|
14
|
+
puts "ERROR: Cannot get MySQL databases..."
|
15
|
+
puts error.message
|
16
|
+
end
|
17
|
+
|
18
|
+
def remove_generated_gemfiles
|
19
|
+
file_path = File.expand_path("test/multiverse/suites")
|
20
|
+
Dir.glob(File.join(file_path, "**", "Gemfile*")).each do |fn|
|
21
|
+
puts "Removing #{fn.gsub(file_path, '.../suites')}"
|
22
|
+
FileUtils.rm(fn)
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
def remove_generated_gemfile_lockfiles
|
27
|
+
file_path = File.expand_path("test/environments")
|
28
|
+
Dir.glob(File.join(file_path, "**", "Gemfile.lock")).each do |fn|
|
29
|
+
puts "Removing #{fn.gsub(file_path, '.../environments')}"
|
30
|
+
FileUtils.rm(fn)
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
data/lib/tasks/install.rake
CHANGED
@@ -1,3 +1,7 @@
|
|
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
|
+
|
1
5
|
namespace :newrelic do
|
2
6
|
desc "Install a default config/newrelic.yml file"
|
3
7
|
task :install do
|
@@ -0,0 +1,63 @@
|
|
1
|
+
# Instrumentation Generator
|
2
|
+
|
3
|
+
## Usage
|
4
|
+
|
5
|
+
`thor list` can be passed to get a list of all available thor commands
|
6
|
+
|
7
|
+
### instrumentation:scaffold
|
8
|
+
|
9
|
+
This task requires one parameter by default: the name of the library or class you are instrumenting. This task generates the basic file structure needed to add new instrumentation to the Ruby agent.
|
10
|
+
|
11
|
+
Run it using:
|
12
|
+
|
13
|
+
`thor instrumentation:scaffold gem_name`
|
14
|
+
|
15
|
+
It accepts two optional parameters:
|
16
|
+
|
17
|
+
- `--method`: the name of a method to instrument. Only one method can be accepted at this time. Defaults to `method_to_instrument`
|
18
|
+
- `--args`: the arguments for the instrumented method. A comma-separated list can be given if there are multiple arguments. Defaults to `*args`.
|
19
|
+
|
20
|
+
With the optional parameters, the task can be run like so:
|
21
|
+
|
22
|
+
`thor instrumentation:scaffold gem_name --method=method_to_instrument --args=arg1,arg2,arg3`
|
23
|
+
|
24
|
+
### WIP: instrumentation:add_new_method
|
25
|
+
|
26
|
+
Are you trying add instrumentation for a method within library we already instrument? This task is for you! Instead of building the entire scaffold, this task inserts only the changes needed within the `instrumentation.rb` and test files to instrument the new method. It requires one argument, the name of the existing instrumentation to add the method to. If the instrumented library does not already exist, it will create a new scaffold for that library.
|
27
|
+
|
28
|
+
Run it using:
|
29
|
+
|
30
|
+
`thor instrumentation:scaffold gem_name`
|
31
|
+
|
32
|
+
It accepts two optional parameters:
|
33
|
+
|
34
|
+
- `--method`: the name of a method to instrument. Only one method can be accepted at this time. Defaults to `method_to_instrument`
|
35
|
+
- `--args`: the arguments for the instrumented method. A comma-separated list can be given if there are multiple arguments. Defaults to `*args`.
|
36
|
+
|
37
|
+
With the optional parameters, the task can be run like so:
|
38
|
+
|
39
|
+
`thor instrumentation:add_new_method gem_name --method=method_to_instrument --args=arg1,arg2,arg3`
|
40
|
+
|
41
|
+
## Idea
|
42
|
+
|
43
|
+
Create a CLI, similar to Rails’ generators and scaffold scripts, to create the required files and basic classes for instrumenting new libraries. The hope is that the parts of adding new instrumentation that is repetitive can be eliminated and/or reduced so that it takes less time to add new instrumentation and we can spend development time considering the best attributes to collect and interactions to measure. I also hope this project will reduce the overall toil related to adding new instrumentation.
|
44
|
+
|
45
|
+
The files we create with little variation besides library and method names are:
|
46
|
+
|
47
|
+
- Lib
|
48
|
+
- Dependency detection
|
49
|
+
- Chain
|
50
|
+
- Prepend
|
51
|
+
- Instrumentation
|
52
|
+
- Tests
|
53
|
+
- configuration/newrelic.yml
|
54
|
+
- Envfile
|
55
|
+
- Test file
|
56
|
+
|
57
|
+
Furthermore, we also create very similar snippets inside the default source configuration file that could be generated by this project as well.
|
58
|
+
|
59
|
+
## Outcome
|
60
|
+
|
61
|
+
A prototype outside the agent was first created. This prototype generated the required files to add instrumentation. The prototype accepted three arguments: name (name of the library), method (method to instrument), args (arguments for the method). This prototype has evolved into the current directory.
|
62
|
+
|
63
|
+
This project leverages the Ruby gem Thor, a toolkit for building powerful command-line interfaces used in Bundler, Vagrant, Rails and others powers this CLI.
|
@@ -0,0 +1,33 @@
|
|
1
|
+
# TODO
|
2
|
+
|
3
|
+
# - [X] Create instrumentation file
|
4
|
+
|
5
|
+
# - [X] Create chain file
|
6
|
+
|
7
|
+
# - [X] Create prepend file
|
8
|
+
|
9
|
+
# - [X] Create dependency detection file
|
10
|
+
|
11
|
+
# - [X] Add config to default source
|
12
|
+
|
13
|
+
# - [X] Create multiverse suite
|
14
|
+
|
15
|
+
# - [X] Create Envfile
|
16
|
+
|
17
|
+
# - [X] Create test file with examples
|
18
|
+
|
19
|
+
# - [X] Create option for method names to instrument
|
20
|
+
|
21
|
+
# - [X] Add entry to newrelic.yml
|
22
|
+
|
23
|
+
# - [ ] Append a new method to instrument to an existing instrumentation class (with tests?)
|
24
|
+
|
25
|
+
# - [ ] Documentation: examples of what to add in each gap (Good examples of tests, instrumentation, etc. as comments to guide users)
|
26
|
+
|
27
|
+
# - [ ] Handle multi-word gem names (camel case for classes, handle hyphens, concurrent-ruby as example)
|
28
|
+
|
29
|
+
# - [ ] Allow multiple method arguments to be passed to the command line
|
30
|
+
|
31
|
+
# - [ ] Add tests for the instrumentation_generator code
|
32
|
+
|
33
|
+
# - [ ] See if instrumentation PRs can get automatically generated when an already instrumented library adds methods to its codebase
|
@@ -0,0 +1,124 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require_relative '../../new_relic/language_support'
|
6
|
+
require 'thor'
|
7
|
+
|
8
|
+
class Instrumentation < Thor
|
9
|
+
include Thor::Actions
|
10
|
+
|
11
|
+
INSTRUMENTATION_ROOT = 'lib/new_relic/agent/instrumentation/'
|
12
|
+
MULTIVERSE_SUITE_ROOT = 'test/multiverse/suites/'
|
13
|
+
DEFAULT_SOURCE_LOCATION = 'lib/new_relic/agent/configuration/default_source.rb'
|
14
|
+
NEWRELIC_YML_LOCATION = 'newrelic.yml'
|
15
|
+
|
16
|
+
desc('scaffold NAME', 'Scaffold the required files for adding new instrumentation')
|
17
|
+
long_desc <<-LONGDESC
|
18
|
+
`instrumentation scaffold` requires one parameter by default: the name of the
|
19
|
+
library or class you are instrumenting. This task generates the basic
|
20
|
+
file structure needed to add new instrumentation to the Ruby agent.
|
21
|
+
LONGDESC
|
22
|
+
|
23
|
+
source_root(File.dirname(__FILE__))
|
24
|
+
|
25
|
+
option :method,
|
26
|
+
default: 'method_to_instrument',
|
27
|
+
desc: 'The method you would like to prepend or chain instrumentation onto'
|
28
|
+
option :args,
|
29
|
+
default: '*args',
|
30
|
+
desc: 'The arguments associated with the original method'
|
31
|
+
|
32
|
+
def scaffold(name)
|
33
|
+
@name = name
|
34
|
+
@method = options[:method] if options[:method]
|
35
|
+
@args = options[:args] if options[:args]
|
36
|
+
@class_name = ::NewRelic::LanguageSupport.camelize(name)
|
37
|
+
base_path = "#{INSTRUMENTATION_ROOT}#{name.downcase}"
|
38
|
+
|
39
|
+
empty_directory(base_path)
|
40
|
+
create_instrumentation_files(base_path)
|
41
|
+
append_to_default_source(name)
|
42
|
+
append_to_newrelic_yml(name)
|
43
|
+
create_tests(name)
|
44
|
+
end
|
45
|
+
|
46
|
+
desc 'add_new_method NAME', 'Inserts a new method into an existing piece of instrumentation'
|
47
|
+
|
48
|
+
option :method, required: true, desc: 'The name of the method to instrument'
|
49
|
+
option :args, default: '*args', desc: 'The arguments associated with the instrumented method'
|
50
|
+
|
51
|
+
def add_new_method(name, method_name)
|
52
|
+
# Verify that existing instrumentation exists
|
53
|
+
# if it doesn't, should we just call the #scaffold method instead since we have all the stuff
|
54
|
+
# otherwise, inject the new method into the instrumentation matching the first arg
|
55
|
+
# add to only chain, instrumentation, prepend
|
56
|
+
# move the method content to a partial
|
57
|
+
end
|
58
|
+
|
59
|
+
private
|
60
|
+
|
61
|
+
def create_instrumentation_files(base_path)
|
62
|
+
%w[chain instrumentation prepend].each do |file|
|
63
|
+
template("templates/#{file}.tt", "#{base_path}/#{file}.rb")
|
64
|
+
end
|
65
|
+
|
66
|
+
template('templates/dependency_detection.tt', "#{base_path}.rb")
|
67
|
+
end
|
68
|
+
|
69
|
+
def create_tests(name)
|
70
|
+
@name = name
|
71
|
+
@instrumentation_method_global_erb_snippet = '<%= $instrumentation_method %>'
|
72
|
+
base_path = "#{MULTIVERSE_SUITE_ROOT}#{@name.downcase}"
|
73
|
+
empty_directory(base_path)
|
74
|
+
template('templates/Envfile.tt', "#{base_path}/Envfile")
|
75
|
+
template('templates/test.tt', "#{base_path}/#{@name.downcase}_instrumentation_test.rb")
|
76
|
+
|
77
|
+
empty_directory("#{base_path}/config")
|
78
|
+
template('templates/newrelic.yml.tt', "#{base_path}/config/newrelic.yml")
|
79
|
+
end
|
80
|
+
|
81
|
+
def append_to_default_source(name)
|
82
|
+
insert_into_file(
|
83
|
+
DEFAULT_SOURCE_LOCATION,
|
84
|
+
config_block(name.downcase),
|
85
|
+
after: ":description => 'Controls auto-instrumentation of bunny at start up. May be one of [auto|prepend|chain|disabled].'
|
86
|
+
},\n"
|
87
|
+
)
|
88
|
+
end
|
89
|
+
|
90
|
+
def append_to_newrelic_yml(name)
|
91
|
+
insert_into_file(
|
92
|
+
NEWRELIC_YML_LOCATION,
|
93
|
+
yaml_block(name),
|
94
|
+
after: "# instrumentation.bunny: auto\n"
|
95
|
+
)
|
96
|
+
end
|
97
|
+
|
98
|
+
def config_block(name)
|
99
|
+
<<-CONFIG
|
100
|
+
:'instrumentation.#{name.downcase}' => {
|
101
|
+
:default => 'auto',
|
102
|
+
:public => true,
|
103
|
+
:type => String,
|
104
|
+
:dynamic_name => true,
|
105
|
+
:allowed_from_server => false,
|
106
|
+
:description => 'Controls auto-instrumentation of the #{name} library at start up. May be one of [auto|prepend|chain|disabled].'
|
107
|
+
},
|
108
|
+
CONFIG
|
109
|
+
end
|
110
|
+
|
111
|
+
# TODO: OLD RUBIES - RUBY_VERSION 2.2
|
112
|
+
# When we only support 2.3+ this can be changed to a sqiggle heredoc (<<~)
|
113
|
+
# and use standard indentation
|
114
|
+
def yaml_block(name)
|
115
|
+
<<HEREDOC # rubocop:disable Layout/IndentationWidth
|
116
|
+
|
117
|
+
# Controls auto-instrumentation of #{name} at start up.
|
118
|
+
# May be one of [auto|prepend|chain|disabled]
|
119
|
+
# instrumentation.#{name.downcase}: auto
|
120
|
+
HEREDOC
|
121
|
+
end
|
122
|
+
end
|
123
|
+
|
124
|
+
Instrumentation.start(ARGV)
|
@@ -0,0 +1,9 @@
|
|
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
|
+
instrumentation_methods :chain, :prepend
|
6
|
+
|
7
|
+
gemfile <<-RB
|
8
|
+
gem '<%= @name.downcase %>'
|
9
|
+
RB
|
@@ -0,0 +1,22 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module <%= @class_name %>
|
7
|
+
def self.instrument!
|
8
|
+
::<%= @class_name %>.class_eval do
|
9
|
+
include NewRelic::Agent::Instrumentation::<%= @class_name %>
|
10
|
+
|
11
|
+
alias_method(:<%= @method.downcase %>_without_new_relic, :<%= @method.downcase %>)
|
12
|
+
alias_method(:<%= @method.downcase %>, :<%= @method.downcase %>_with_new_relic)
|
13
|
+
|
14
|
+
def <%= @method.downcase %><%= "(#{@args})" unless @args.empty? %>
|
15
|
+
<%= @method.downcase %>_with_new_relic<%= "(#{@args})" unless @args.empty? %> do
|
16
|
+
<%= @method.downcase %>_without_new_relic<%= "(#{@args})" unless @args.empty? %>
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|