newrelic_rpm 7.0.0 → 9.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +7 -2
- data/.rubocop.yml +1919 -0
- data/.rubocop_todo.yml +100 -0
- data/.simplecov +15 -0
- data/.snyk +11 -0
- data/.yardopts +1 -0
- data/Brewfile +12 -0
- data/CHANGELOG.md +3754 -2825
- data/CONTRIBUTING.md +33 -7
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Gemfile +0 -1
- data/Guardfile +9 -8
- data/LICENSE +0 -6
- data/README.md +23 -19
- 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.rb +96 -925
- data/lib/new_relic/agent/agent_helpers/connect.rb +227 -0
- data/lib/new_relic/agent/agent_helpers/harvest.rb +153 -0
- data/lib/new_relic/agent/agent_helpers/shutdown.rb +72 -0
- data/lib/new_relic/agent/agent_helpers/special_startup.rb +74 -0
- data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +167 -0
- data/lib/new_relic/agent/agent_helpers/startup.rb +202 -0
- data/lib/new_relic/agent/agent_helpers/transmit.rb +76 -0
- data/lib/new_relic/agent/agent_logger.rb +23 -19
- data/lib/new_relic/agent/attribute_filter.rb +64 -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 -18
- 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 +12 -10
- data/lib/new_relic/agent/configuration/default_source.rb +1366 -1297
- 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 +8 -9
- 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 +82 -85
- 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 +42 -50
- 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 -7
- data/lib/new_relic/agent/datastores.rb +13 -15
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +10 -10
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +40 -34
- 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 +33 -35
- 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 +26 -24
- data/lib/new_relic/agent/external.rb +11 -44
- data/lib/new_relic/agent/guid_generator.rb +13 -11
- data/lib/new_relic/agent/harvester.rb +4 -5
- data/lib/new_relic/agent/heap.rb +7 -9
- 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 +9 -22
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +39 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +38 -31
- data/lib/new_relic/agent/instrumentation/action_dispatch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb +64 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb +33 -0
- data/lib/new_relic/agent/instrumentation/action_mailer.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb +85 -0
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +18 -19
- data/lib/new_relic/agent/instrumentation/active_job.rb +33 -13
- data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
- data/lib/new_relic/agent/instrumentation/active_record.rb +37 -35
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +71 -61
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +49 -46
- 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 +7 -3
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +8 -33
- data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
- data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +11 -11
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +21 -23
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +4 -4
- data/lib/new_relic/agent/instrumentation/bunny.rb +4 -5
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +69 -59
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +41 -43
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +52 -53
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +12 -14
- data/lib/new_relic/agent/instrumentation/curb.rb +7 -7
- data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
- data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +37 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +6 -9
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +7 -12
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +1 -2
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +28 -10
- 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 +6 -6
- data/lib/new_relic/agent/instrumentation/excon.rb +27 -30
- data/lib/new_relic/agent/instrumentation/fiber/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
- data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
- data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +7 -8
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +12 -12
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +4 -4
- data/lib/new_relic/agent/instrumentation/grape.rb +12 -13
- 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 +3 -4
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +7 -8
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +1 -3
- data/lib/new_relic/agent/instrumentation/httpclient.rb +3 -3
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +3 -3
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +11 -11
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +2 -2
- data/lib/new_relic/agent/instrumentation/httprb.rb +4 -4
- 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 +2 -3
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +31 -19
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +12 -9
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +20 -18
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +28 -15
- data/lib/new_relic/agent/instrumentation/memcache.rb +22 -23
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +11 -12
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +5 -7
- data/lib/new_relic/agent/instrumentation/mongo.rb +6 -144
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +21 -18
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +4 -5
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +10 -10
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +5 -5
- data/lib/new_relic/agent/instrumentation/net_http.rb +12 -7
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +51 -9
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +24 -20
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +4 -3
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +3 -3
- data/lib/new_relic/agent/instrumentation/padrino.rb +5 -8
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +6 -6
- data/lib/new_relic/agent/instrumentation/queue_time.rb +8 -9
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +30 -21
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +3 -2
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +14 -12
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +15 -8
- data/lib/new_relic/agent/instrumentation/rack.rb +15 -15
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +18 -54
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +9 -8
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +17 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +8 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +2 -7
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +14 -16
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake.rb +9 -9
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +25 -14
- data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +53 -25
- data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +10 -5
- data/lib/new_relic/agent/instrumentation/redis.rb +16 -6
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +4 -5
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +9 -8
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +2 -3
- data/lib/new_relic/agent/instrumentation/resque.rb +25 -16
- data/lib/new_relic/agent/instrumentation/sequel.rb +16 -19
- 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 +24 -65
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +2 -3
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +13 -6
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -2
- data/lib/new_relic/agent/instrumentation/sinatra.rb +26 -17
- 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 +5 -5
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +13 -15
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +2 -2
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +2 -2
- 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 +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 +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 +88 -11
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +24 -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 +4 -4
- data/lib/new_relic/agent/new_relic_service.rb +247 -186
- 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 +12 -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 +13 -10
- 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 +17 -17
- 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 +89 -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 +20 -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 +5 -5
- data/lib/new_relic/agent/transaction.rb +175 -152
- 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 +70 -86
- 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 +21 -24
- 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 +13 -9
- 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 +26 -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 +29 -28
- 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 +22 -26
- 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 +21 -25
- 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 +70 -0
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +8 -9
- data/lib/new_relic/traced_thread.rb +39 -0
- data/lib/new_relic/version.rb +5 -16
- data/lib/newrelic_rpm.rb +19 -32
- data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +15 -18
- data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +8 -14
- 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/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 +121 -0
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
- data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
- data/lib/tasks/multiverse.rake +4 -0
- data/lib/tasks/multiverse.rb +5 -32
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +10 -15
- data/newrelic.yml +672 -3
- data/newrelic_rpm.gemspec +35 -31
- data/recipes/newrelic.rb +2 -2
- data/test/agent_helper.rb +221 -180
- metadata +141 -111
- data/ROADMAP.md +0 -24
- data/bin/mongrel_rpm +0 -33
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -75
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -204
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
- data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
- data/lib/new_relic/agent/supported_versions.rb +0 -275
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/tasks/config.html.erb +0 -32
- /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,8 +1,9 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/datastores/metric_helper'
|
6
|
+
require 'new_relic/constants'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
@@ -18,15 +19,15 @@ module NewRelic
|
|
18
19
|
|
19
20
|
def instrument_save_methods
|
20
21
|
::ActiveRecord::Base.class_eval do
|
21
|
-
alias_method
|
22
|
-
|
22
|
+
alias_method(:save_without_newrelic, :save)
|
23
|
+
|
23
24
|
def save(*args, &blk)
|
24
25
|
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
25
26
|
save_without_newrelic(*args, &blk)
|
26
27
|
end
|
27
28
|
end
|
28
29
|
|
29
|
-
alias_method
|
30
|
+
alias_method(:save_without_newrelic!, :save!)
|
30
31
|
|
31
32
|
def save!(*args, &blk)
|
32
33
|
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
@@ -38,15 +39,15 @@ module NewRelic
|
|
38
39
|
|
39
40
|
def instrument_relation_methods
|
40
41
|
::ActiveRecord::Relation.class_eval do
|
41
|
-
alias_method
|
42
|
+
alias_method(:update_all_without_newrelic, :update_all)
|
42
43
|
|
43
44
|
def update_all(*args, &blk)
|
44
45
|
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
45
46
|
update_all_without_newrelic(*args, &blk)
|
46
47
|
end
|
47
48
|
end
|
48
|
-
|
49
|
-
alias_method
|
49
|
+
|
50
|
+
alias_method(:delete_all_without_newrelic, :delete_all)
|
50
51
|
|
51
52
|
if RUBY_VERSION < "2.7.0"
|
52
53
|
def delete_all(*args, &blk)
|
@@ -62,7 +63,7 @@ module NewRelic
|
|
62
63
|
end
|
63
64
|
end
|
64
65
|
|
65
|
-
alias_method
|
66
|
+
alias_method(:destroy_all_without_newrelic, :destroy_all)
|
66
67
|
|
67
68
|
def destroy_all(*args, &blk)
|
68
69
|
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
@@ -70,8 +71,7 @@ module NewRelic
|
|
70
71
|
end
|
71
72
|
end
|
72
73
|
|
73
|
-
|
74
|
-
alias_method :calculate_without_newrelic, :calculate
|
74
|
+
alias_method(:calculate_without_newrelic, :calculate)
|
75
75
|
|
76
76
|
def calculate(*args, &blk)
|
77
77
|
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
@@ -79,9 +79,8 @@ module NewRelic
|
|
79
79
|
end
|
80
80
|
end
|
81
81
|
|
82
|
-
|
83
82
|
if method_defined?(:pluck)
|
84
|
-
alias_method
|
83
|
+
alias_method(:pluck_without_newrelic, :pluck)
|
85
84
|
|
86
85
|
def pluck(*args, &blk)
|
87
86
|
::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
|
@@ -94,32 +93,41 @@ module NewRelic
|
|
94
93
|
end
|
95
94
|
|
96
95
|
ACTIVE_RECORD = "ActiveRecord".freeze
|
97
|
-
OTHER
|
96
|
+
OTHER = "other".freeze
|
97
|
+
MAKARA_SUFFIX = "_makara".freeze
|
98
|
+
|
99
|
+
# convert vendor (makara, etc.) wrapper names to their bare names
|
100
|
+
# ex: postgresql_makara -> postgresql
|
101
|
+
def bare_adapter_name(adapter_name)
|
102
|
+
# TODO: OLD RUBIES - RUBY_VERSION < 2.5
|
103
|
+
# With Ruby 2.5+ we could use #delete_suffix instead of #chomp for a
|
104
|
+
# potential speed boost
|
105
|
+
return adapter_name.chomp(MAKARA_SUFFIX) if adapter_name && adapter_name.end_with?(MAKARA_SUFFIX)
|
106
|
+
|
107
|
+
adapter_name
|
108
|
+
end
|
98
109
|
|
99
|
-
def product_operation_collection_for
|
100
|
-
product
|
101
|
-
splits
|
102
|
-
model
|
110
|
+
def product_operation_collection_for(name, sql, adapter_name)
|
111
|
+
product = map_product(bare_adapter_name(adapter_name))
|
112
|
+
splits = split_name(name)
|
113
|
+
model = model_from_splits(splits)
|
103
114
|
operation = operation_from_splits(splits, sql)
|
104
|
-
NewRelic::Agent::Datastores::MetricHelper.product_operation_collection_for
|
115
|
+
NewRelic::Agent::Datastores::MetricHelper.product_operation_collection_for(product, operation, model, ACTIVE_RECORD)
|
105
116
|
end
|
106
117
|
|
107
118
|
SPACE = ' '.freeze
|
108
|
-
EMPTY = [].freeze
|
109
119
|
|
110
120
|
def split_name(name)
|
111
121
|
if name && name.respond_to?(:split)
|
112
122
|
name.split(SPACE)
|
113
123
|
else
|
114
|
-
|
124
|
+
NewRelic::EMPTY_ARRAY
|
115
125
|
end
|
116
126
|
end
|
117
127
|
|
118
128
|
def model_from_splits(splits)
|
119
129
|
if splits.length == 2
|
120
130
|
splits.first
|
121
|
-
else
|
122
|
-
nil
|
123
131
|
end
|
124
132
|
end
|
125
133
|
|
@@ -135,16 +143,16 @@ module NewRelic
|
|
135
143
|
# known operations coming in. Anything not matching the list is fine,
|
136
144
|
# it just needs to get downcased directly for use.
|
137
145
|
OPERATION_NAMES = {
|
138
|
-
'Find'
|
139
|
-
'Load'
|
140
|
-
'Count'
|
141
|
-
'Exists'
|
142
|
-
'Create'
|
146
|
+
'Find' => 'find',
|
147
|
+
'Load' => 'find',
|
148
|
+
'Count' => 'find',
|
149
|
+
'Exists' => 'find',
|
150
|
+
'Create' => 'create',
|
143
151
|
'Columns' => 'columns',
|
144
152
|
'Indexes' => 'indexes',
|
145
153
|
'Destroy' => 'destroy',
|
146
|
-
'Update'
|
147
|
-
'Save'
|
154
|
+
'Update' => 'update',
|
155
|
+
'Save' => 'save'
|
148
156
|
}.freeze
|
149
157
|
|
150
158
|
def map_operation(raw_operation)
|
@@ -155,41 +163,41 @@ module NewRelic
|
|
155
163
|
end
|
156
164
|
|
157
165
|
PRODUCT_NAMES = {
|
158
|
-
"mysql"
|
159
|
-
"mysql2"
|
166
|
+
"mysql" => "MySQL",
|
167
|
+
"mysql2" => "MySQL",
|
160
168
|
|
161
169
|
"postgresql" => "Postgres",
|
162
170
|
|
163
|
-
"sqlite3"
|
171
|
+
"sqlite3" => "SQLite",
|
164
172
|
|
165
173
|
# https://rubygems.org/gems/activerecord-jdbcpostgresql-adapter
|
166
|
-
"jdbcmysql"
|
174
|
+
"jdbcmysql" => "MySQL",
|
167
175
|
|
168
176
|
# https://rubygems.org/gems/activerecord-jdbcpostgresql-adapter
|
169
177
|
"jdbcpostgresql" => "Postgres",
|
170
|
-
|
178
|
+
|
171
179
|
# https://rubygems.org/gems/activerecord-postgis-adapter
|
172
|
-
"postgis"
|
180
|
+
"postgis" => "Postgres",
|
173
181
|
|
174
182
|
# https://rubygems.org/gems/activerecord-jdbcsqlite3-adapter
|
175
|
-
"jdbcsqlite3"
|
183
|
+
"jdbcsqlite3" => "SQLite",
|
176
184
|
|
177
185
|
# https://rubygems.org/gems/activerecord-jdbcderby-adapter
|
178
|
-
"derby"
|
179
|
-
"jdbcderby"
|
186
|
+
"derby" => "Derby",
|
187
|
+
"jdbcderby" => "Derby",
|
180
188
|
|
181
189
|
# https://rubygems.org/gems/activerecord-jdbc-adapter
|
182
|
-
"jdbc"
|
190
|
+
"jdbc" => "JDBC",
|
183
191
|
|
184
192
|
# https://rubygems.org/gems/activerecord-jdbcmssql-adapter
|
185
|
-
"jdbcmssql"
|
186
|
-
"mssql"
|
193
|
+
"jdbcmssql" => "MSSQL",
|
194
|
+
"mssql" => "MSSQL",
|
187
195
|
|
188
196
|
# https://rubygems.org/gems/activerecord-sqlserver-adapter
|
189
|
-
"sqlserver"
|
197
|
+
"sqlserver" => "MSSQL",
|
190
198
|
|
191
199
|
# https://rubygems.org/gems/activerecord-odbc-adapter
|
192
|
-
"odbc"
|
200
|
+
"odbc" => "ODBC",
|
193
201
|
|
194
202
|
# https://rubygems.org/gems/activerecord-oracle_enhanced-adapter
|
195
203
|
"oracle_enhanced" => "Oracle"
|
@@ -198,25 +206,24 @@ module NewRelic
|
|
198
206
|
ACTIVE_RECORD_DEFAULT_PRODUCT_NAME = "ActiveRecord".freeze
|
199
207
|
|
200
208
|
def map_product(adapter_name)
|
201
|
-
PRODUCT_NAMES.fetch(adapter_name,
|
202
|
-
ACTIVE_RECORD_DEFAULT_PRODUCT_NAME)
|
209
|
+
PRODUCT_NAMES.fetch(adapter_name, ACTIVE_RECORD_DEFAULT_PRODUCT_NAME)
|
203
210
|
end
|
204
211
|
|
205
212
|
module InstanceIdentification
|
206
213
|
extend self
|
207
214
|
|
208
215
|
PRODUCT_SYMBOLS = {
|
209
|
-
"mysql"
|
210
|
-
"mysql2"
|
211
|
-
"jdbcmysql"
|
216
|
+
"mysql" => :mysql,
|
217
|
+
"mysql2" => :mysql,
|
218
|
+
"jdbcmysql" => :mysql,
|
212
219
|
|
213
|
-
"postgresql"
|
220
|
+
"postgresql" => :postgres,
|
214
221
|
"jdbcpostgresql" => :postgres,
|
215
|
-
"postgis"
|
222
|
+
"postgis" => :postgres
|
216
223
|
}.freeze
|
217
224
|
|
218
225
|
DATASTORE_DEFAULT_PORTS = {
|
219
|
-
:mysql
|
226
|
+
:mysql => "3306",
|
220
227
|
:postgres => "5432"
|
221
228
|
}.freeze
|
222
229
|
|
@@ -225,13 +232,18 @@ module NewRelic
|
|
225
232
|
SLASH = "/".freeze
|
226
233
|
LOCALHOST = "localhost".freeze
|
227
234
|
|
235
|
+
def adapter_from_config(config)
|
236
|
+
bare_name = NewRelic::Agent::Instrumentation::ActiveRecordHelper.bare_adapter_name(config[:adapter])
|
237
|
+
PRODUCT_SYMBOLS[bare_name]
|
238
|
+
end
|
239
|
+
|
228
240
|
def host(config)
|
229
241
|
return UNKNOWN unless config
|
230
242
|
|
231
|
-
configured_value
|
232
|
-
adapter =
|
243
|
+
configured_value = config[:host]
|
244
|
+
adapter = adapter_from_config(config)
|
233
245
|
if configured_value.nil? ||
|
234
|
-
|
246
|
+
postgres_unix_domain_socket_case?(configured_value, adapter)
|
235
247
|
|
236
248
|
LOCALHOST
|
237
249
|
elsif configured_value.empty?
|
@@ -239,16 +251,15 @@ module NewRelic
|
|
239
251
|
else
|
240
252
|
configured_value
|
241
253
|
end
|
242
|
-
|
243
254
|
rescue => e
|
244
|
-
NewRelic::Agent.logger.debug
|
255
|
+
NewRelic::Agent.logger.debug("Failed to retrieve ActiveRecord host: #{e}")
|
245
256
|
UNKNOWN
|
246
257
|
end
|
247
258
|
|
248
259
|
def port_path_or_id(config)
|
249
260
|
return UNKNOWN unless config
|
250
261
|
|
251
|
-
adapter =
|
262
|
+
adapter = adapter_from_config(config)
|
252
263
|
if config[:socket]
|
253
264
|
config[:socket].empty? ? UNKNOWN : config[:socket]
|
254
265
|
elsif postgres_unix_domain_socket_case?(config[:host], adapter) || mysql_default_case?(config, adapter)
|
@@ -260,16 +271,15 @@ module NewRelic
|
|
260
271
|
else
|
261
272
|
UNKNOWN
|
262
273
|
end
|
263
|
-
|
264
274
|
rescue => e
|
265
|
-
NewRelic::Agent.logger.debug
|
275
|
+
NewRelic::Agent.logger.debug("Failed to retrieve ActiveRecord port_path_or_id: #{e}")
|
266
276
|
UNKNOWN
|
267
277
|
end
|
268
278
|
|
269
279
|
SUPPORTED_ADAPTERS = [:mysql, :postgres].freeze
|
270
280
|
|
271
|
-
def supported_adapter?
|
272
|
-
config && SUPPORTED_ADAPTERS.include?(
|
281
|
+
def supported_adapter?(config)
|
282
|
+
config && SUPPORTED_ADAPTERS.include?(adapter_from_config(config))
|
273
283
|
end
|
274
284
|
|
275
285
|
private
|
@@ -1,11 +1,10 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/instrumentation/active_record_subscriber'
|
6
6
|
require 'new_relic/agent/instrumentation/active_record_prepend'
|
7
7
|
|
8
|
-
|
9
8
|
# Provides a way to send :connection through ActiveSupport notifications to avoid
|
10
9
|
# looping through connection handlers to locate a connection by connection_id
|
11
10
|
# This is not needed in Rails 6+: https://github.com/rails/rails/pull/34602
|
@@ -20,12 +19,13 @@ module NewRelic
|
|
20
19
|
def log(sql, name = "SQL", binds = [], statement_name = nil)
|
21
20
|
@instrumenter.instrument(
|
22
21
|
SQL_ACTIVE_RECORD,
|
23
|
-
:sql
|
24
|
-
:name
|
25
|
-
:connection_id
|
26
|
-
:connection
|
22
|
+
:sql => sql,
|
23
|
+
:name => name,
|
24
|
+
:connection_id => object_id,
|
25
|
+
:connection => self,
|
27
26
|
:statement_name => statement_name,
|
28
|
-
:binds
|
27
|
+
:binds => binds
|
28
|
+
) { yield }
|
29
29
|
rescue => e
|
30
30
|
# The translate_exception_class method got introduced in 4.1
|
31
31
|
if ::ActiveRecord::VERSION::MINOR == 0
|
@@ -41,13 +41,14 @@ module NewRelic
|
|
41
41
|
def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil)
|
42
42
|
@instrumenter.instrument(
|
43
43
|
SQL_ACTIVE_RECORD,
|
44
|
-
sql:
|
45
|
-
name:
|
46
|
-
binds:
|
44
|
+
sql: sql,
|
45
|
+
name: name,
|
46
|
+
binds: binds,
|
47
47
|
type_casted_binds: type_casted_binds,
|
48
|
-
statement_name:
|
49
|
-
connection_id:
|
50
|
-
connection:
|
48
|
+
statement_name: statement_name,
|
49
|
+
connection_id: object_id,
|
50
|
+
connection: self
|
51
|
+
) { yield }
|
51
52
|
rescue => e
|
52
53
|
raise translate_exception_class(e, sql)
|
53
54
|
end
|
@@ -58,17 +59,18 @@ module NewRelic
|
|
58
59
|
def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil) # :doc:
|
59
60
|
@instrumenter.instrument(
|
60
61
|
SQL_ACTIVE_RECORD,
|
61
|
-
sql:
|
62
|
-
name:
|
63
|
-
binds:
|
62
|
+
sql: sql,
|
63
|
+
name: name,
|
64
|
+
binds: binds,
|
64
65
|
type_casted_binds: type_casted_binds,
|
65
|
-
statement_name:
|
66
|
-
connection_id:
|
67
|
-
connection:
|
68
|
-
|
69
|
-
|
70
|
-
|
66
|
+
statement_name: statement_name,
|
67
|
+
connection_id: object_id,
|
68
|
+
connection: self
|
69
|
+
) do
|
70
|
+
@lock.synchronize do
|
71
|
+
yield
|
71
72
|
end
|
73
|
+
end
|
72
74
|
rescue => e
|
73
75
|
raise translate_exception_class(e, sql)
|
74
76
|
end
|
@@ -82,9 +84,9 @@ DependencyDetection.defer do
|
|
82
84
|
named :active_record_notifications
|
83
85
|
|
84
86
|
depends_on do
|
85
|
-
defined?(
|
86
|
-
defined?(
|
87
|
-
|
87
|
+
defined?(ActiveRecord) && defined?(ActiveRecord::Base) &&
|
88
|
+
defined?(ActiveRecord::VERSION) &&
|
89
|
+
ActiveRecord::VERSION::MAJOR.to_i >= 4
|
88
90
|
end
|
89
91
|
|
90
92
|
depends_on do
|
@@ -93,7 +95,7 @@ DependencyDetection.defer do
|
|
93
95
|
end
|
94
96
|
|
95
97
|
executes do
|
96
|
-
|
98
|
+
NewRelic::Agent.logger.info('Installing notifications based Active Record instrumentation')
|
97
99
|
end
|
98
100
|
|
99
101
|
executes do
|
@@ -103,50 +105,51 @@ DependencyDetection.defer do
|
|
103
105
|
|
104
106
|
executes do
|
105
107
|
ActiveSupport.on_load(:active_record) do
|
106
|
-
|
107
|
-
|
108
|
-
|
108
|
+
NewRelic::Agent::PrependSupportability.record_metrics_for(
|
109
|
+
ActiveRecord::Base,
|
110
|
+
ActiveRecord::Relation
|
111
|
+
)
|
109
112
|
|
110
113
|
# Default to .prepending, unless the ActiveRecord version is <=4
|
111
114
|
# **AND** the :prepend_active_record_instrumentation config is false
|
112
|
-
if
|
113
|
-
||
|
115
|
+
if ActiveRecord::VERSION::MAJOR > 4 \
|
116
|
+
|| NewRelic::Agent.config[:prepend_active_record_instrumentation]
|
114
117
|
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
118
|
+
ActiveRecord::Base.send(:prepend,
|
119
|
+
NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions)
|
120
|
+
ActiveRecord::Relation.send(:prepend,
|
121
|
+
NewRelic::Agent::Instrumentation::ActiveRecordPrepend::RelationExtensions)
|
119
122
|
else
|
120
|
-
|
123
|
+
NewRelic::Agent::Instrumentation::ActiveRecordHelper.instrument_additional_methods
|
121
124
|
end
|
122
125
|
end
|
123
126
|
end
|
124
127
|
|
125
128
|
executes do
|
126
129
|
if NewRelic::Agent.config[:backport_fast_active_record_connection_lookup]
|
127
|
-
major_version =
|
128
|
-
minor_version =
|
130
|
+
major_version = ActiveRecord::VERSION::MAJOR.to_i
|
131
|
+
minor_version = ActiveRecord::VERSION::MINOR.to_i
|
129
132
|
|
130
133
|
activerecord_extension = if major_version == 4
|
131
|
-
|
134
|
+
NewRelic::Agent::Instrumentation::ActiveRecordNotifications::BaseExtensions4x
|
132
135
|
elsif major_version == 5 && minor_version == 0
|
133
|
-
|
136
|
+
NewRelic::Agent::Instrumentation::ActiveRecordNotifications::BaseExtensions50
|
134
137
|
elsif major_version == 5 && minor_version == 1
|
135
|
-
|
138
|
+
NewRelic::Agent::Instrumentation::ActiveRecordNotifications::BaseExtensions51
|
136
139
|
end
|
137
140
|
|
138
141
|
unless activerecord_extension.nil?
|
139
|
-
|
142
|
+
ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:prepend, activerecord_extension)
|
140
143
|
end
|
141
144
|
end
|
142
145
|
end
|
143
146
|
|
144
147
|
executes do
|
145
|
-
if
|
146
|
-
&&
|
147
|
-
&&
|
148
|
+
if ActiveRecord::VERSION::MAJOR == 5 \
|
149
|
+
&& ActiveRecord::VERSION::MINOR.to_i == 1 \
|
150
|
+
&& ActiveRecord::VERSION::TINY.to_i >= 6
|
148
151
|
|
149
|
-
|
152
|
+
ActiveRecord::Base.prepend(NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions516)
|
150
153
|
end
|
151
154
|
end
|
152
155
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/prepend_supportability'
|
6
6
|
|
@@ -11,13 +11,13 @@ module NewRelic
|
|
11
11
|
ACTIVE_RECORD = 'ActiveRecord'.freeze
|
12
12
|
|
13
13
|
module BaseExtensions
|
14
|
-
|
15
14
|
if RUBY_VERSION < "2.7.0"
|
16
15
|
def save(*args, &blk)
|
17
16
|
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
18
17
|
super
|
19
18
|
end
|
20
19
|
end
|
20
|
+
|
21
21
|
def save!(*args, &blk)
|
22
22
|
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
23
23
|
super
|
@@ -30,11 +30,12 @@ module NewRelic
|
|
30
30
|
super
|
31
31
|
end
|
32
32
|
end
|
33
|
+
|
33
34
|
def save!(*args, **kwargs, &blk)
|
34
35
|
::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
|
35
36
|
super
|
36
37
|
end
|
37
|
-
end
|
38
|
+
end
|
38
39
|
|
39
40
|
end
|
40
41
|
end
|
@@ -58,7 +59,6 @@ module NewRelic
|
|
58
59
|
end
|
59
60
|
end
|
60
61
|
end
|
61
|
-
|
62
62
|
end
|
63
63
|
|
64
64
|
module RelationExtensions
|
@@ -1,6 +1,7 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
4
5
|
require 'new_relic/agent/instrumentation/active_record_helper'
|
5
6
|
require 'new_relic/agent/instrumentation/notifications_subscriber'
|
6
7
|
|
@@ -43,7 +44,7 @@ module NewRelic
|
|
43
44
|
end
|
44
45
|
end
|
45
46
|
|
46
|
-
def start(name, id, payload) #THREAD_LOCAL_ACCESS
|
47
|
+
def start(name, id, payload) # THREAD_LOCAL_ACCESS
|
47
48
|
return if cached?(payload)
|
48
49
|
return unless NewRelic::Agent.tl_is_execution_traced?
|
49
50
|
|
@@ -54,7 +55,7 @@ module NewRelic
|
|
54
55
|
log_notification_error(e, name, 'start')
|
55
56
|
end
|
56
57
|
|
57
|
-
def finish(name, id, payload) #THREAD_LOCAL_ACCESS
|
58
|
+
def finish(name, id, payload) # THREAD_LOCAL_ACCESS
|
58
59
|
return if cached?(payload)
|
59
60
|
return unless state.is_execution_traced?
|
60
61
|
|
@@ -64,7 +65,6 @@ module NewRelic
|
|
64
65
|
end
|
65
66
|
segment.finish
|
66
67
|
end
|
67
|
-
|
68
68
|
rescue => e
|
69
69
|
log_notification_error(e, name, 'finish')
|
70
70
|
end
|
@@ -72,20 +72,18 @@ module NewRelic
|
|
72
72
|
def get_explain_plan(statement)
|
73
73
|
connection = NewRelic::Agent::Database.get_connection(statement.config) do
|
74
74
|
::ActiveRecord::Base.send("#{statement.config[:adapter]}_connection",
|
75
|
-
|
75
|
+
statement.config)
|
76
76
|
end
|
77
77
|
if connection && connection.respond_to?(:exec_query)
|
78
78
|
return connection.exec_query("EXPLAIN #{statement.sql}",
|
79
|
-
|
80
|
-
|
79
|
+
"Explain #{statement.name}",
|
80
|
+
statement.binds)
|
81
81
|
end
|
82
82
|
rescue => e
|
83
|
-
NewRelic::Agent.logger.debug
|
83
|
+
NewRelic::Agent.logger.debug("Couldn't fetch the explain plan for #{statement} due to #{e}")
|
84
84
|
end
|
85
85
|
|
86
86
|
def active_record_config(payload)
|
87
|
-
return unless payload[:connection_id]
|
88
|
-
|
89
87
|
# handle if the notification payload provides the AR connection
|
90
88
|
# available in Rails 6+ & our ActiveRecordNotifications#log extension
|
91
89
|
if payload[:connection]
|
@@ -93,22 +91,31 @@ module NewRelic
|
|
93
91
|
return connection_config if connection_config
|
94
92
|
end
|
95
93
|
|
96
|
-
|
97
|
-
connection_id = payload[:connection_id]
|
94
|
+
return unless connection_id = payload[:connection_id]
|
98
95
|
|
99
96
|
::ActiveRecord::Base.connection_handler.connection_pool_list.each do |handler|
|
100
|
-
connection = handler.connections.detect
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
97
|
+
connection = handler.connections.detect { |conn| conn.object_id == connection_id }
|
98
|
+
return connection.instance_variable_get(:@config) if connection
|
99
|
+
|
100
|
+
# when using makara, handler.connections will be empty, so use the
|
101
|
+
# spec config instead.
|
102
|
+
# https://github.com/newrelic/newrelic-ruby-agent/issues/507
|
103
|
+
# thank you @lucasklaassen
|
104
|
+
return handler.spec.config if use_spec_config?(handler)
|
105
105
|
end
|
106
106
|
|
107
|
-
|
107
|
+
nil
|
108
|
+
end
|
109
|
+
|
110
|
+
def use_spec_config?(handler)
|
111
|
+
handler.respond_to?(:spec) &&
|
112
|
+
handler.spec &&
|
113
|
+
handler.spec.config &&
|
114
|
+
handler.spec.config[:adapter].end_with?('makara')
|
108
115
|
end
|
109
116
|
|
110
117
|
def start_segment(config, payload)
|
111
|
-
sql = Helper.correctly_encoded
|
118
|
+
sql = Helper.correctly_encoded(payload[:sql])
|
112
119
|
product, operation, collection = ActiveRecordHelper.product_operation_collection_for(
|
113
120
|
payload[:name],
|
114
121
|
sql,
|
@@ -132,7 +139,7 @@ module NewRelic
|
|
132
139
|
port_path_or_id: port_path_or_id,
|
133
140
|
database_name: database)
|
134
141
|
|
135
|
-
segment._notice_sql
|
142
|
+
segment._notice_sql(sql, config, @explainer, payload[:binds], payload[:name])
|
136
143
|
segment
|
137
144
|
end
|
138
145
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/instrumentation/active_storage_subscriber'
|
6
6
|
|
@@ -8,12 +8,16 @@ DependencyDetection.defer do
|
|
8
8
|
named :active_storage
|
9
9
|
|
10
10
|
depends_on do
|
11
|
-
|
11
|
+
!NewRelic::Agent.config[:disable_active_storage]
|
12
|
+
end
|
13
|
+
|
14
|
+
depends_on do
|
15
|
+
defined?(ActiveStorage) &&
|
12
16
|
!NewRelic::Agent::Instrumentation::ActiveStorageSubscriber.subscribed?
|
13
17
|
end
|
14
18
|
|
15
19
|
executes do
|
16
|
-
|
20
|
+
NewRelic::Agent.logger.info('Installing ActiveStorage instrumentation')
|
17
21
|
end
|
18
22
|
|
19
23
|
executes do
|