newrelic_rpm 6.10.0.364 → 8.15.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +13 -1
- data/.rubocop.yml +1946 -0
- data/.rubocop_todo.yml +62 -0
- data/.simplecov +15 -0
- data/.snyk +11 -0
- data/.yardopts +1 -0
- data/Brewfile +12 -0
- data/CHANGELOG.md +3737 -2592
- data/CONTRIBUTING.md +132 -19
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Gemfile +5 -2
- data/Guardfile +9 -8
- data/LICENSE +202 -38
- data/README.md +85 -87
- data/Rakefile +27 -27
- data/THIRD_PARTY_NOTICES.md +28 -0
- data/Thorfile +5 -0
- data/bin/newrelic +3 -2
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +77 -54
- data/config.dot +5 -5
- data/docker-compose.yml +107 -0
- data/init.rb +5 -7
- data/install.rb +3 -3
- data/lefthook.yml +9 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +14 -10
- data/lib/new_relic/agent/agent.rb +97 -919
- 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 +75 -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 +24 -20
- data/lib/new_relic/agent/attribute_filter.rb +67 -48
- data/lib/new_relic/agent/attribute_processing.rb +8 -8
- data/lib/new_relic/agent/attributes.rb +8 -5
- data/lib/new_relic/agent/audit_logger.rb +19 -4
- data/lib/new_relic/agent/autostart.rb +21 -20
- data/lib/new_relic/agent/chained_call.rb +2 -2
- data/lib/new_relic/agent/commands/agent_command.rb +4 -4
- data/lib/new_relic/agent/commands/agent_command_router.rb +13 -12
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +10 -8
- data/lib/new_relic/agent/configuration/default_source.rb +1783 -1158
- data/lib/new_relic/agent/configuration/dotted_hash.rb +7 -6
- data/lib/new_relic/agent/configuration/environment_source.rb +12 -10
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +41 -18
- data/lib/new_relic/agent/configuration/high_security_source.rb +10 -9
- data/lib/new_relic/agent/configuration/manager.rb +83 -70
- data/lib/new_relic/agent/configuration/manual_source.rb +2 -2
- data/lib/new_relic/agent/configuration/mask_defaults.rb +4 -4
- data/lib/new_relic/agent/configuration/security_policy_source.rb +91 -78
- data/lib/new_relic/agent/configuration/server_source.rb +22 -20
- data/lib/new_relic/agent/configuration/yaml_source.rb +32 -8
- data/lib/new_relic/agent/configuration.rb +2 -2
- data/lib/new_relic/agent/connect/request_builder.rb +19 -19
- data/lib/new_relic/agent/connect/response_handler.rb +6 -9
- data/lib/new_relic/agent/custom_event_aggregator.rb +15 -15
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +5 -6
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +16 -15
- data/lib/new_relic/agent/database/obfuscator.rb +3 -3
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +4 -4
- data/lib/new_relic/agent/database.rb +54 -48
- data/lib/new_relic/agent/database_adapter.rb +35 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +18 -19
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +8 -7
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +7 -11
- data/lib/new_relic/agent/datastores/mongo.rb +7 -12
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +6 -12
- data/lib/new_relic/agent/datastores.rb +14 -16
- data/lib/new_relic/agent/deprecator.rb +2 -2
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +13 -12
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +40 -33
- data/lib/new_relic/agent/distributed_tracing/{distributed_trace_intrinsics.rb → distributed_trace_attributes.rb} +28 -24
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +20 -20
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +53 -56
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +6 -7
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +77 -78
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +40 -39
- data/lib/new_relic/agent/distributed_tracing.rb +33 -101
- data/lib/new_relic/agent/encoding_normalizer.rb +5 -3
- data/lib/new_relic/agent/error_collector.rb +74 -55
- data/lib/new_relic/agent/error_event_aggregator.rb +5 -6
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +5 -4
- data/lib/new_relic/agent/event_aggregator.rb +23 -22
- data/lib/new_relic/agent/event_buffer.rb +8 -9
- data/lib/new_relic/agent/event_listener.rb +2 -3
- data/lib/new_relic/agent/event_loop.rb +27 -25
- data/lib/new_relic/agent/external.rb +12 -45
- data/lib/new_relic/agent/guid_generator.rb +14 -12
- data/lib/new_relic/agent/harvester.rb +5 -6
- data/lib/new_relic/agent/heap.rb +8 -10
- data/lib/new_relic/agent/hostname.rb +21 -14
- data/lib/new_relic/agent/http_clients/abstract.rb +11 -12
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +7 -12
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +9 -10
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +5 -6
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +3 -5
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +9 -5
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -6
- data/lib/new_relic/agent/http_clients/uri_util.rb +10 -12
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +9 -9
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +39 -32
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +16 -18
- data/lib/new_relic/agent/instrumentation/active_job.rb +21 -14
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +21 -7
- data/lib/new_relic/agent/instrumentation/active_record.rb +94 -47
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +82 -61
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +50 -63
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +36 -12
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +28 -21
- data/lib/new_relic/agent/instrumentation/active_storage.rb +4 -4
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +19 -16
- data/lib/new_relic/agent/instrumentation/active_support.rb +12 -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/acts_as_solr.rb +12 -3
- data/lib/new_relic/agent/instrumentation/authlogic.rb +11 -3
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/bunny.rb +12 -153
- 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 +70 -60
- 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 +14 -240
- data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +37 -0
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +77 -66
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +35 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +30 -52
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +7 -7
- data/lib/new_relic/agent/instrumentation/excon.rb +28 -30
- 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 +15 -116
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +11 -33
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +5 -6
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +58 -129
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +101 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +57 -73
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +14 -13
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +10 -10
- data/lib/new_relic/agent/instrumentation/mongo.rb +7 -138
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +41 -18
- 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 +12 -11
- 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 +19 -55
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +5 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +9 -8
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +5 -5
- 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/rainbows_instrumentation.rb +15 -5
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +149 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +17 -157
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +93 -0
- data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
- data/lib/new_relic/agent/instrumentation/redis.rb +19 -108
- 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 -44
- data/lib/new_relic/agent/instrumentation/sequel.rb +16 -18
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +3 -3
- data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +29 -45
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +31 -37
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +125 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +3 -3
- data/lib/new_relic/agent/instrumentation/sinatra.rb +35 -165
- data/lib/new_relic/agent/instrumentation/sunspot.rb +14 -6
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +32 -0
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
- data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +41 -0
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +13 -92
- 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 +49 -43
- 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 +25 -22
- data/lib/new_relic/agent/memory_logger.rb +3 -3
- data/lib/new_relic/agent/messaging.rb +66 -82
- data/lib/new_relic/agent/method_tracer.rb +152 -146
- data/lib/new_relic/agent/method_tracer_helpers.rb +89 -12
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +26 -18
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +6 -5
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +2 -3
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +7 -10
- data/lib/new_relic/agent/monitors.rb +7 -8
- data/lib/new_relic/agent/new_relic_service/encoders.rb +7 -7
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +6 -6
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +3 -3
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +6 -5
- data/lib/new_relic/agent/new_relic_service.rb +258 -184
- data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +3 -6
- data/lib/new_relic/agent/null_logger.rb +8 -4
- data/lib/new_relic/agent/obfuscator.rb +9 -11
- data/lib/new_relic/agent/parameter_filtering.rb +25 -11
- data/lib/new_relic/agent/payload_metric_mapping.rb +10 -11
- data/lib/new_relic/agent/pipe_channel_manager.rb +28 -18
- data/lib/new_relic/agent/pipe_service.rb +9 -6
- data/lib/new_relic/agent/prepend_supportability.rb +3 -3
- data/lib/new_relic/agent/priority_sampled_buffer.rb +15 -15
- data/lib/new_relic/agent/range_extensions.rb +9 -29
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +12 -12
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +14 -14
- data/lib/new_relic/agent/rules_engine.rb +6 -5
- data/lib/new_relic/agent/sampler.rb +4 -5
- data/lib/new_relic/agent/sampler_collection.rb +4 -5
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +4 -3
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +13 -10
- data/lib/new_relic/agent/samplers/memory_sampler.rb +26 -15
- data/lib/new_relic/agent/samplers/object_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/vm_sampler.rb +22 -20
- data/lib/new_relic/agent/span_event_aggregator.rb +13 -13
- data/lib/new_relic/agent/span_event_primitive.rb +85 -54
- data/lib/new_relic/agent/sql_sampler.rb +20 -20
- data/lib/new_relic/agent/stats.rb +79 -42
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +11 -13
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +13 -14
- data/lib/new_relic/agent/stats_engine.rb +9 -9
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +8 -9
- data/lib/new_relic/agent/system_info.rb +95 -66
- data/lib/new_relic/agent/threading/agent_thread.rb +19 -15
- data/lib/new_relic/agent/threading/backtrace_node.rb +13 -14
- data/lib/new_relic/agent/threading/backtrace_service.rb +15 -15
- data/lib/new_relic/agent/threading/thread_profile.rb +24 -24
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +2 -2
- data/lib/new_relic/agent/tracer.rb +81 -86
- data/lib/new_relic/agent/transaction/abstract_segment.rb +107 -43
- data/lib/new_relic/agent/transaction/datastore_segment.rb +22 -18
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +67 -54
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +45 -46
- data/lib/new_relic/agent/transaction/external_request_segment.rb +47 -37
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +32 -36
- data/lib/new_relic/agent/transaction/request_attributes.rb +36 -36
- 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 +2 -2
- data/lib/new_relic/agent/transaction/trace.rb +16 -12
- data/lib/new_relic/agent/transaction/trace_builder.rb +11 -11
- data/lib/new_relic/agent/transaction/trace_context.rb +36 -36
- data/lib/new_relic/agent/transaction/trace_node.rb +26 -25
- data/lib/new_relic/agent/transaction/tracing.rb +15 -12
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +6 -6
- data/lib/new_relic/agent/transaction.rb +182 -146
- data/lib/new_relic/agent/transaction_error_primitive.rb +29 -27
- data/lib/new_relic/agent/transaction_event_aggregator.rb +13 -13
- data/lib/new_relic/agent/transaction_event_primitive.rb +34 -35
- data/lib/new_relic/agent/transaction_event_recorder.rb +17 -16
- data/lib/new_relic/agent/transaction_metrics.rb +11 -10
- data/lib/new_relic/agent/transaction_sampler.rb +6 -7
- data/lib/new_relic/agent/transaction_time_aggregator.rb +27 -26
- data/lib/new_relic/agent/utilization/aws.rb +34 -4
- data/lib/new_relic/agent/utilization/azure.rb +4 -4
- data/lib/new_relic/agent/utilization/gcp.rb +8 -8
- data/lib/new_relic/agent/utilization/pcf.rb +6 -5
- data/lib/new_relic/agent/utilization/vendor.rb +44 -29
- data/lib/new_relic/agent/utilization_data.rb +8 -6
- data/lib/new_relic/agent/vm/jruby_vm.rb +2 -2
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +3 -3
- data/lib/new_relic/agent/vm/mri_vm.rb +46 -19
- data/lib/new_relic/agent/vm/snapshot.rb +6 -6
- data/lib/new_relic/agent/vm.rb +2 -2
- data/lib/new_relic/agent/worker_loop.rb +11 -13
- data/lib/new_relic/agent.rb +80 -76
- data/lib/new_relic/cli/command.rb +21 -23
- data/lib/new_relic/cli/commands/deployments.rb +93 -44
- data/lib/new_relic/cli/commands/install.rb +13 -16
- data/lib/new_relic/coerce.rb +16 -14
- data/lib/new_relic/collection_helper.rb +51 -49
- data/lib/new_relic/constants.rb +7 -2
- data/lib/new_relic/control/class_methods.rb +4 -4
- data/lib/new_relic/control/frameworks/external.rb +3 -3
- data/lib/new_relic/control/frameworks/rails.rb +24 -18
- data/lib/new_relic/control/frameworks/rails3.rb +4 -5
- data/lib/new_relic/control/frameworks/rails4.rb +2 -2
- data/lib/new_relic/control/frameworks/rails_notifications.rb +2 -2
- data/lib/new_relic/control/frameworks/ruby.rb +4 -4
- data/lib/new_relic/control/frameworks/sinatra.rb +8 -2
- data/lib/new_relic/control/frameworks.rb +2 -2
- data/lib/new_relic/control/instance_methods.rb +28 -46
- data/lib/new_relic/control/instrumentation.rb +40 -12
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +4 -5
- data/lib/new_relic/control.rb +2 -3
- data/lib/new_relic/delayed_job_injection.rb +2 -2
- data/lib/new_relic/dependency_detection.rb +129 -18
- data/lib/new_relic/environment_report.rb +41 -35
- data/lib/new_relic/helper.rb +49 -8
- data/lib/new_relic/language_support.rb +30 -6
- data/lib/new_relic/latest_changes.rb +9 -8
- data/lib/new_relic/local_environment.rb +25 -19
- data/lib/new_relic/metric_data.rb +32 -27
- data/lib/new_relic/metric_spec.rb +9 -7
- data/lib/new_relic/noticed_error.rb +23 -31
- data/lib/new_relic/rack/agent_hooks.rb +2 -2
- data/lib/new_relic/rack/agent_middleware.rb +6 -4
- data/lib/new_relic/rack/browser_monitoring.rb +134 -124
- data/lib/new_relic/rack.rb +2 -2
- data/lib/new_relic/recipes/capistrano3.rb +4 -62
- data/lib/new_relic/recipes/capistrano_legacy.rb +24 -27
- data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
- data/lib/new_relic/recipes.rb +2 -2
- data/lib/new_relic/supportability_helper.rb +12 -11
- data/lib/new_relic/traced_thread.rb +39 -0
- data/lib/new_relic/version.rb +7 -18
- data/lib/newrelic_rpm.rb +20 -33
- data/lib/sequel/extensions/newrelic_instrumentation.rb +14 -17
- data/lib/sequel/plugins/newrelic_instrumentation.rb +6 -12
- data/lib/tasks/all.rb +4 -4
- data/lib/tasks/config.rake +22 -117
- data/lib/tasks/coverage_report.rake +28 -0
- data/lib/tasks/helpers/config.html.erb +21 -0
- data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
- data/lib/tasks/helpers/format.rb +123 -0
- data/lib/tasks/helpers/matches.rb +12 -0
- data/lib/tasks/helpers/prompt.rb +24 -0
- data/lib/tasks/helpers/removers.rb +33 -0
- data/lib/tasks/install.rake +4 -0
- data/lib/tasks/instrumentation_generator/README.md +63 -0
- data/lib/tasks/instrumentation_generator/TODO.md +33 -0
- data/lib/tasks/instrumentation_generator/instrumentation.thor +124 -0
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
- data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
- data/lib/tasks/multiverse.rake +4 -0
- data/lib/tasks/multiverse.rb +7 -25
- data/lib/tasks/newrelic.rb +2 -2
- data/lib/tasks/tests.rake +11 -16
- data/newrelic.yml +666 -3
- data/newrelic_rpm.gemspec +28 -27
- data/recipes/newrelic.rb +3 -3
- data/test/agent_helper.rb +245 -189
- metadata +182 -130
- data/.travis.yml +0 -225
- data/bin/mongrel_rpm +0 -33
- data/cert/cacert.pem +0 -1177
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
- data/lib/new_relic/agent/instrumentation/http.rb +0 -49
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
- data/lib/new_relic/agent/instrumentation/net.rb +0 -53
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
- data/lib/new_relic/agent/supported_versions.rb +0 -275
- data/lib/new_relic/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
@@ -0,0 +1,24 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module Tilt
|
7
|
+
module Chain
|
8
|
+
def self.instrument!
|
9
|
+
::Tilt::Template.module_eval do
|
10
|
+
include NewRelic::Agent::Instrumentation::Tilt
|
11
|
+
|
12
|
+
def render_with_new_relic(*args, &block)
|
13
|
+
render_with_tracing(*args) {
|
14
|
+
render_without_newrelic(*args, &block)
|
15
|
+
}
|
16
|
+
end
|
17
|
+
|
18
|
+
alias render_without_newrelic render
|
19
|
+
alias render render_with_new_relic
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
@@ -0,0 +1,41 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
module Instrumentation
|
8
|
+
module Tilt
|
9
|
+
def metric_name(klass, file)
|
10
|
+
"View/#{klass}/#{file}/Rendering"
|
11
|
+
end
|
12
|
+
|
13
|
+
# Sinatra uses #caller_locations for the file name in Tilt (unlike Rails/Rack)
|
14
|
+
# So here we are only grabbing the file name and name of directory it is in
|
15
|
+
def create_filename_for_metric(file)
|
16
|
+
return file unless defined?(::Sinatra) && defined?(::Sinatra::Base)
|
17
|
+
|
18
|
+
file.split('/')[-2..-1].join('/')
|
19
|
+
rescue NoMethodError
|
20
|
+
file
|
21
|
+
end
|
22
|
+
|
23
|
+
def render_with_tracing(*args, &block)
|
24
|
+
begin
|
25
|
+
finishable = Tracer.start_segment(
|
26
|
+
name: metric_name(self.class, create_filename_for_metric(self.file))
|
27
|
+
)
|
28
|
+
begin
|
29
|
+
yield
|
30
|
+
rescue => error
|
31
|
+
NewRelic::Agent.notice_error(error)
|
32
|
+
raise
|
33
|
+
end
|
34
|
+
ensure
|
35
|
+
finishable.finish if finishable
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
@@ -0,0 +1,13 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module Tilt::Prepend
|
7
|
+
include NewRelic::Agent::Instrumentation::Tilt
|
8
|
+
|
9
|
+
def render(*args, &block)
|
10
|
+
render_with_tracing { super }
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
@@ -0,0 +1,25 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require_relative 'tilt/instrumentation'
|
6
|
+
require_relative 'tilt/chain'
|
7
|
+
require_relative 'tilt/prepend'
|
8
|
+
|
9
|
+
DependencyDetection.defer do
|
10
|
+
named :tilt
|
11
|
+
|
12
|
+
depends_on { defined?(Tilt) }
|
13
|
+
|
14
|
+
executes do
|
15
|
+
NewRelic::Agent.logger.info('Installing Tilt instrumentation')
|
16
|
+
end
|
17
|
+
|
18
|
+
executes do
|
19
|
+
if use_prepend?
|
20
|
+
prepend_instrument Tilt::Template, NewRelic::Agent::Instrumentation::Tilt::Prepend
|
21
|
+
else
|
22
|
+
chain_instrument NewRelic::Agent::Instrumentation::Tilt::Chain
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module Typhoeus
|
7
|
+
module Chain
|
8
|
+
def self.instrument!
|
9
|
+
::Typhoeus::Hydra.class_eval do
|
10
|
+
include NewRelic::Agent::Instrumentation::Typhoeus
|
11
|
+
|
12
|
+
def run_with_newrelic(*args)
|
13
|
+
with_tracing { run_without_newrelic(*args) }
|
14
|
+
end
|
15
|
+
|
16
|
+
alias run_without_newrelic run
|
17
|
+
alias run run_with_newrelic
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
@@ -0,0 +1,80 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
module Instrumentation
|
8
|
+
module Typhoeus
|
9
|
+
HYDRA_SEGMENT_NAME = "External/Multiple/Typhoeus::Hydra/run"
|
10
|
+
NOTICEABLE_ERROR_CLASS = "Typhoeus::Errors::TyphoeusError"
|
11
|
+
|
12
|
+
EARLIEST_VERSION = Gem::Version.new("0.5.3")
|
13
|
+
|
14
|
+
def self.is_supported_version?
|
15
|
+
Gem::Version.new(::Typhoeus::VERSION) >= EARLIEST_VERSION
|
16
|
+
end
|
17
|
+
|
18
|
+
def self.request_is_hydra_enabled?(request)
|
19
|
+
request.respond_to?(:hydra) && request.hydra
|
20
|
+
end
|
21
|
+
|
22
|
+
def self.response_message(response)
|
23
|
+
if response.respond_to?(:response_message)
|
24
|
+
response.response_message
|
25
|
+
elsif response.respond_to?(:return_message)
|
26
|
+
response.return_message
|
27
|
+
else
|
28
|
+
# 0.5.4 seems to have lost xxxx_message methods altogether.
|
29
|
+
"timeout"
|
30
|
+
end
|
31
|
+
end
|
32
|
+
|
33
|
+
def with_tracing
|
34
|
+
segment = NewRelic::Agent::Tracer.start_segment(name: HYDRA_SEGMENT_NAME)
|
35
|
+
instance_variable_set(:@__newrelic_hydra_segment, segment)
|
36
|
+
begin
|
37
|
+
yield
|
38
|
+
ensure
|
39
|
+
::NewRelic::Agent::Transaction::Segment.finish(segment)
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
def self.trace(request)
|
44
|
+
state = NewRelic::Agent::Tracer.state
|
45
|
+
return unless state.is_execution_traced?
|
46
|
+
|
47
|
+
wrapped_request = ::NewRelic::Agent::HTTPClients::TyphoeusHTTPRequest.new(request)
|
48
|
+
|
49
|
+
parent = if request_is_hydra_enabled?(request)
|
50
|
+
request.hydra.instance_variable_get(:@__newrelic_hydra_segment)
|
51
|
+
end
|
52
|
+
|
53
|
+
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
54
|
+
library: wrapped_request.type,
|
55
|
+
uri: wrapped_request.uri,
|
56
|
+
procedure: wrapped_request.method,
|
57
|
+
parent: parent
|
58
|
+
)
|
59
|
+
|
60
|
+
segment.add_request_headers(wrapped_request)
|
61
|
+
|
62
|
+
callback = proc do
|
63
|
+
wrapped_response = HTTPClients::TyphoeusHTTPResponse.new(request.response)
|
64
|
+
|
65
|
+
segment.process_response_headers(wrapped_response)
|
66
|
+
|
67
|
+
if request.response.code == 0
|
68
|
+
segment.notice_error(NoticeableError.new(NOTICEABLE_ERROR_CLASS, response_message(request.response)))
|
69
|
+
end
|
70
|
+
|
71
|
+
::NewRelic::Agent::Transaction::Segment.finish(segment)
|
72
|
+
end
|
73
|
+
request.on_complete.unshift(callback)
|
74
|
+
rescue => e
|
75
|
+
NewRelic::Agent.logger.error("Exception during trace setup for Typhoeus request", e)
|
76
|
+
end
|
77
|
+
end
|
78
|
+
end
|
79
|
+
end
|
80
|
+
end
|
@@ -0,0 +1,14 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module Typhoeus
|
7
|
+
module Prepend
|
8
|
+
include NewRelic::Agent::Instrumentation::Typhoeus
|
9
|
+
def run(*args)
|
10
|
+
with_tracing { super }
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
@@ -1,6 +1,10 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require_relative 'typhoeus/instrumentation'
|
6
|
+
require_relative 'typhoeus/chain'
|
7
|
+
require_relative 'typhoeus/prepend'
|
4
8
|
|
5
9
|
DependencyDetection.defer do
|
6
10
|
named :typhoeus
|
@@ -10,11 +14,11 @@ DependencyDetection.defer do
|
|
10
14
|
end
|
11
15
|
|
12
16
|
depends_on do
|
13
|
-
NewRelic::Agent::Instrumentation::
|
17
|
+
NewRelic::Agent::Instrumentation::Typhoeus.is_supported_version?
|
14
18
|
end
|
15
19
|
|
16
20
|
executes do
|
17
|
-
|
21
|
+
NewRelic::Agent.logger.info('Installing Typhoeus instrumentation')
|
18
22
|
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
19
23
|
require 'new_relic/agent/http_clients/typhoeus_wrappers'
|
20
24
|
end
|
@@ -22,7 +26,7 @@ DependencyDetection.defer do
|
|
22
26
|
# Basic request tracing
|
23
27
|
executes do
|
24
28
|
Typhoeus.before do |request|
|
25
|
-
NewRelic::Agent::Instrumentation::
|
29
|
+
NewRelic::Agent::Instrumentation::Typhoeus.trace(request)
|
26
30
|
|
27
31
|
# Ensure that we always return a truthy value from the before block,
|
28
32
|
# otherwise Typhoeus will bail out of the instrumentation.
|
@@ -32,93 +36,10 @@ DependencyDetection.defer do
|
|
32
36
|
|
33
37
|
# Apply single TT node for Hydra requests until async support
|
34
38
|
executes do
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
name: NewRelic::Agent::Instrumentation::TyphoeusTracing::HYDRA_SEGMENT_NAME
|
40
|
-
)
|
41
|
-
|
42
|
-
instance_variable_set :@__newrelic_hydra_segment, segment
|
43
|
-
|
44
|
-
begin
|
45
|
-
run_without_newrelic(*args)
|
46
|
-
ensure
|
47
|
-
segment.finish if segment
|
48
|
-
end
|
49
|
-
end
|
50
|
-
|
51
|
-
alias run_without_newrelic run
|
52
|
-
alias run run_with_newrelic
|
53
|
-
end
|
54
|
-
end
|
55
|
-
end
|
56
|
-
|
57
|
-
|
58
|
-
module NewRelic
|
59
|
-
module Agent
|
60
|
-
module Instrumentation
|
61
|
-
module TyphoeusTracing
|
62
|
-
|
63
|
-
HYDRA_SEGMENT_NAME = "External/Multiple/Typhoeus::Hydra/run"
|
64
|
-
NOTICIBLE_ERROR_CLASS = "Typhoeus::Errors::TyphoeusError"
|
65
|
-
|
66
|
-
EARLIEST_VERSION = Gem::Version.new("0.5.3")
|
67
|
-
def self.is_supported_version?
|
68
|
-
Gem::Version.new(Typhoeus::VERSION) >= NewRelic::Agent::Instrumentation::TyphoeusTracing::EARLIEST_VERSION
|
69
|
-
end
|
70
|
-
|
71
|
-
def self.request_is_hydra_enabled?(request)
|
72
|
-
request.respond_to?(:hydra) && request.hydra
|
73
|
-
end
|
74
|
-
|
75
|
-
def self.response_message(response)
|
76
|
-
if response.respond_to?(:response_message)
|
77
|
-
response.response_message
|
78
|
-
elsif response.respond_to?(:return_message)
|
79
|
-
response.return_message
|
80
|
-
else
|
81
|
-
# 0.5.4 seems to have lost xxxx_message methods altogether.
|
82
|
-
"timeout"
|
83
|
-
end
|
84
|
-
end
|
85
|
-
|
86
|
-
def self.trace(request)
|
87
|
-
state = NewRelic::Agent::Tracer.state
|
88
|
-
return unless state.is_execution_traced?
|
89
|
-
|
90
|
-
wrapped_request = ::NewRelic::Agent::HTTPClients::TyphoeusHTTPRequest.new(request)
|
91
|
-
|
92
|
-
parent = if request_is_hydra_enabled?(request)
|
93
|
-
request.hydra.instance_variable_get(:@__newrelic_hydra_segment)
|
94
|
-
end
|
95
|
-
|
96
|
-
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
97
|
-
library: wrapped_request.type,
|
98
|
-
uri: wrapped_request.uri,
|
99
|
-
procedure: wrapped_request.method,
|
100
|
-
parent: parent
|
101
|
-
)
|
102
|
-
|
103
|
-
segment.add_request_headers wrapped_request
|
104
|
-
|
105
|
-
callback = Proc.new do
|
106
|
-
wrapped_response = HTTPClients::TyphoeusHTTPResponse.new(request.response)
|
107
|
-
|
108
|
-
segment.process_response_headers wrapped_response
|
109
|
-
|
110
|
-
if request.response.code == 0
|
111
|
-
segment.notice_error NoticibleError.new NOTICIBLE_ERROR_CLASS, response_message(request.response)
|
112
|
-
end
|
113
|
-
|
114
|
-
segment.finish if segment
|
115
|
-
end
|
116
|
-
request.on_complete.unshift(callback)
|
117
|
-
|
118
|
-
rescue => e
|
119
|
-
NewRelic::Agent.logger.error("Exception during trace setup for Typhoeus request", e)
|
120
|
-
end
|
121
|
-
end
|
39
|
+
if use_prepend?
|
40
|
+
prepend_instrument Typhoeus::Hydra, NewRelic::Agent::Instrumentation::Typhoeus::Prepend
|
41
|
+
else
|
42
|
+
chain_instrument NewRelic::Agent::Instrumentation::Typhoeus::Chain
|
122
43
|
end
|
123
44
|
end
|
124
45
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent'
|
6
6
|
module NewRelic
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
# This is the base class for all errors that we want to record through the
|
6
6
|
# NewRelic::Agent::ErrorCollector#notice_agent_error API. It provides the
|
@@ -10,7 +10,7 @@
|
|
10
10
|
module NewRelic
|
11
11
|
module Agent
|
12
12
|
class InternalAgentError < StandardError
|
13
|
-
def initialize(msg=nil)
|
13
|
+
def initialize(msg = nil)
|
14
14
|
super("Ruby agent internal error. Please contact support referencing this error.\n #{msg}")
|
15
15
|
end
|
16
16
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'base64'
|
6
6
|
require 'json'
|
@@ -8,7 +8,7 @@ require 'new_relic/agent/obfuscator'
|
|
8
8
|
|
9
9
|
module NewRelic
|
10
10
|
module Agent
|
11
|
-
class
|
11
|
+
class JavaScriptInstrumentor
|
12
12
|
include NewRelic::Coerce
|
13
13
|
|
14
14
|
RUM_KEY_LENGTH = 13
|
@@ -19,8 +19,8 @@ module NewRelic
|
|
19
19
|
|
20
20
|
def log_configuration
|
21
21
|
NewRelic::Agent.logger.debug("JS agent loader requested: #{NewRelic::Agent.config[:'browser_monitoring.loader']}",
|
22
|
-
|
23
|
-
|
22
|
+
"JS agent loader debug: #{NewRelic::Agent.config[:'browser_monitoring.debug']}",
|
23
|
+
"JS agent loader version: #{NewRelic::Agent.config[:'browser_monitoring.loader_version']}")
|
24
24
|
|
25
25
|
if !NewRelic::Agent.config[:'rum.enabled']
|
26
26
|
NewRelic::Agent.logger.debug("Real User Monitoring is disabled for this agent. Edit your configuration to change this.")
|
@@ -38,43 +38,43 @@ module NewRelic
|
|
38
38
|
def js_enabled_and_ready?
|
39
39
|
if !enabled?
|
40
40
|
::NewRelic::Agent.logger.log_once(:debug, :js_agent_disabled,
|
41
|
-
|
41
|
+
"JS agent instrumentation is disabled.")
|
42
42
|
false
|
43
43
|
elsif missing_config?(:js_agent_loader)
|
44
44
|
::NewRelic::Agent.logger.log_once(:debug, :missing_js_agent_loader,
|
45
|
-
|
45
|
+
"Missing :js_agent_loader. Skipping browser instrumentation.")
|
46
46
|
false
|
47
47
|
elsif missing_config?(:beacon)
|
48
48
|
::NewRelic::Agent.logger.log_once(:debug, :missing_beacon,
|
49
|
-
|
49
|
+
"Beacon configuration not received (yet?). Skipping browser instrumentation.")
|
50
50
|
false
|
51
51
|
elsif missing_config?(:browser_key)
|
52
52
|
::NewRelic::Agent.logger.log_once(:debug, :missing_browser_key,
|
53
|
-
|
53
|
+
"Browser key is not set. Skipping browser instrumentation.")
|
54
54
|
false
|
55
55
|
else
|
56
56
|
true
|
57
57
|
end
|
58
58
|
rescue => e
|
59
|
-
::NewRelic::Agent.logger.debug
|
59
|
+
::NewRelic::Agent.logger.debug("Failure during 'js_enabled_and_ready?'", e)
|
60
60
|
false
|
61
61
|
end
|
62
62
|
|
63
63
|
def insert_js?(state)
|
64
64
|
if !state.current_transaction
|
65
|
-
::NewRelic::Agent.logger.debug
|
65
|
+
::NewRelic::Agent.logger.debug("Not in transaction. Skipping browser instrumentation.")
|
66
66
|
false
|
67
67
|
elsif !state.is_execution_traced?
|
68
|
-
::NewRelic::Agent.logger.debug
|
68
|
+
::NewRelic::Agent.logger.debug("Execution is not traced. Skipping browser instrumentation.")
|
69
69
|
false
|
70
70
|
elsif state.current_transaction.ignore_enduser?
|
71
|
-
::NewRelic::Agent.logger.debug
|
71
|
+
::NewRelic::Agent.logger.debug("Ignore end user for this transaction is set. Skipping browser instrumentation.")
|
72
72
|
false
|
73
73
|
else
|
74
74
|
true
|
75
75
|
end
|
76
76
|
rescue => e
|
77
|
-
::NewRelic::Agent.logger.debug
|
77
|
+
::NewRelic::Agent.logger.debug("Failure during insert_js", e)
|
78
78
|
false
|
79
79
|
end
|
80
80
|
|
@@ -83,72 +83,78 @@ module NewRelic
|
|
83
83
|
value.nil? || value.empty?
|
84
84
|
end
|
85
85
|
|
86
|
-
def browser_timing_header #THREAD_LOCAL_ACCESS
|
86
|
+
def browser_timing_header(nonce = nil) # THREAD_LOCAL_ACCESS
|
87
87
|
return '' unless js_enabled_and_ready? # fast exit
|
88
88
|
|
89
89
|
state = NewRelic::Agent::Tracer.state
|
90
90
|
|
91
91
|
return '' unless insert_js?(state) # slower exit
|
92
92
|
|
93
|
-
bt_config = browser_timing_config(state)
|
93
|
+
bt_config = browser_timing_config(state, nonce)
|
94
94
|
return '' if bt_config.empty?
|
95
95
|
|
96
|
-
bt_config + browser_timing_loader
|
96
|
+
bt_config + browser_timing_loader(nonce)
|
97
97
|
rescue => e
|
98
|
-
::NewRelic::Agent.logger.debug
|
98
|
+
::NewRelic::Agent.logger.debug("Failure during RUM browser_timing_header construction", e)
|
99
99
|
''
|
100
100
|
end
|
101
101
|
|
102
|
-
def browser_timing_loader
|
103
|
-
html_safe_if_needed("\n<script>#{Agent.config[:js_agent_loader]}</script>")
|
102
|
+
def browser_timing_loader(nonce = nil)
|
103
|
+
html_safe_if_needed("\n<script type=\"text/javascript\"#{create_nonce(nonce)}>#{Agent.config[:js_agent_loader]}</script>")
|
104
104
|
end
|
105
105
|
|
106
|
-
def browser_timing_config(state)
|
106
|
+
def browser_timing_config(state, nonce = nil)
|
107
107
|
txn = state.current_transaction
|
108
108
|
return '' if txn.nil?
|
109
109
|
|
110
110
|
txn.freeze_name_and_execute_if_not_ignored do
|
111
111
|
data = data_for_js_agent(txn)
|
112
112
|
json = ::JSON.dump(data)
|
113
|
-
return html_safe_if_needed("\n<script>window.NREUM||(NREUM={});NREUM.info=#{json}</script>")
|
113
|
+
return html_safe_if_needed("\n<script type=\"text/javascript\"#{create_nonce(nonce)}>window.NREUM||(NREUM={});NREUM.info=#{json}</script>")
|
114
114
|
end
|
115
115
|
|
116
116
|
''
|
117
117
|
end
|
118
118
|
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
119
|
+
def create_nonce(nonce = nil)
|
120
|
+
return '' unless nonce
|
121
|
+
|
122
|
+
" nonce=\"#{nonce.to_s}\""
|
123
|
+
end
|
124
|
+
|
125
|
+
BEACON_KEY = "beacon".freeze
|
126
|
+
ERROR_BEACON_KEY = "errorBeacon".freeze
|
127
|
+
LICENSE_KEY_KEY = "licenseKey".freeze
|
128
|
+
APPLICATIONID_KEY = "applicationID".freeze
|
123
129
|
TRANSACTION_NAME_KEY = "transactionName".freeze
|
124
|
-
QUEUE_TIME_KEY
|
130
|
+
QUEUE_TIME_KEY = "queueTime".freeze
|
125
131
|
APPLICATION_TIME_KEY = "applicationTime".freeze
|
126
|
-
AGENT_KEY
|
127
|
-
SSL_FOR_HTTP_KEY
|
128
|
-
ATTS_KEY
|
129
|
-
ATTS_USER_SUBKEY
|
130
|
-
ATTS_AGENT_SUBKEY
|
132
|
+
AGENT_KEY = "agent".freeze
|
133
|
+
SSL_FOR_HTTP_KEY = "sslForHttp".freeze
|
134
|
+
ATTS_KEY = "atts".freeze
|
135
|
+
ATTS_USER_SUBKEY = "u".freeze
|
136
|
+
ATTS_AGENT_SUBKEY = "a".freeze
|
131
137
|
|
132
138
|
# NOTE: Internal prototyping may override this, so leave name stable!
|
133
139
|
def data_for_js_agent(transaction)
|
134
|
-
queue_time_in_seconds = [transaction.queue_time
|
135
|
-
start_time_in_seconds = [transaction.start_time
|
136
|
-
app_time_in_seconds
|
140
|
+
queue_time_in_seconds = [transaction.queue_time, 0.0].max
|
141
|
+
start_time_in_seconds = [transaction.start_time, 0.0].max
|
142
|
+
app_time_in_seconds = Process.clock_gettime(Process::CLOCK_REALTIME) - start_time_in_seconds
|
137
143
|
|
138
|
-
queue_time_in_millis = (1000.0
|
139
|
-
app_time_in_millis
|
144
|
+
queue_time_in_millis = (queue_time_in_seconds * 1000.0).round
|
145
|
+
app_time_in_millis = (app_time_in_seconds * 1000.0).round
|
140
146
|
|
141
147
|
transaction_name = transaction.best_name || ::NewRelic::Agent::UNKNOWN_METRIC
|
142
148
|
|
143
149
|
data = {
|
144
|
-
BEACON_KEY
|
145
|
-
ERROR_BEACON_KEY
|
146
|
-
LICENSE_KEY_KEY
|
147
|
-
APPLICATIONID_KEY
|
150
|
+
BEACON_KEY => NewRelic::Agent.config[:beacon],
|
151
|
+
ERROR_BEACON_KEY => NewRelic::Agent.config[:error_beacon],
|
152
|
+
LICENSE_KEY_KEY => NewRelic::Agent.config[:browser_key],
|
153
|
+
APPLICATIONID_KEY => NewRelic::Agent.config[:application_id],
|
148
154
|
TRANSACTION_NAME_KEY => obfuscator.obfuscate(transaction_name),
|
149
|
-
QUEUE_TIME_KEY
|
155
|
+
QUEUE_TIME_KEY => queue_time_in_millis,
|
150
156
|
APPLICATION_TIME_KEY => app_time_in_millis,
|
151
|
-
AGENT_KEY
|
157
|
+
AGENT_KEY => NewRelic::Agent.config[:js_agent_file]
|
152
158
|
}
|
153
159
|
|
154
160
|
add_ssl_for_http(data)
|
@@ -0,0 +1,44 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
#
|
8
|
+
# This module contains helper methods related to gathering linking
|
9
|
+
# metadata for use with logs in context.
|
10
|
+
module LinkingMetadata
|
11
|
+
extend self
|
12
|
+
|
13
|
+
def append_service_linking_metadata(metadata)
|
14
|
+
raise ArgumentError, "Missing argument `metadata`" if metadata.nil?
|
15
|
+
|
16
|
+
config = ::NewRelic::Agent.config
|
17
|
+
|
18
|
+
metadata[ENTITY_NAME_KEY] = config[:app_name][0]
|
19
|
+
metadata[ENTITY_TYPE_KEY] = ENTITY_TYPE
|
20
|
+
metadata[HOSTNAME_KEY] = Hostname.get
|
21
|
+
|
22
|
+
if entity_guid = config[:entity_guid]
|
23
|
+
metadata[ENTITY_GUID_KEY] = entity_guid
|
24
|
+
end
|
25
|
+
|
26
|
+
metadata
|
27
|
+
end
|
28
|
+
|
29
|
+
def append_trace_linking_metadata(metadata)
|
30
|
+
raise ArgumentError, "Missing argument `metadata`" if metadata.nil?
|
31
|
+
|
32
|
+
if trace_id = Tracer.current_trace_id
|
33
|
+
metadata[TRACE_ID_KEY] = trace_id
|
34
|
+
end
|
35
|
+
|
36
|
+
if span_id = Tracer.current_span_id
|
37
|
+
metadata[SPAN_ID_KEY] = span_id
|
38
|
+
end
|
39
|
+
|
40
|
+
metadata
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
@@ -0,0 +1,37 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
# This module contains helper methods related to decorating log messages
|
8
|
+
module LocalLogDecorator
|
9
|
+
extend self
|
10
|
+
|
11
|
+
def decorate(message)
|
12
|
+
return message unless decorating_enabled?
|
13
|
+
|
14
|
+
metadata = NewRelic::Agent.linking_metadata
|
15
|
+
formatted_metadata = " NR-LINKING|#{metadata[ENTITY_GUID_KEY]}|#{metadata[HOSTNAME_KEY]}|" \
|
16
|
+
"#{metadata[TRACE_ID_KEY]}|#{metadata[SPAN_ID_KEY]}|" \
|
17
|
+
"#{escape_entity_name(metadata[ENTITY_NAME_KEY])}|"
|
18
|
+
|
19
|
+
message.partition("\n").insert(1, formatted_metadata).join
|
20
|
+
end
|
21
|
+
|
22
|
+
private
|
23
|
+
|
24
|
+
def decorating_enabled?
|
25
|
+
NewRelic::Agent.config[:'application_logging.enabled'] &&
|
26
|
+
NewRelic::Agent::Instrumentation::Logger.enabled? &&
|
27
|
+
NewRelic::Agent.config[:'application_logging.local_decorating.enabled']
|
28
|
+
end
|
29
|
+
|
30
|
+
def escape_entity_name(entity_name)
|
31
|
+
return unless entity_name
|
32
|
+
|
33
|
+
URI::DEFAULT_PARSER.escape(entity_name)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|