newrelic_rpm 6.8.0.360 → 9.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +14 -1
- data/.rubocop.yml +1845 -0
- data/.rubocop_todo.yml +61 -0
- data/.simplecov +16 -0
- data/.snyk +11 -0
- data/.yardopts +1 -0
- data/Brewfile +13 -0
- data/CHANGELOG.md +4029 -2514
- data/CONTRIBUTING.md +132 -19
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Gemfile +5 -2
- data/Guardfile +21 -8
- data/LICENSE +202 -38
- data/README.md +86 -87
- data/Rakefile +32 -32
- data/THIRD_PARTY_NOTICES.md +28 -0
- data/Thorfile +5 -0
- data/bin/newrelic +4 -2
- data/bin/newrelic_cmd +2 -0
- data/bin/nrdebug +86 -63
- data/config.dot +5 -5
- data/docker-compose.yml +107 -0
- data/init.rb +5 -7
- data/install.rb +3 -3
- data/lefthook.yml +9 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +14 -10
- data/lib/new_relic/agent/agent.rb +114 -942
- data/lib/new_relic/agent/agent_helpers/connect.rb +222 -0
- data/lib/new_relic/agent/agent_helpers/harvest.rb +153 -0
- data/lib/new_relic/agent/agent_helpers/shutdown.rb +72 -0
- data/lib/new_relic/agent/agent_helpers/special_startup.rb +74 -0
- data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +175 -0
- data/lib/new_relic/agent/agent_helpers/startup.rb +202 -0
- data/lib/new_relic/agent/agent_helpers/transmit.rb +76 -0
- data/lib/new_relic/agent/agent_logger.rb +28 -24
- data/lib/new_relic/agent/attribute_filter.rb +66 -49
- data/lib/new_relic/agent/attribute_processing.rb +10 -10
- data/lib/new_relic/agent/attributes.rb +9 -8
- data/lib/new_relic/agent/audit_logger.rb +22 -7
- data/lib/new_relic/agent/autostart.rb +22 -21
- data/lib/new_relic/agent/chained_call.rb +2 -2
- data/lib/new_relic/agent/commands/agent_command.rb +5 -5
- data/lib/new_relic/agent/commands/agent_command_router.rb +16 -14
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +17 -15
- data/lib/new_relic/agent/configuration/default_source.rb +1444 -1167
- data/lib/new_relic/agent/configuration/dotted_hash.rb +7 -6
- data/lib/new_relic/agent/configuration/environment_source.rb +14 -12
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +41 -18
- data/lib/new_relic/agent/configuration/high_security_source.rb +12 -13
- data/lib/new_relic/agent/configuration/manager.rb +96 -70
- data/lib/new_relic/agent/configuration/manual_source.rb +2 -2
- data/lib/new_relic/agent/configuration/mask_defaults.rb +4 -4
- data/lib/new_relic/agent/configuration/security_policy_source.rb +93 -96
- data/lib/new_relic/agent/configuration/server_source.rb +44 -42
- data/lib/new_relic/agent/configuration/yaml_source.rb +36 -12
- data/lib/new_relic/agent/configuration.rb +2 -2
- data/lib/new_relic/agent/connect/request_builder.rb +19 -19
- data/lib/new_relic/agent/connect/response_handler.rb +6 -9
- data/lib/new_relic/agent/custom_event_aggregator.rb +16 -16
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +6 -7
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +18 -17
- data/lib/new_relic/agent/database/obfuscator.rb +5 -5
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +4 -4
- data/lib/new_relic/agent/database.rb +47 -56
- data/lib/new_relic/agent/database_adapter.rb +35 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +22 -23
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +8 -7
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +18 -22
- data/lib/new_relic/agent/datastores/mongo.rb +7 -12
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +10 -16
- data/lib/new_relic/agent/datastores.rb +14 -16
- data/lib/new_relic/agent/deprecator.rb +2 -2
- data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +13 -12
- data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +90 -70
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +163 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +38 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +245 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +127 -0
- data/lib/new_relic/agent/distributed_tracing.rb +113 -32
- data/lib/new_relic/agent/encoding_normalizer.rb +5 -3
- data/lib/new_relic/agent/error_collector.rb +129 -65
- data/lib/new_relic/agent/error_event_aggregator.rb +9 -8
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +10 -8
- data/lib/new_relic/agent/event_aggregator.rb +23 -22
- data/lib/new_relic/agent/event_buffer.rb +8 -9
- data/lib/new_relic/agent/event_listener.rb +2 -3
- data/lib/new_relic/agent/event_loop.rb +28 -26
- data/lib/new_relic/agent/external.rb +19 -52
- data/lib/new_relic/agent/guid_generator.rb +14 -12
- data/lib/new_relic/agent/harvester.rb +6 -9
- data/lib/new_relic/agent/heap.rb +9 -10
- data/lib/new_relic/agent/hostname.rb +22 -9
- data/lib/new_relic/agent/http_clients/abstract.rb +69 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +30 -26
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +37 -21
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +22 -23
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +18 -17
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +28 -8
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +17 -17
- data/lib/new_relic/agent/http_clients/uri_util.rb +13 -14
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +10 -25
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +42 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +46 -34
- data/lib/new_relic/agent/instrumentation/action_dispatch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb +64 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb +33 -0
- data/lib/new_relic/agent/instrumentation/action_mailer.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb +85 -0
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +28 -21
- data/lib/new_relic/agent/instrumentation/active_job.rb +34 -14
- data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +21 -7
- data/lib/new_relic/agent/instrumentation/active_record.rb +97 -47
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +97 -73
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +53 -66
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +36 -12
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +37 -24
- data/lib/new_relic/agent/instrumentation/active_storage.rb +8 -4
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +9 -30
- data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
- data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/bunny.rb +14 -138
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +75 -63
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
- data/lib/new_relic/agent/instrumentation/curb.rb +16 -201
- data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
- data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +38 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +31 -52
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +67 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +10 -8
- data/lib/new_relic/agent/instrumentation/excon.rb +29 -31
- data/lib/new_relic/agent/instrumentation/fiber/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
- data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
- data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/grape.rb +17 -123
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +12 -32
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +6 -7
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +60 -125
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +103 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +57 -71
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +16 -15
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +11 -11
- data/lib/new_relic/agent/instrumentation/mongo.rb +7 -132
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +53 -17
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
- data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +75 -9
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +22 -58
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +7 -7
- data/lib/new_relic/agent/instrumentation/queue_time.rb +9 -10
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +33 -141
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +22 -57
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +5 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +10 -9
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +18 -6
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +9 -6
- data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +142 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +18 -158
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +94 -0
- data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
- data/lib/new_relic/agent/instrumentation/redis.rb +20 -103
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +33 -41
- data/lib/new_relic/agent/instrumentation/sequel.rb +17 -20
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +13 -13
- data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +30 -46
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +31 -37
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +126 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +4 -4
- data/lib/new_relic/agent/instrumentation/sinatra.rb +35 -165
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
- data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +42 -0
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +14 -76
- data/lib/new_relic/agent/instrumentation.rb +2 -2
- data/lib/new_relic/agent/internal_agent_error.rb +3 -3
- data/lib/new_relic/agent/javascript_instrumentor.rb +59 -48
- data/lib/new_relic/agent/linking_metadata.rb +44 -0
- data/lib/new_relic/agent/local_log_decorator.rb +37 -0
- data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
- data/lib/new_relic/agent/log_once.rb +2 -2
- data/lib/new_relic/agent/log_priority.rb +20 -0
- data/lib/new_relic/agent/logging.rb +104 -51
- data/lib/new_relic/agent/memory_logger.rb +3 -3
- data/lib/new_relic/agent/messaging.rb +74 -156
- data/lib/new_relic/agent/method_tracer.rb +157 -150
- data/lib/new_relic/agent/method_tracer_helpers.rb +89 -12
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +117 -0
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +28 -0
- data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +3 -4
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +8 -13
- data/lib/new_relic/agent/monitors.rb +26 -0
- data/lib/new_relic/agent/new_relic_service/encoders.rb +8 -8
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +7 -7
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +3 -3
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -5
- data/lib/new_relic/agent/new_relic_service.rb +266 -193
- data/lib/new_relic/agent/noticeable_error.rb +19 -0
- data/lib/new_relic/agent/null_logger.rb +8 -4
- data/lib/new_relic/agent/obfuscator.rb +9 -11
- data/lib/new_relic/agent/parameter_filtering.rb +30 -16
- data/lib/new_relic/agent/payload_metric_mapping.rb +10 -11
- data/lib/new_relic/agent/pipe_channel_manager.rb +34 -23
- data/lib/new_relic/agent/pipe_service.rb +14 -9
- data/lib/new_relic/agent/prepend_supportability.rb +3 -3
- data/lib/new_relic/agent/priority_sampled_buffer.rb +16 -16
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +12 -12
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -14
- data/lib/new_relic/agent/rules_engine.rb +6 -5
- data/lib/new_relic/agent/sampler.rb +6 -6
- data/lib/new_relic/agent/sampler_collection.rb +5 -6
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +9 -8
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +21 -18
- data/lib/new_relic/agent/samplers/memory_sampler.rb +33 -22
- data/lib/new_relic/agent/samplers/object_sampler.rb +3 -3
- data/lib/new_relic/agent/samplers/vm_sampler.rb +22 -20
- data/lib/new_relic/agent/span_event_aggregator.rb +16 -16
- data/lib/new_relic/agent/span_event_primitive.rb +106 -68
- data/lib/new_relic/agent/sql_sampler.rb +23 -23
- data/lib/new_relic/agent/stats.rb +80 -43
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +11 -13
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +13 -14
- data/lib/new_relic/agent/stats_engine.rb +9 -9
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +9 -10
- data/lib/new_relic/agent/system_info.rb +97 -68
- data/lib/new_relic/agent/threading/agent_thread.rb +19 -15
- data/lib/new_relic/agent/threading/backtrace_node.rb +13 -14
- data/lib/new_relic/agent/threading/backtrace_service.rb +18 -22
- data/lib/new_relic/agent/threading/thread_profile.rb +25 -25
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +3 -3
- data/lib/new_relic/agent/tracer.rb +127 -107
- data/lib/new_relic/agent/transaction/abstract_segment.rb +145 -49
- data/lib/new_relic/agent/transaction/datastore_segment.rb +23 -19
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +185 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +76 -86
- data/lib/new_relic/agent/transaction/external_request_segment.rb +67 -77
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +34 -46
- data/lib/new_relic/agent/transaction/request_attributes.rb +40 -40
- data/lib/new_relic/agent/transaction/segment.rb +41 -11
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +2 -4
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +3 -3
- data/lib/new_relic/agent/transaction/trace.rb +19 -17
- data/lib/new_relic/agent/transaction/trace_builder.rb +11 -11
- data/lib/new_relic/agent/transaction/trace_context.rb +102 -93
- data/lib/new_relic/agent/transaction/trace_node.rb +31 -32
- data/lib/new_relic/agent/transaction/tracing.rb +22 -13
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +7 -7
- data/lib/new_relic/agent/transaction.rb +239 -198
- data/lib/new_relic/agent/transaction_error_primitive.rb +32 -28
- data/lib/new_relic/agent/transaction_event_aggregator.rb +17 -17
- data/lib/new_relic/agent/transaction_event_primitive.rb +43 -47
- data/lib/new_relic/agent/transaction_event_recorder.rb +17 -16
- data/lib/new_relic/agent/transaction_metrics.rb +11 -10
- data/lib/new_relic/agent/transaction_sampler.rb +8 -9
- data/lib/new_relic/agent/transaction_time_aggregator.rb +33 -28
- data/lib/new_relic/agent/utilization/aws.rb +35 -5
- data/lib/new_relic/agent/utilization/azure.rb +7 -7
- data/lib/new_relic/agent/utilization/gcp.rb +11 -11
- data/lib/new_relic/agent/utilization/pcf.rb +7 -6
- data/lib/new_relic/agent/utilization/vendor.rb +45 -30
- data/lib/new_relic/agent/utilization_data.rb +8 -6
- data/lib/new_relic/agent/vm/jruby_vm.rb +2 -2
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +4 -4
- data/lib/new_relic/agent/vm/mri_vm.rb +54 -26
- data/lib/new_relic/agent/vm/snapshot.rb +6 -6
- data/lib/new_relic/agent/vm.rb +2 -2
- data/lib/new_relic/agent/worker_loop.rb +11 -13
- data/lib/new_relic/agent.rb +159 -109
- data/lib/new_relic/cli/command.rb +22 -24
- data/lib/new_relic/cli/commands/deployments.rb +101 -51
- data/lib/new_relic/cli/commands/install.rb +33 -35
- data/lib/new_relic/coerce.rb +19 -15
- data/lib/new_relic/collection_helper.rb +51 -49
- data/lib/new_relic/constants.rb +38 -0
- data/lib/new_relic/control/class_methods.rb +6 -6
- data/lib/new_relic/control/frameworks/external.rb +3 -3
- data/lib/new_relic/control/frameworks/rails.rb +50 -32
- data/lib/new_relic/control/frameworks/rails3.rb +4 -5
- data/lib/new_relic/control/frameworks/rails4.rb +2 -2
- data/lib/new_relic/control/frameworks/rails_notifications.rb +2 -2
- data/lib/new_relic/control/frameworks/ruby.rb +4 -4
- data/lib/new_relic/control/frameworks/sinatra.rb +8 -2
- data/lib/new_relic/control/frameworks.rb +2 -2
- data/lib/new_relic/control/instance_methods.rb +28 -46
- data/lib/new_relic/control/instrumentation.rb +26 -12
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +4 -5
- data/lib/new_relic/control.rb +2 -3
- data/lib/new_relic/delayed_job_injection.rb +2 -2
- data/lib/new_relic/dependency_detection.rb +138 -31
- data/lib/new_relic/environment_report.rb +42 -36
- data/lib/new_relic/helper.rb +50 -8
- data/lib/new_relic/language_support.rb +31 -7
- data/lib/new_relic/latest_changes.rb +11 -10
- data/lib/new_relic/local_environment.rb +23 -27
- data/lib/new_relic/metric_data.rb +32 -27
- data/lib/new_relic/metric_spec.rb +9 -7
- data/lib/new_relic/noticed_error.rb +58 -47
- data/lib/new_relic/rack/agent_hooks.rb +2 -2
- data/lib/new_relic/rack/agent_middleware.rb +6 -4
- data/lib/new_relic/rack/browser_monitoring.rb +136 -117
- data/lib/new_relic/rack.rb +2 -2
- data/lib/new_relic/recipes/capistrano3.rb +5 -63
- data/lib/new_relic/recipes/capistrano_legacy.rb +25 -28
- data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
- data/lib/new_relic/recipes.rb +2 -2
- data/lib/new_relic/supportability_helper.rb +23 -7
- data/lib/new_relic/traced_thread.rb +39 -0
- data/lib/new_relic/version.rb +7 -18
- data/lib/newrelic_rpm.rb +21 -34
- data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +18 -21
- data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +10 -16
- data/lib/tasks/all.rb +4 -4
- data/lib/tasks/config.rake +24 -119
- data/lib/tasks/coverage_report.rake +28 -0
- data/lib/tasks/helpers/config.html.erb +21 -0
- data/lib/tasks/helpers/format.rb +123 -0
- data/lib/tasks/helpers/matches.rb +12 -0
- data/lib/tasks/helpers/prompt.rb +24 -0
- data/lib/tasks/helpers/removers.rb +33 -0
- data/lib/tasks/install.rake +8 -4
- data/lib/tasks/instrumentation_generator/README.md +63 -0
- data/lib/tasks/instrumentation_generator/TODO.md +33 -0
- data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
- data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
- data/lib/tasks/multiverse.rake +4 -0
- data/lib/tasks/multiverse.rb +23 -9
- data/lib/tasks/newrelic.rb +3 -2
- data/lib/tasks/tests.rake +17 -17
- data/newrelic.yml +672 -3
- data/newrelic_rpm.gemspec +46 -39
- data/recipes/newrelic.rb +3 -3
- data/test/agent_helper.rb +340 -110
- metadata +272 -97
- data/.travis.yml +0 -210
- data/bin/mongrel_rpm +0 -33
- data/cert/cacert.pem +0 -1177
- data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
- data/lib/new_relic/agent/distributed_trace_intrinsics.rb +0 -90
- data/lib/new_relic/agent/distributed_trace_metrics.rb +0 -74
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -30
- data/lib/new_relic/agent/distributed_trace_payload.rb +0 -175
- data/lib/new_relic/agent/distributed_trace_transport_type.rb +0 -43
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -74
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -202
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -46
- data/lib/new_relic/agent/instrumentation/http.rb +0 -46
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
- data/lib/new_relic/agent/instrumentation/net.rb +0 -50
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
- data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
- data/lib/new_relic/agent/range_extensions.rb +0 -47
- data/lib/new_relic/agent/supported_versions.rb +0 -275
- data/lib/new_relic/agent/trace_context.rb +0 -244
- data/lib/new_relic/agent/trace_context_payload.rb +0 -134
- data/lib/new_relic/agent/trace_context_request_monitor.rb +0 -42
- data/lib/new_relic/build.rb +0 -2
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/new_relic/metrics.rb +0 -13
- data/lib/tasks/config.html.erb +0 -32
- data/true +0 -0
- /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,74 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
-
|
5
|
-
require 'new_relic/agent/database'
|
6
|
-
|
7
|
-
module NewRelic
|
8
|
-
module Instrumentation
|
9
|
-
module ActsAsSolrInstrumentation
|
10
|
-
module ParserMethodsInstrumentation
|
11
|
-
def parse_query_with_newrelic(*args)
|
12
|
-
self.class.trace_execution_scoped(["SolrClient/ActsAsSolr/query"]) do
|
13
|
-
begin
|
14
|
-
parse_query_without_newrelic(*args)
|
15
|
-
ensure
|
16
|
-
return unless txn = ::NewRelic::Agent::Tracer.current_transaction
|
17
|
-
txn.current_segment.params[:statement] = ::NewRelic::Agent::Database.truncate_query(args.first.inspect) rescue nil
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|
25
|
-
|
26
|
-
DependencyDetection.defer do
|
27
|
-
@name = :acts_as_solr
|
28
|
-
|
29
|
-
depends_on do
|
30
|
-
defined?(ActsAsSolr)
|
31
|
-
end
|
32
|
-
|
33
|
-
depends_on do
|
34
|
-
defined?(ActsAsSolr::ParserMethods)
|
35
|
-
end
|
36
|
-
|
37
|
-
depends_on do
|
38
|
-
defined?(ActsAsSolr::ClassMethods)
|
39
|
-
end
|
40
|
-
|
41
|
-
depends_on do
|
42
|
-
defined?(ActsAsSolr::CommonMethods)
|
43
|
-
end
|
44
|
-
|
45
|
-
executes do
|
46
|
-
::NewRelic::Agent.logger.info 'Installing ActsAsSolr instrumentation'
|
47
|
-
end
|
48
|
-
|
49
|
-
executes do
|
50
|
-
ActsAsSolr::ParserMethods.module_eval do
|
51
|
-
include NewRelic::Instrumentation::ActsAsSolrInstrumentation::ParserMethodsInstrumentation
|
52
|
-
alias :parse_query_without_newrelic :parse_query
|
53
|
-
alias :parse_query :parse_query_with_newrelic
|
54
|
-
end
|
55
|
-
end
|
56
|
-
|
57
|
-
executes do
|
58
|
-
ActsAsSolr::ClassMethods.module_eval do
|
59
|
-
%w[find_by_solr find_id_by_solr multi_solr_search count_by_solr].each do |method|
|
60
|
-
add_method_tracer method, 'SolrClient/ActsAsSolr/query'
|
61
|
-
end
|
62
|
-
add_method_tracer :rebuild_solr_index, 'SolrClient/ActsAsSolr/index'
|
63
|
-
end
|
64
|
-
end
|
65
|
-
|
66
|
-
executes do
|
67
|
-
ActsAsSolr::CommonMethods.module_eval do
|
68
|
-
add_method_tracer :solr_add, 'SolrClient/ActsAsSolr/add'
|
69
|
-
add_method_tracer :solr_delete, 'SolrClient/ActsAsSolr/delete'
|
70
|
-
add_method_tracer :solr_commit, 'SolrClient/ActsAsSolr/commit'
|
71
|
-
add_method_tracer :solr_optimize, 'SolrClient/ActsAsSolr/optimize'
|
72
|
-
end
|
73
|
-
end
|
74
|
-
end
|
@@ -1,25 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
-
|
5
|
-
DependencyDetection.defer do
|
6
|
-
@name = :authlogic
|
7
|
-
|
8
|
-
depends_on do
|
9
|
-
defined?(Authlogic) &&
|
10
|
-
defined?(Authlogic::Session) &&
|
11
|
-
defined?(Authlogic::Session::Base)
|
12
|
-
end
|
13
|
-
|
14
|
-
executes do
|
15
|
-
::NewRelic::Agent.logger.info 'Installing Authlogic instrumentation'
|
16
|
-
end
|
17
|
-
|
18
|
-
executes do
|
19
|
-
Authlogic::Session::Base.class_eval do
|
20
|
-
class << self
|
21
|
-
add_method_tracer :find, 'Custom/Authlogic/find'
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|
25
|
-
end
|
@@ -1,202 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
-
|
5
|
-
DependencyDetection.defer do
|
6
|
-
named :data_mapper
|
7
|
-
|
8
|
-
depends_on do
|
9
|
-
defined?(::DataMapper) &&
|
10
|
-
defined?(::DataMapper::Model) &&
|
11
|
-
defined?(::DataMapper::Resource) &&
|
12
|
-
defined?(::DataMapper::Collection)
|
13
|
-
end
|
14
|
-
|
15
|
-
executes do
|
16
|
-
::NewRelic::Agent.logger.info 'Installing DataMapper instrumentation'
|
17
|
-
require 'new_relic/agent/datastores/metric_helper'
|
18
|
-
end
|
19
|
-
|
20
|
-
executes do
|
21
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :get
|
22
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :first
|
23
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :last
|
24
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :all
|
25
|
-
|
26
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :create
|
27
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :create!
|
28
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :update
|
29
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :update!
|
30
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :destroy
|
31
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :destroy!
|
32
|
-
|
33
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :aggregate
|
34
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :find
|
35
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Model, :find_by_sql
|
36
|
-
end
|
37
|
-
|
38
|
-
executes do
|
39
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :update
|
40
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :update!
|
41
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :save
|
42
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :save!
|
43
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :destroy
|
44
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Resource, :destroy!
|
45
|
-
end
|
46
|
-
|
47
|
-
executes do
|
48
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :get
|
49
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :first
|
50
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :last
|
51
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :all
|
52
|
-
|
53
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :lazy_load
|
54
|
-
|
55
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :create
|
56
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :create!
|
57
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :update
|
58
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :update!
|
59
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :destroy
|
60
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :destroy!
|
61
|
-
|
62
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Collection, :aggregate
|
63
|
-
end
|
64
|
-
|
65
|
-
executes do
|
66
|
-
# Catch direct SQL calls that bypass CRUD
|
67
|
-
if defined?(::DataMapper::Adapters::DataObjectsAdapter)
|
68
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Adapters::DataObjectsAdapter, :select, true
|
69
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Adapters::DataObjectsAdapter, :execute, true
|
70
|
-
end
|
71
|
-
end
|
72
|
-
|
73
|
-
executes do
|
74
|
-
# DM::Validations overrides Model#create, so we patch it here as well
|
75
|
-
if defined?(::DataMapper::Validations::ClassMethods)
|
76
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Validations::ClassMethods, :create
|
77
|
-
end
|
78
|
-
end
|
79
|
-
|
80
|
-
executes do
|
81
|
-
# DM::Transaction calls commit() twice, so potentially shows up twice.
|
82
|
-
if defined?(::DataMapper::Transaction)
|
83
|
-
NewRelic::Agent::DataMapperTracing.add_tracer ::DataMapper::Transaction, :commit, true
|
84
|
-
end
|
85
|
-
end
|
86
|
-
|
87
|
-
executes do
|
88
|
-
if defined?(::DataObjects::Connection)
|
89
|
-
::DataObjects::Connection.class_eval do
|
90
|
-
include ::NewRelic::Agent::Instrumentation::DataMapperInstrumentation
|
91
|
-
end
|
92
|
-
end
|
93
|
-
end
|
94
|
-
end
|
95
|
-
|
96
|
-
module NewRelic
|
97
|
-
module Agent
|
98
|
-
module DataMapperTracing
|
99
|
-
def self.add_tracer(clazz, method_name, operation_only = false)
|
100
|
-
clazz.class_eval do
|
101
|
-
if method_defined?(method_name) || private_method_defined?(method_name)
|
102
|
-
define_method("#{method_name}_with_newrelic",
|
103
|
-
NewRelic::Agent::DataMapperTracing.method_body(clazz, method_name, operation_only))
|
104
|
-
|
105
|
-
alias_method "#{method_name}_without_newrelic", method_name
|
106
|
-
alias_method method_name, "#{method_name}_with_newrelic"
|
107
|
-
end
|
108
|
-
end
|
109
|
-
end
|
110
|
-
|
111
|
-
DATA_MAPPER = "DataMapper".freeze
|
112
|
-
PASSWORD_REGEX = /&password=.*?(&|$)/
|
113
|
-
AMPERSAND = '&'.freeze
|
114
|
-
PASSWORD_PARAM = '&password='.freeze
|
115
|
-
|
116
|
-
def self.method_body(clazz, method_name, operation_only)
|
117
|
-
use_model_name = NewRelic::Helper.instance_methods_include?(clazz, :model)
|
118
|
-
metric_operation = method_name.to_s.gsub(/[!?]/, "")
|
119
|
-
|
120
|
-
Proc.new do |*args, &blk|
|
121
|
-
begin
|
122
|
-
if operation_only
|
123
|
-
# Used by direct SQL, like ::DataMapper::Adapters::DataObjectsAdapter#select
|
124
|
-
name = nil
|
125
|
-
elsif use_model_name
|
126
|
-
# Used by ::DataMapper::Collection to get contained model name
|
127
|
-
name = self.model.name
|
128
|
-
elsif self.is_a?(Class)
|
129
|
-
# Used by class-style access, like Model.first()
|
130
|
-
name = self.name
|
131
|
-
else
|
132
|
-
# Used by instance-style access, like model.update(attr: "new")
|
133
|
-
name = self.class.name
|
134
|
-
end
|
135
|
-
|
136
|
-
segment = NewRelic::Agent::Tracer.start_datastore_segment(
|
137
|
-
product: DATA_MAPPER,
|
138
|
-
operation: metric_operation,
|
139
|
-
collection: name
|
140
|
-
)
|
141
|
-
|
142
|
-
begin
|
143
|
-
self.send("#{method_name}_without_newrelic", *args, &blk)
|
144
|
-
rescue ::DataObjects::ConnectionError => e
|
145
|
-
raise
|
146
|
-
rescue ::DataObjects::SQLError => e
|
147
|
-
e.uri.gsub!(PASSWORD_REGEX, AMPERSAND) if e.uri.include?(PASSWORD_PARAM)
|
148
|
-
|
149
|
-
strategy = NewRelic::Agent::Database.record_sql_method(:slow_sql)
|
150
|
-
case strategy
|
151
|
-
when :obfuscated
|
152
|
-
adapter_name = if self.respond_to?(:options)
|
153
|
-
self.options[:adapter]
|
154
|
-
else
|
155
|
-
if self.repository.adapter.respond_to?(:options)
|
156
|
-
self.repository.adapter.options[:adapter]
|
157
|
-
else
|
158
|
-
# DataMapper < 0.10.0
|
159
|
-
self.repository.adapter.uri.scheme
|
160
|
-
end
|
161
|
-
end
|
162
|
-
statement = NewRelic::Agent::Database::Statement.new(e.query, :adapter => adapter_name)
|
163
|
-
obfuscated_sql = NewRelic::Agent::Database.obfuscate_sql(statement)
|
164
|
-
e.instance_variable_set(:@query, obfuscated_sql)
|
165
|
-
when :off
|
166
|
-
e.instance_variable_set(:@query, nil)
|
167
|
-
end
|
168
|
-
|
169
|
-
raise
|
170
|
-
ensure
|
171
|
-
segment.finish if segment
|
172
|
-
end
|
173
|
-
end
|
174
|
-
end
|
175
|
-
end
|
176
|
-
end
|
177
|
-
|
178
|
-
module Instrumentation
|
179
|
-
module DataMapperInstrumentation
|
180
|
-
# Unlike in AR, log is called in DM after the query actually ran,
|
181
|
-
# complete with metrics. Since DO has already calculated the
|
182
|
-
# duration, there's nothing more to measure, so just record and log.
|
183
|
-
#
|
184
|
-
# We rely on the assumption that all possible entry points have been
|
185
|
-
# hooked with tracers, ensuring that notice_sql attaches this SQL to
|
186
|
-
# the proper call scope.
|
187
|
-
def log(msg) #THREAD_LOCAL_ACCESS
|
188
|
-
state = NewRelic::Agent::Tracer.state
|
189
|
-
return unless state.is_execution_traced?
|
190
|
-
|
191
|
-
txn = state.current_transaction
|
192
|
-
|
193
|
-
if txn && txn.current_segment.respond_to?(:notice_sql)
|
194
|
-
txn.current_segment.notice_sql msg.query
|
195
|
-
end
|
196
|
-
ensure
|
197
|
-
super
|
198
|
-
end
|
199
|
-
end
|
200
|
-
end
|
201
|
-
end
|
202
|
-
end
|
@@ -1,46 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
-
|
5
|
-
module ::Excon
|
6
|
-
class Connection
|
7
|
-
def newrelic_connection_params
|
8
|
-
(@connection || @data)
|
9
|
-
end
|
10
|
-
|
11
|
-
def newrelic_resolved_request_params(request_params)
|
12
|
-
resolved = newrelic_connection_params.merge(request_params)
|
13
|
-
resolved[:headers] = resolved[:headers].merge(request_params[:headers] || {})
|
14
|
-
resolved
|
15
|
-
end
|
16
|
-
|
17
|
-
def request_with_newrelic_trace(params, &block)
|
18
|
-
resolved_params = newrelic_resolved_request_params(params)
|
19
|
-
wrapped_request = ::NewRelic::Agent::HTTPClients::ExconHTTPRequest.new(resolved_params)
|
20
|
-
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
21
|
-
library: wrapped_request.type,
|
22
|
-
uri: wrapped_request.uri,
|
23
|
-
procedure: wrapped_request.method
|
24
|
-
)
|
25
|
-
|
26
|
-
begin
|
27
|
-
response = nil
|
28
|
-
segment.add_request_headers wrapped_request
|
29
|
-
|
30
|
-
response = request_without_newrelic_trace(resolved_params, &block)
|
31
|
-
|
32
|
-
wrapped_response = ::NewRelic::Agent::HTTPClients::ExconHTTPResponse.new(response)
|
33
|
-
segment.read_response_headers wrapped_response
|
34
|
-
|
35
|
-
response
|
36
|
-
ensure
|
37
|
-
segment.finish if segment
|
38
|
-
end
|
39
|
-
end
|
40
|
-
|
41
|
-
def self.install_newrelic_instrumentation
|
42
|
-
alias request_without_newrelic_trace request
|
43
|
-
alias request request_with_newrelic_trace
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
@@ -1,46 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
-
|
5
|
-
DependencyDetection.defer do
|
6
|
-
named :httprb
|
7
|
-
|
8
|
-
depends_on do
|
9
|
-
defined?(HTTP) && defined?(HTTP::Client)
|
10
|
-
end
|
11
|
-
|
12
|
-
executes do
|
13
|
-
::NewRelic::Agent.logger.info 'Installing http.rb instrumentation'
|
14
|
-
require 'new_relic/agent/cross_app_tracing'
|
15
|
-
require 'new_relic/agent/http_clients/http_rb_wrappers'
|
16
|
-
end
|
17
|
-
|
18
|
-
executes do
|
19
|
-
class HTTP::Client
|
20
|
-
def perform_with_newrelic_trace(request, options)
|
21
|
-
wrapped_request = ::NewRelic::Agent::HTTPClients::HTTPRequest.new(request)
|
22
|
-
|
23
|
-
begin
|
24
|
-
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
25
|
-
library: wrapped_request.type,
|
26
|
-
uri: wrapped_request.uri,
|
27
|
-
procedure: wrapped_request.method
|
28
|
-
)
|
29
|
-
|
30
|
-
segment.add_request_headers wrapped_request
|
31
|
-
|
32
|
-
response = perform_without_newrelic_trace(request, options)
|
33
|
-
wrapped_response = ::NewRelic::Agent::HTTPClients::HTTPResponse.new response
|
34
|
-
segment.read_response_headers wrapped_response
|
35
|
-
|
36
|
-
response
|
37
|
-
ensure
|
38
|
-
segment.finish if segment
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
alias perform_without_newrelic_trace perform
|
43
|
-
alias perform perform_with_newrelic_trace
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
@@ -1,44 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
-
|
5
|
-
require 'set'
|
6
|
-
|
7
|
-
DependencyDetection.defer do
|
8
|
-
@name = :merb_controller
|
9
|
-
|
10
|
-
depends_on do
|
11
|
-
defined?(Merb) && defined?(Merb::Controller)
|
12
|
-
end
|
13
|
-
|
14
|
-
executes do
|
15
|
-
::NewRelic::Agent.logger.info 'Installing Merb Controller instrumentation'
|
16
|
-
end
|
17
|
-
|
18
|
-
executes do
|
19
|
-
require 'merb-core/controller/merb_controller'
|
20
|
-
|
21
|
-
Merb::Controller.class_eval do
|
22
|
-
include NewRelic::Agent::Instrumentation::ControllerInstrumentation
|
23
|
-
|
24
|
-
# determine the path that is used in the metric name for
|
25
|
-
# the called controller action
|
26
|
-
def newrelic_metric_path
|
27
|
-
"#{controller_name}/#{action_name}"
|
28
|
-
end
|
29
|
-
|
30
|
-
protected
|
31
|
-
|
32
|
-
def _dispatch_with_newrelic_trace(*args)
|
33
|
-
options = {}
|
34
|
-
options[:params] = params
|
35
|
-
perform_action_with_newrelic_trace(options) do
|
36
|
-
_dispatch_without_newrelic_trace(*args)
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
alias_method :_dispatch_without_newrelic_trace, :_dispatch
|
41
|
-
alias_method :_dispatch, :_dispatch_with_newrelic_trace
|
42
|
-
end
|
43
|
-
end
|
44
|
-
end
|
@@ -1,33 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
-
|
5
|
-
DependencyDetection.defer do
|
6
|
-
@name = :merb_error
|
7
|
-
|
8
|
-
depends_on do
|
9
|
-
defined?(Merb) && defined?(Merb::Dispatcher) && defined?(Merb::Dispatcher::DefaultException)
|
10
|
-
end
|
11
|
-
|
12
|
-
depends_on do
|
13
|
-
Merb::Dispatcher::DefaultException.respond_to?(:before)
|
14
|
-
end
|
15
|
-
|
16
|
-
executes do
|
17
|
-
::NewRelic::Agent.logger.info 'Installing Merb Errors instrumentation'
|
18
|
-
end
|
19
|
-
|
20
|
-
executes do
|
21
|
-
|
22
|
-
# Hook in the notification to merb
|
23
|
-
error_notifier = Proc.new {
|
24
|
-
if request.exceptions #check that there's actually an exception
|
25
|
-
# Note, this assumes we have already captured the other information such as uri and params in the Transaction.
|
26
|
-
NewRelic::Agent::Transaction.notice_error(request.exceptions.first)
|
27
|
-
end
|
28
|
-
}
|
29
|
-
Merb::Dispatcher::DefaultException.before error_notifier
|
30
|
-
Exceptions.before error_notifier
|
31
|
-
|
32
|
-
end
|
33
|
-
end
|
@@ -1,50 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
-
|
5
|
-
DependencyDetection.defer do
|
6
|
-
named :net_http
|
7
|
-
|
8
|
-
depends_on do
|
9
|
-
defined?(Net) && defined?(Net::HTTP)
|
10
|
-
end
|
11
|
-
|
12
|
-
executes do
|
13
|
-
::NewRelic::Agent.logger.info 'Installing Net instrumentation'
|
14
|
-
require 'new_relic/agent/cross_app_tracing'
|
15
|
-
require 'new_relic/agent/http_clients/net_http_wrappers'
|
16
|
-
end
|
17
|
-
|
18
|
-
executes do
|
19
|
-
class Net::HTTP
|
20
|
-
def request_with_newrelic_trace(request, *args, &block)
|
21
|
-
wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
|
22
|
-
|
23
|
-
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
24
|
-
library: wrapped_request.type,
|
25
|
-
uri: wrapped_request.uri,
|
26
|
-
procedure: wrapped_request.method
|
27
|
-
)
|
28
|
-
|
29
|
-
begin
|
30
|
-
response = nil
|
31
|
-
segment.add_request_headers wrapped_request
|
32
|
-
|
33
|
-
# RUBY-1244 Disable further tracing in request to avoid double
|
34
|
-
# counting if connection wasn't started (which calls request again).
|
35
|
-
NewRelic::Agent.disable_all_tracing do
|
36
|
-
response = request_without_newrelic_trace( request, *args, &block )
|
37
|
-
end
|
38
|
-
|
39
|
-
segment.read_response_headers response
|
40
|
-
response
|
41
|
-
ensure
|
42
|
-
segment.finish
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
alias request_without_newrelic_trace request
|
47
|
-
alias request request_with_newrelic_trace
|
48
|
-
end
|
49
|
-
end
|
50
|
-
end
|
@@ -1,125 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
-
|
5
|
-
require 'new_relic/agent/parameter_filtering'
|
6
|
-
|
7
|
-
DependencyDetection.defer do
|
8
|
-
@name = :rails21_view
|
9
|
-
|
10
|
-
depends_on do
|
11
|
-
!NewRelic::Agent.config[:disable_view_instrumentation] &&
|
12
|
-
defined?(ActionController) && defined?(ActionController::Base) && defined?(ActionView::PartialTemplate) && defined?(ActionView::Template) &&
|
13
|
-
defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING =~ /^2\.1\./ # Rails 2.1 &&
|
14
|
-
end
|
15
|
-
|
16
|
-
executes do
|
17
|
-
::NewRelic::Agent.logger.info 'Installing Rails 2.1 View instrumentation'
|
18
|
-
end
|
19
|
-
|
20
|
-
executes do
|
21
|
-
ActionView::PartialTemplate.class_eval do
|
22
|
-
include NewRelic::Agent::MethodTracer
|
23
|
-
add_method_tracer :render, 'View/#{path_without_extension[%r{^(/.*/)?(.*)$},2]}.#{@view.template_format}.#{extension}/Partial'
|
24
|
-
end
|
25
|
-
|
26
|
-
# this is for template rendering, as opposed to partial rendering.
|
27
|
-
ActionView::Template.class_eval do
|
28
|
-
include NewRelic::Agent::MethodTracer
|
29
|
-
add_method_tracer :render, 'View/#{(path_without_extension || @view.controller.newrelic_metric_path)[%r{^(/.*/)?(.*)$},2]}.#{@view.template_format}.#{extension}/Rendering'
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
DependencyDetection.defer do
|
35
|
-
@name = :old_rails_view
|
36
|
-
|
37
|
-
depends_on do
|
38
|
-
!NewRelic::Agent.config[:disable_view_instrumentation] &&
|
39
|
-
defined?(ActionController) && defined?(ActionController::Base) &&
|
40
|
-
defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING =~ /^(1\.|2\.0)/ # Rails 1.* - 2.0
|
41
|
-
end
|
42
|
-
|
43
|
-
executes do
|
44
|
-
::NewRelic::Agent.logger.info 'Installing Rails 1.* - 2.0 View instrumentation'
|
45
|
-
end
|
46
|
-
|
47
|
-
executes do
|
48
|
-
ActionController::Base.class_eval do
|
49
|
-
include NewRelic::Agent::MethodTracer
|
50
|
-
add_method_tracer :render, 'View/#{newrelic_metric_path}/Rendering'
|
51
|
-
end
|
52
|
-
end
|
53
|
-
end
|
54
|
-
|
55
|
-
DependencyDetection.defer do
|
56
|
-
@name = :rails23_view
|
57
|
-
|
58
|
-
depends_on do
|
59
|
-
!NewRelic::Agent.config[:disable_view_instrumentation] &&
|
60
|
-
defined?(ActionView) && defined?(ActionView::Template) && defined?(ActionView::RenderablePartial) &&
|
61
|
-
defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING =~ /^2\.[23]/
|
62
|
-
end
|
63
|
-
|
64
|
-
executes do
|
65
|
-
::NewRelic::Agent.logger.info 'Installing Rails 2.2 - 2.3 View instrumentation'
|
66
|
-
end
|
67
|
-
|
68
|
-
executes do
|
69
|
-
ActionView::RenderablePartial.module_eval do
|
70
|
-
include NewRelic::Agent::MethodTracer
|
71
|
-
add_method_tracer :render_partial, 'View/#{path[%r{^(/.*/)?(.*)$},2]}/Partial'
|
72
|
-
end
|
73
|
-
|
74
|
-
ActionView::Template.class_eval do
|
75
|
-
include NewRelic::Agent::MethodTracer
|
76
|
-
add_method_tracer :render, 'View/#{path[%r{^(/.*/)?(.*)$},2]}/Rendering'
|
77
|
-
end
|
78
|
-
end
|
79
|
-
end
|
80
|
-
|
81
|
-
DependencyDetection.defer do
|
82
|
-
@name = :rails2_controller
|
83
|
-
|
84
|
-
depends_on do
|
85
|
-
defined?(ActionController) && defined?(ActionController::Base)
|
86
|
-
end
|
87
|
-
|
88
|
-
depends_on do
|
89
|
-
defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i == 2
|
90
|
-
end
|
91
|
-
|
92
|
-
executes do
|
93
|
-
::NewRelic::Agent.logger.info 'Installing Rails 2 Controller instrumentation'
|
94
|
-
end
|
95
|
-
|
96
|
-
executes do
|
97
|
-
ActionController::Base.class_eval do
|
98
|
-
include NewRelic::Agent::Instrumentation::ControllerInstrumentation
|
99
|
-
|
100
|
-
def perform_action_with_newrelic_trace_wrapper
|
101
|
-
munged_params = (respond_to?(:filter_parameters)) ? filter_parameters(params) : params
|
102
|
-
munged_params = NewRelic::Agent::ParameterFiltering.filter_rails_request_parameters(munged_params)
|
103
|
-
|
104
|
-
perform_action_with_newrelic_trace(:params => munged_params) do
|
105
|
-
perform_action_without_newrelic_trace
|
106
|
-
end
|
107
|
-
end
|
108
|
-
|
109
|
-
alias_method :perform_action_without_newrelic_trace, :perform_action
|
110
|
-
alias_method :perform_action, :perform_action_with_newrelic_trace_wrapper
|
111
|
-
private :perform_action
|
112
|
-
|
113
|
-
# determine the path that is used in the metric name for
|
114
|
-
# the called controller action
|
115
|
-
def newrelic_metric_path(action_name_override = nil)
|
116
|
-
action_part = action_name_override || action_name
|
117
|
-
if action_name_override || self.class.action_methods.include?(action_part)
|
118
|
-
"#{self.class.controller_path}/#{action_part}"
|
119
|
-
else
|
120
|
-
"#{self.class.controller_path}/(other)"
|
121
|
-
end
|
122
|
-
end
|
123
|
-
end
|
124
|
-
end
|
125
|
-
end
|