newrelic_rpm 7.0.0 → 9.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +7 -2
- data/.rubocop.yml +1919 -0
- data/.rubocop_todo.yml +100 -0
- data/.simplecov +15 -0
- data/.snyk +11 -0
- data/.yardopts +1 -0
- data/Brewfile +12 -0
- data/CHANGELOG.md +3754 -2825
- data/CONTRIBUTING.md +33 -7
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Gemfile +0 -1
- data/Guardfile +9 -8
- data/LICENSE +0 -6
- data/README.md +23 -19
- data/Rakefile +27 -29
- data/THIRD_PARTY_NOTICES.md +14 -199
- data/Thorfile +5 -0
- data/bin/newrelic +3 -2
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +76 -53
- data/config.dot +5 -5
- data/docker-compose.yml +107 -0
- data/init.rb +4 -6
- data/install.rb +2 -2
- data/lefthook.yml +9 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +13 -9
- data/lib/new_relic/agent/agent.rb +96 -925
- data/lib/new_relic/agent/agent_helpers/connect.rb +227 -0
- data/lib/new_relic/agent/agent_helpers/harvest.rb +153 -0
- data/lib/new_relic/agent/agent_helpers/shutdown.rb +72 -0
- data/lib/new_relic/agent/agent_helpers/special_startup.rb +74 -0
- data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +167 -0
- data/lib/new_relic/agent/agent_helpers/startup.rb +202 -0
- data/lib/new_relic/agent/agent_helpers/transmit.rb +76 -0
- data/lib/new_relic/agent/agent_logger.rb +23 -19
- data/lib/new_relic/agent/attribute_filter.rb +64 -47
- data/lib/new_relic/agent/attribute_processing.rb +7 -7
- data/lib/new_relic/agent/attributes.rb +5 -4
- data/lib/new_relic/agent/audit_logger.rb +8 -3
- data/lib/new_relic/agent/autostart.rb +20 -18
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +3 -3
- data/lib/new_relic/agent/commands/agent_command_router.rb +12 -11
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +12 -10
- data/lib/new_relic/agent/configuration/default_source.rb +1366 -1297
- data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
- data/lib/new_relic/agent/configuration/environment_source.rb +11 -9
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +40 -17
- data/lib/new_relic/agent/configuration/high_security_source.rb +8 -9
- data/lib/new_relic/agent/configuration/manager.rb +82 -69
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
- data/lib/new_relic/agent/configuration/security_policy_source.rb +82 -85
- data/lib/new_relic/agent/configuration/server_source.rb +21 -19
- data/lib/new_relic/agent/configuration/yaml_source.rb +31 -7
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +18 -18
- data/lib/new_relic/agent/connect/response_handler.rb +5 -8
- data/lib/new_relic/agent/custom_event_aggregator.rb +14 -14
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +4 -5
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +14 -13
- data/lib/new_relic/agent/database/obfuscator.rb +2 -2
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
- data/lib/new_relic/agent/database.rb +42 -50
- data/lib/new_relic/agent/database_adapter.rb +3 -1
- data/lib/new_relic/agent/datastores/metric_helper.rb +17 -18
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +6 -10
- data/lib/new_relic/agent/datastores/mongo.rb +6 -11
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +5 -7
- data/lib/new_relic/agent/datastores.rb +13 -15
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +10 -10
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +40 -34
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -22
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +19 -19
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +50 -52
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +5 -6
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +76 -77
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +39 -38
- data/lib/new_relic/agent/distributed_tracing.rb +33 -35
- data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
- data/lib/new_relic/agent/error_collector.rb +73 -54
- data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +4 -3
- data/lib/new_relic/agent/event_aggregator.rb +22 -21
- data/lib/new_relic/agent/event_buffer.rb +7 -8
- data/lib/new_relic/agent/event_listener.rb +1 -2
- data/lib/new_relic/agent/event_loop.rb +26 -24
- data/lib/new_relic/agent/external.rb +11 -44
- data/lib/new_relic/agent/guid_generator.rb +13 -11
- data/lib/new_relic/agent/harvester.rb +4 -5
- data/lib/new_relic/agent/heap.rb +7 -9
- data/lib/new_relic/agent/hostname.rb +20 -13
- data/lib/new_relic/agent/http_clients/abstract.rb +10 -11
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +6 -11
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +8 -9
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -5
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +2 -4
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +8 -4
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +4 -5
- data/lib/new_relic/agent/http_clients/uri_util.rb +1 -3
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +9 -22
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +39 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +38 -31
- data/lib/new_relic/agent/instrumentation/action_dispatch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb +64 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb +33 -0
- data/lib/new_relic/agent/instrumentation/action_mailer.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb +85 -0
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +18 -19
- data/lib/new_relic/agent/instrumentation/active_job.rb +33 -13
- data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
- data/lib/new_relic/agent/instrumentation/active_record.rb +37 -35
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +71 -61
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +49 -46
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +4 -4
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +27 -20
- data/lib/new_relic/agent/instrumentation/active_storage.rb +7 -3
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +8 -33
- data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
- data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +11 -11
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +21 -23
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +4 -4
- data/lib/new_relic/agent/instrumentation/bunny.rb +4 -5
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +69 -59
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +41 -43
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +52 -53
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +12 -14
- data/lib/new_relic/agent/instrumentation/curb.rb +7 -7
- data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
- data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +37 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +6 -9
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +7 -12
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +1 -2
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +28 -10
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +6 -6
- data/lib/new_relic/agent/instrumentation/excon.rb +27 -30
- data/lib/new_relic/agent/instrumentation/fiber/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
- data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
- data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +7 -8
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +12 -12
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +4 -4
- data/lib/new_relic/agent/instrumentation/grape.rb +12 -13
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +3 -4
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +7 -8
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +1 -3
- data/lib/new_relic/agent/instrumentation/httpclient.rb +3 -3
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +3 -3
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +11 -11
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +2 -2
- data/lib/new_relic/agent/instrumentation/httprb.rb +4 -4
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +4 -5
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +2 -3
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +31 -19
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +12 -9
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +20 -18
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +28 -15
- data/lib/new_relic/agent/instrumentation/memcache.rb +22 -23
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +11 -12
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +5 -7
- data/lib/new_relic/agent/instrumentation/mongo.rb +6 -144
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +21 -18
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +4 -5
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +10 -10
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +5 -5
- data/lib/new_relic/agent/instrumentation/net_http.rb +12 -7
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +51 -9
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +24 -20
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +4 -3
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +3 -3
- data/lib/new_relic/agent/instrumentation/padrino.rb +5 -8
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +6 -6
- data/lib/new_relic/agent/instrumentation/queue_time.rb +8 -9
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +30 -21
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +3 -2
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +14 -12
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +15 -8
- data/lib/new_relic/agent/instrumentation/rack.rb +15 -15
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +18 -54
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +9 -8
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +17 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +8 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +2 -7
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +14 -16
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake.rb +9 -9
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +25 -14
- data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +53 -25
- data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +10 -5
- data/lib/new_relic/agent/instrumentation/redis.rb +16 -6
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +4 -5
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +9 -8
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +2 -3
- data/lib/new_relic/agent/instrumentation/resque.rb +25 -16
- data/lib/new_relic/agent/instrumentation/sequel.rb +16 -19
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +2 -2
- data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +24 -65
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +2 -3
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +13 -6
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -2
- data/lib/new_relic/agent/instrumentation/sinatra.rb +26 -17
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
- data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +41 -0
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +5 -5
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +13 -15
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +2 -2
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +2 -2
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +2 -2
- data/lib/new_relic/agent/javascript_instrumentor.rb +48 -42
- data/lib/new_relic/agent/linking_metadata.rb +44 -0
- data/lib/new_relic/agent/local_log_decorator.rb +37 -0
- data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
- data/lib/new_relic/agent/log_once.rb +1 -1
- data/lib/new_relic/agent/log_priority.rb +20 -0
- data/lib/new_relic/agent/logging.rb +24 -21
- data/lib/new_relic/agent/memory_logger.rb +2 -2
- data/lib/new_relic/agent/messaging.rb +65 -81
- data/lib/new_relic/agent/method_tracer.rb +154 -149
- data/lib/new_relic/agent/method_tracer_helpers.rb +88 -11
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +24 -17
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +5 -4
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -2
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +6 -9
- data/lib/new_relic/agent/monitors.rb +6 -7
- data/lib/new_relic/agent/new_relic_service/encoders.rb +6 -6
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +5 -5
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +4 -4
- data/lib/new_relic/agent/new_relic_service.rb +247 -186
- data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -5
- data/lib/new_relic/agent/null_logger.rb +7 -3
- data/lib/new_relic/agent/obfuscator.rb +8 -10
- data/lib/new_relic/agent/parameter_filtering.rb +24 -10
- data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
- data/lib/new_relic/agent/pipe_channel_manager.rb +27 -17
- data/lib/new_relic/agent/pipe_service.rb +8 -5
- data/lib/new_relic/agent/prepend_supportability.rb +2 -2
- data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -11
- data/lib/new_relic/agent/range_extensions.rb +8 -28
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +12 -13
- data/lib/new_relic/agent/rules_engine.rb +5 -4
- data/lib/new_relic/agent/sampler.rb +3 -4
- data/lib/new_relic/agent/sampler_collection.rb +3 -4
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +3 -2
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +13 -10
- data/lib/new_relic/agent/samplers/memory_sampler.rb +24 -13
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
- data/lib/new_relic/agent/span_event_aggregator.rb +12 -12
- data/lib/new_relic/agent/span_event_primitive.rb +62 -56
- data/lib/new_relic/agent/sql_sampler.rb +17 -17
- data/lib/new_relic/agent/stats.rb +78 -41
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +9 -11
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +12 -13
- data/lib/new_relic/agent/stats_engine.rb +8 -8
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +7 -8
- data/lib/new_relic/agent/system_info.rb +85 -65
- data/lib/new_relic/agent/threading/agent_thread.rb +18 -14
- data/lib/new_relic/agent/threading/backtrace_node.rb +12 -13
- data/lib/new_relic/agent/threading/backtrace_service.rb +14 -14
- data/lib/new_relic/agent/threading/thread_profile.rb +23 -23
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +89 -85
- data/lib/new_relic/agent/transaction/abstract_segment.rb +103 -40
- data/lib/new_relic/agent/transaction/datastore_segment.rb +21 -17
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +63 -56
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +43 -44
- data/lib/new_relic/agent/transaction/external_request_segment.rb +44 -34
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +31 -36
- data/lib/new_relic/agent/transaction/request_attributes.rb +35 -35
- data/lib/new_relic/agent/transaction/segment.rb +20 -10
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/trace.rb +15 -11
- data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
- data/lib/new_relic/agent/transaction/trace_context.rb +35 -35
- data/lib/new_relic/agent/transaction/trace_node.rb +25 -24
- data/lib/new_relic/agent/transaction/tracing.rb +14 -11
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +5 -5
- data/lib/new_relic/agent/transaction.rb +175 -152
- data/lib/new_relic/agent/transaction_error_primitive.rb +27 -25
- data/lib/new_relic/agent/transaction_event_aggregator.rb +12 -12
- data/lib/new_relic/agent/transaction_event_primitive.rb +32 -33
- data/lib/new_relic/agent/transaction_event_recorder.rb +16 -15
- data/lib/new_relic/agent/transaction_metrics.rb +10 -9
- data/lib/new_relic/agent/transaction_sampler.rb +5 -6
- data/lib/new_relic/agent/transaction_time_aggregator.rb +26 -25
- data/lib/new_relic/agent/utilization/aws.rb +33 -3
- data/lib/new_relic/agent/utilization/azure.rb +3 -3
- data/lib/new_relic/agent/utilization/gcp.rb +7 -7
- data/lib/new_relic/agent/utilization/pcf.rb +5 -4
- data/lib/new_relic/agent/utilization/vendor.rb +43 -28
- data/lib/new_relic/agent/utilization_data.rb +7 -5
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +2 -2
- data/lib/new_relic/agent/vm/mri_vm.rb +40 -15
- data/lib/new_relic/agent/vm/snapshot.rb +5 -5
- data/lib/new_relic/agent/vm.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +10 -12
- data/lib/new_relic/agent.rb +70 -86
- data/lib/new_relic/cli/command.rb +20 -22
- data/lib/new_relic/cli/commands/deployments.rb +92 -42
- data/lib/new_relic/cli/commands/install.rb +21 -24
- data/lib/new_relic/coerce.rb +15 -13
- data/lib/new_relic/collection_helper.rb +50 -48
- data/lib/new_relic/constants.rb +1 -4
- data/lib/new_relic/control/class_methods.rb +3 -3
- data/lib/new_relic/control/frameworks/external.rb +2 -2
- data/lib/new_relic/control/frameworks/rails.rb +13 -9
- data/lib/new_relic/control/frameworks/rails3.rb +3 -4
- data/lib/new_relic/control/frameworks/rails4.rb +1 -1
- data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
- data/lib/new_relic/control/frameworks/ruby.rb +3 -3
- data/lib/new_relic/control/frameworks/sinatra.rb +7 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/instance_methods.rb +26 -45
- data/lib/new_relic/control/instrumentation.rb +39 -11
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +3 -4
- data/lib/new_relic/control.rb +1 -2
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +29 -28
- data/lib/new_relic/environment_report.rb +40 -32
- data/lib/new_relic/helper.rb +48 -7
- data/lib/new_relic/language_support.rb +29 -5
- data/lib/new_relic/latest_changes.rb +7 -6
- data/lib/new_relic/local_environment.rb +22 -26
- data/lib/new_relic/metric_data.rb +31 -26
- data/lib/new_relic/metric_spec.rb +8 -6
- data/lib/new_relic/noticed_error.rb +21 -25
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +5 -3
- data/lib/new_relic/rack/browser_monitoring.rb +133 -123
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +3 -61
- data/lib/new_relic/recipes/capistrano_legacy.rb +23 -26
- data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +8 -9
- data/lib/new_relic/traced_thread.rb +39 -0
- data/lib/new_relic/version.rb +5 -16
- data/lib/newrelic_rpm.rb +19 -32
- data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +15 -18
- data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +8 -14
- data/lib/tasks/all.rb +3 -3
- data/lib/tasks/config.rake +22 -117
- data/lib/tasks/coverage_report.rake +28 -0
- data/lib/tasks/helpers/config.html.erb +21 -0
- data/lib/tasks/helpers/format.rb +123 -0
- data/lib/tasks/helpers/matches.rb +12 -0
- data/lib/tasks/helpers/prompt.rb +24 -0
- data/lib/tasks/helpers/removers.rb +33 -0
- data/lib/tasks/install.rake +4 -0
- data/lib/tasks/instrumentation_generator/README.md +63 -0
- data/lib/tasks/instrumentation_generator/TODO.md +33 -0
- data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
- data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
- data/lib/tasks/multiverse.rake +4 -0
- data/lib/tasks/multiverse.rb +5 -32
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +10 -15
- data/newrelic.yml +672 -3
- data/newrelic_rpm.gemspec +35 -31
- data/recipes/newrelic.rb +2 -2
- data/test/agent_helper.rb +221 -180
- metadata +141 -111
- data/ROADMAP.md +0 -24
- data/bin/mongrel_rpm +0 -33
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -75
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -204
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
- data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
- data/lib/new_relic/agent/supported_versions.rb +0 -275
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/tasks/config.html.erb +0 -32
- /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,4 +1,3 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
3
|
# frozen_string_literal: true
|
@@ -9,7 +8,6 @@ require 'new_relic/agent/http_clients/uri_util'
|
|
9
8
|
module NewRelic
|
10
9
|
module Agent
|
11
10
|
class Transaction
|
12
|
-
|
13
11
|
#
|
14
12
|
# This class represents an external segment in a transaction trace.
|
15
13
|
#
|
@@ -23,16 +21,17 @@ module NewRelic
|
|
23
21
|
EXTERNAL_ALL_OTHER = "External/allOther"
|
24
22
|
MISSING_STATUS_CODE = "MissingHTTPStatusCode"
|
25
23
|
|
26
|
-
attr_reader :library, :uri, :procedure
|
27
|
-
|
24
|
+
attr_reader :library, :uri, :procedure, :http_status_code
|
25
|
+
attr_writer :record_agent_attributes
|
28
26
|
|
29
|
-
def initialize
|
27
|
+
def initialize(library, uri, procedure, start_time = nil) # :nodoc:
|
30
28
|
@library = library
|
31
29
|
@uri = HTTPClients::URIUtil.obfuscated_uri(uri)
|
32
30
|
@procedure = procedure
|
33
31
|
@host_header = nil
|
34
32
|
@app_data = nil
|
35
33
|
@http_status_code = nil
|
34
|
+
@record_agent_attributes = false
|
36
35
|
super(nil, nil, start_time)
|
37
36
|
end
|
38
37
|
|
@@ -44,6 +43,14 @@ module NewRelic
|
|
44
43
|
@host_header || uri.host
|
45
44
|
end
|
46
45
|
|
46
|
+
# By default external request segments only have errors and the http
|
47
|
+
# url recorded as agent attributes. To have all the agent attributes
|
48
|
+
# recorded, use the attr_writer like so `segment.record_agent_attributes = true`
|
49
|
+
# See: SpanEventPrimitive#for_external_request_segment
|
50
|
+
def record_agent_attributes?
|
51
|
+
@record_agent_attributes
|
52
|
+
end
|
53
|
+
|
47
54
|
# This method adds New Relic request headers to a given request made to an
|
48
55
|
# external API and checks to see if a host header is used for the request.
|
49
56
|
# If a host header is used, it updates the segment name to match the host
|
@@ -53,16 +60,16 @@ module NewRelic
|
|
53
60
|
# object (must belong to a subclass of NewRelic::Agent::HTTPClients::AbstractRequest)
|
54
61
|
#
|
55
62
|
# @api public
|
56
|
-
def add_request_headers
|
57
|
-
process_host_header
|
63
|
+
def add_request_headers(request)
|
64
|
+
process_host_header(request)
|
58
65
|
synthetics_header = transaction && transaction.raw_synthetics_header
|
59
|
-
insert_synthetics_header
|
66
|
+
insert_synthetics_header(request, synthetics_header) if synthetics_header
|
60
67
|
|
61
68
|
return unless record_metrics?
|
62
69
|
|
63
|
-
transaction.distributed_tracer.insert_headers
|
70
|
+
transaction.distributed_tracer.insert_headers(request)
|
64
71
|
rescue => e
|
65
|
-
NewRelic::Agent.logger.error
|
72
|
+
NewRelic::Agent.logger.error("Error in add_request_headers", e)
|
66
73
|
end
|
67
74
|
|
68
75
|
# This method extracts app data from an external response if present. If
|
@@ -72,11 +79,12 @@ module NewRelic
|
|
72
79
|
# @param [Hash] response a hash of response headers
|
73
80
|
#
|
74
81
|
# @api public
|
75
|
-
def read_response_headers
|
82
|
+
def read_response_headers(response)
|
76
83
|
return unless record_metrics? && CrossAppTracing.cross_app_enabled?
|
77
84
|
return unless CrossAppTracing.response_has_crossapp_header?(response)
|
85
|
+
|
78
86
|
unless data = CrossAppTracing.extract_appdata(response)
|
79
|
-
NewRelic::Agent.logger.debug
|
87
|
+
NewRelic::Agent.logger.debug("Couldn't extract_appdata from external segment response")
|
80
88
|
return
|
81
89
|
end
|
82
90
|
|
@@ -84,10 +92,10 @@ module NewRelic
|
|
84
92
|
@app_data = data
|
85
93
|
update_segment_name
|
86
94
|
else
|
87
|
-
NewRelic::Agent.logger.debug
|
95
|
+
NewRelic::Agent.logger.debug("External segment response has invalid cross_app_id")
|
88
96
|
end
|
89
97
|
rescue => e
|
90
|
-
NewRelic::Agent.logger.error
|
98
|
+
NewRelic::Agent.logger.error("Error in read_response_headers", e)
|
91
99
|
end
|
92
100
|
|
93
101
|
def cross_app_request? # :nodoc:
|
@@ -132,7 +140,7 @@ module NewRelic
|
|
132
140
|
]
|
133
141
|
}
|
134
142
|
|
135
|
-
# flag cross app in the state so transaction knows to add bits to
|
143
|
+
# flag cross app in the state so transaction knows to add bits to payload
|
136
144
|
#
|
137
145
|
transaction.distributed_tracer.is_cross_app_caller = true
|
138
146
|
|
@@ -142,11 +150,11 @@ module NewRelic
|
|
142
150
|
|
143
151
|
# obfuscate the generated request metadata JSON
|
144
152
|
#
|
145
|
-
obfuscator.obfuscate
|
153
|
+
obfuscator.obfuscate(::JSON.dump(rmd))
|
146
154
|
|
147
155
|
end
|
148
156
|
rescue => e
|
149
|
-
NewRelic::Agent.logger.error
|
157
|
+
NewRelic::Agent.logger.error("error during get_request_metadata", e)
|
150
158
|
end
|
151
159
|
|
152
160
|
# Process obfuscated +String+ sent from a called application that is also running a New Relic agent and
|
@@ -157,24 +165,24 @@ module NewRelic
|
|
157
165
|
#
|
158
166
|
# @api public
|
159
167
|
#
|
160
|
-
def process_response_metadata
|
168
|
+
def process_response_metadata(response_metadata)
|
161
169
|
NewRelic::Agent.record_api_supportability_metric(:process_response_metadata)
|
162
170
|
if transaction
|
163
171
|
app_data = ::JSON.parse(obfuscator.deobfuscate(response_metadata))[APP_DATA_KEY]
|
164
172
|
|
165
173
|
# validate cross app id
|
166
174
|
#
|
167
|
-
if Array === app_data and CrossAppTracing.trusted_valid_cross_app_id?
|
175
|
+
if Array === app_data and CrossAppTracing.trusted_valid_cross_app_id?(app_data[0])
|
168
176
|
@app_data = app_data
|
169
177
|
update_segment_name
|
170
178
|
else
|
171
|
-
NewRelic::Agent.logger.error
|
179
|
+
NewRelic::Agent.logger.error("error processing response metadata: invalid/non-trusted ID")
|
172
180
|
end
|
173
181
|
end
|
174
182
|
|
175
183
|
nil
|
176
184
|
rescue => e
|
177
|
-
NewRelic::Agent.logger.error
|
185
|
+
NewRelic::Agent.logger.error("error during process_response_metadata", e)
|
178
186
|
end
|
179
187
|
|
180
188
|
def record_metrics
|
@@ -182,24 +190,24 @@ module NewRelic
|
|
182
190
|
super
|
183
191
|
end
|
184
192
|
|
185
|
-
def process_response_headers
|
186
|
-
set_http_status_code
|
187
|
-
read_response_headers
|
193
|
+
def process_response_headers(response) # :nodoc:
|
194
|
+
set_http_status_code(response)
|
195
|
+
read_response_headers(response)
|
188
196
|
end
|
189
197
|
|
190
198
|
private
|
191
199
|
|
192
200
|
# Only sets the http_status_code if response.status_code is non-empty value
|
193
|
-
def set_http_status_code
|
194
|
-
if response.respond_to?
|
201
|
+
def set_http_status_code(response)
|
202
|
+
if response.respond_to?(:status_code)
|
195
203
|
@http_status_code = response.status_code if response.has_status_code?
|
196
204
|
else
|
197
|
-
NewRelic::Agent.logger.warn
|
198
|
-
NewRelic::Agent.record_metric
|
205
|
+
NewRelic::Agent.logger.warn("Cannot extract HTTP Status Code from response #{response.class.to_s}")
|
206
|
+
NewRelic::Agent.record_metric("#{name}/#{MISSING_STATUS_CODE}", 1)
|
199
207
|
end
|
200
208
|
end
|
201
209
|
|
202
|
-
def insert_synthetics_header
|
210
|
+
def insert_synthetics_header(request, header)
|
203
211
|
request[NR_SYNTHETICS_HEADER] = header
|
204
212
|
end
|
205
213
|
|
@@ -212,17 +220,16 @@ module NewRelic
|
|
212
220
|
super
|
213
221
|
end
|
214
222
|
|
215
|
-
def process_host_header
|
223
|
+
def process_host_header(request)
|
216
224
|
if @host_header = request.host_from_header
|
217
225
|
update_segment_name
|
218
226
|
end
|
219
227
|
end
|
220
228
|
|
221
229
|
def add_unscoped_metrics
|
222
|
-
@unscoped_metrics = [
|
230
|
+
@unscoped_metrics = [EXTERNAL_ALL,
|
223
231
|
"External/#{host}/all",
|
224
|
-
suffixed_rollup_metric
|
225
|
-
]
|
232
|
+
suffixed_rollup_metric]
|
226
233
|
|
227
234
|
if cross_app_request?
|
228
235
|
@unscoped_metrics << "ExternalApp/#{host}/#{cross_process_id}/all"
|
@@ -250,8 +257,11 @@ module NewRelic
|
|
250
257
|
end
|
251
258
|
|
252
259
|
def record_span_event
|
260
|
+
# don't record a span event if the transaction is ignored
|
261
|
+
return if transaction.ignore?
|
262
|
+
|
253
263
|
aggregator = ::NewRelic::Agent.agent.span_event_aggregator
|
254
|
-
priority
|
264
|
+
priority = transaction.priority
|
255
265
|
aggregator.record(priority: priority) do
|
256
266
|
SpanEventPrimitive.for_external_request_segment(self)
|
257
267
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/transaction/segment'
|
6
6
|
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
@@ -9,16 +9,16 @@ module NewRelic
|
|
9
9
|
module Agent
|
10
10
|
class Transaction
|
11
11
|
class MessageBrokerSegment < Segment
|
12
|
-
CONSUME
|
12
|
+
CONSUME = 'Consume'.freeze
|
13
13
|
EXCHANGE = 'Exchange'.freeze
|
14
|
-
NAMED
|
15
|
-
PRODUCE
|
16
|
-
QUEUE
|
17
|
-
PURGE
|
18
|
-
SLASH
|
19
|
-
TEMP
|
20
|
-
TOPIC
|
21
|
-
UNKNOWN
|
14
|
+
NAMED = 'Named/'.freeze
|
15
|
+
PRODUCE = 'Produce'.freeze
|
16
|
+
QUEUE = 'Queue'.freeze
|
17
|
+
PURGE = 'Purge'.freeze
|
18
|
+
SLASH = '/'.freeze
|
19
|
+
TEMP = 'Temp'.freeze
|
20
|
+
TOPIC = 'Topic'.freeze
|
21
|
+
UNKNOWN = 'Unknown'.freeze
|
22
22
|
|
23
23
|
DESTINATION_TYPES = [
|
24
24
|
:exchange,
|
@@ -36,35 +36,29 @@ module NewRelic
|
|
36
36
|
}
|
37
37
|
|
38
38
|
TYPES = {
|
39
|
-
exchange:
|
39
|
+
exchange: EXCHANGE,
|
40
40
|
temporary_queue: QUEUE,
|
41
|
-
queue:
|
41
|
+
queue: QUEUE,
|
42
42
|
temporary_topic: TOPIC,
|
43
|
-
topic:
|
44
|
-
unknown:
|
43
|
+
topic: TOPIC,
|
44
|
+
unknown: EXCHANGE
|
45
45
|
}
|
46
46
|
|
47
47
|
METRIC_PREFIX = 'MessageBroker/'.freeze
|
48
48
|
|
49
49
|
attr_reader :action,
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
50
|
+
:destination_name,
|
51
|
+
:destination_type,
|
52
|
+
:library,
|
53
|
+
:headers
|
54
54
|
|
55
|
-
def initialize
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
# ruby 2.0.0 does not support required kwargs
|
64
|
-
raise ArgumentError, 'missing required argument: action' if action.nil?
|
65
|
-
raise ArgumentError, 'missing required argument: library' if library.nil?
|
66
|
-
raise ArgumentError, 'missing required argument: destination_type' if destination_type.nil?
|
67
|
-
raise ArgumentError, 'missing required argument: destination_name' if destination_name.nil?
|
55
|
+
def initialize(action:,
|
56
|
+
library:,
|
57
|
+
destination_type:,
|
58
|
+
destination_name:,
|
59
|
+
headers: nil,
|
60
|
+
parameters: nil,
|
61
|
+
start_time: nil)
|
68
62
|
|
69
63
|
@action = action
|
70
64
|
@library = library
|
@@ -72,11 +66,12 @@ module NewRelic
|
|
72
66
|
@destination_name = destination_name
|
73
67
|
@headers = headers
|
74
68
|
super(nil, nil, start_time)
|
75
|
-
params.merge!
|
69
|
+
params.merge!(parameters) if parameters
|
76
70
|
end
|
77
71
|
|
78
72
|
def name
|
79
73
|
return @name if @name
|
74
|
+
|
80
75
|
@name = METRIC_PREFIX + library
|
81
76
|
@name << SLASH << TYPES[destination_type] << SLASH << ACTIONS[action] << SLASH
|
82
77
|
|
@@ -91,12 +86,12 @@ module NewRelic
|
|
91
86
|
|
92
87
|
def transaction_assigned
|
93
88
|
if headers && transaction && action == :produce && record_metrics?
|
94
|
-
transaction.distributed_tracer.insert_distributed_trace_header
|
95
|
-
transaction.distributed_tracer.insert_cat_headers
|
96
|
-
transaction.distributed_tracer.log_request_headers
|
89
|
+
transaction.distributed_tracer.insert_distributed_trace_header(headers)
|
90
|
+
transaction.distributed_tracer.insert_cat_headers(headers)
|
91
|
+
transaction.distributed_tracer.log_request_headers(headers)
|
97
92
|
end
|
98
93
|
rescue => e
|
99
|
-
NewRelic::Agent.logger.error
|
94
|
+
NewRelic::Agent.logger.error("Error during message header processing", e)
|
100
95
|
end
|
101
96
|
end
|
102
97
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/http_clients/uri_util'
|
6
6
|
|
@@ -9,60 +9,60 @@ module NewRelic
|
|
9
9
|
class Transaction
|
10
10
|
class RequestAttributes
|
11
11
|
attr_reader :request_path, :referer, :accept, :content_length, :content_type,
|
12
|
-
|
12
|
+
:host, :port, :user_agent, :request_method
|
13
13
|
|
14
14
|
HTTP_ACCEPT_HEADER_KEY = "HTTP_ACCEPT".freeze
|
15
15
|
|
16
|
-
def initialize
|
17
|
-
@request_path = path_from_request
|
18
|
-
@referer = referer_from_request
|
19
|
-
@accept = attribute_from_env
|
20
|
-
@content_length = content_length_from_request
|
21
|
-
@content_type = attribute_from_request
|
22
|
-
@host = attribute_from_request
|
23
|
-
@port = port_from_request
|
24
|
-
@user_agent = attribute_from_request
|
25
|
-
@request_method = attribute_from_request
|
16
|
+
def initialize(request)
|
17
|
+
@request_path = path_from_request(request)
|
18
|
+
@referer = referer_from_request(request)
|
19
|
+
@accept = attribute_from_env(request, HTTP_ACCEPT_HEADER_KEY)
|
20
|
+
@content_length = content_length_from_request(request)
|
21
|
+
@content_type = attribute_from_request(request, :content_type)
|
22
|
+
@host = attribute_from_request(request, :host)
|
23
|
+
@port = port_from_request(request)
|
24
|
+
@user_agent = attribute_from_request(request, :user_agent)
|
25
|
+
@request_method = attribute_from_request(request, :request_method)
|
26
26
|
end
|
27
27
|
|
28
|
-
def assign_agent_attributes
|
29
|
-
|
30
|
-
|
31
|
-
|
28
|
+
def assign_agent_attributes(txn)
|
29
|
+
default_destinations = AttributeFilter::DST_TRANSACTION_TRACER |
|
30
|
+
AttributeFilter::DST_TRANSACTION_EVENTS |
|
31
|
+
AttributeFilter::DST_ERROR_COLLECTOR
|
32
32
|
|
33
33
|
if referer
|
34
|
-
txn.add_agent_attribute
|
34
|
+
txn.add_agent_attribute(:'request.headers.referer', referer, AttributeFilter::DST_ERROR_COLLECTOR)
|
35
35
|
end
|
36
36
|
|
37
37
|
if request_path
|
38
|
-
txn.add_agent_attribute
|
39
|
-
|
40
|
-
|
41
|
-
|
38
|
+
txn.add_agent_attribute(:'request.uri',
|
39
|
+
request_path,
|
40
|
+
AttributeFilter::DST_TRANSACTION_TRACER |
|
41
|
+
AttributeFilter::DST_ERROR_COLLECTOR)
|
42
42
|
end
|
43
43
|
|
44
44
|
if accept
|
45
|
-
txn.add_agent_attribute
|
45
|
+
txn.add_agent_attribute(:'request.headers.accept', accept, default_destinations)
|
46
46
|
end
|
47
47
|
|
48
48
|
if content_length
|
49
|
-
txn.add_agent_attribute
|
49
|
+
txn.add_agent_attribute(:'request.headers.contentLength', content_length, default_destinations)
|
50
50
|
end
|
51
51
|
|
52
52
|
if content_type
|
53
|
-
txn.add_agent_attribute
|
53
|
+
txn.add_agent_attribute(:'request.headers.contentType', content_type, default_destinations)
|
54
54
|
end
|
55
55
|
|
56
56
|
if host
|
57
|
-
txn.add_agent_attribute
|
57
|
+
txn.add_agent_attribute(:'request.headers.host', host, default_destinations)
|
58
58
|
end
|
59
59
|
|
60
60
|
if user_agent
|
61
|
-
txn.add_agent_attribute
|
61
|
+
txn.add_agent_attribute(:'request.headers.userAgent', user_agent, default_destinations)
|
62
62
|
end
|
63
63
|
|
64
64
|
if request_method
|
65
|
-
txn.add_agent_attribute
|
65
|
+
txn.add_agent_attribute(:'request.method', request_method, default_destinations)
|
66
66
|
end
|
67
67
|
end
|
68
68
|
|
@@ -71,9 +71,9 @@ module NewRelic
|
|
71
71
|
# Make a safe attempt to get the referer from a request object, generally successful when
|
72
72
|
# it's a Rack request.
|
73
73
|
|
74
|
-
def referer_from_request
|
74
|
+
def referer_from_request(request)
|
75
75
|
if referer = attribute_from_request(request, :referer)
|
76
|
-
HTTPClients::URIUtil.strip_query_string
|
76
|
+
HTTPClients::URIUtil.strip_query_string(referer.to_s)
|
77
77
|
end
|
78
78
|
end
|
79
79
|
|
@@ -87,31 +87,31 @@ module NewRelic
|
|
87
87
|
|
88
88
|
ROOT_PATH = "/".freeze
|
89
89
|
|
90
|
-
def path_from_request
|
90
|
+
def path_from_request(request)
|
91
91
|
path = attribute_from_request(request, :path) || ''
|
92
92
|
path = HTTPClients::URIUtil.strip_query_string(path)
|
93
93
|
path.empty? ? ROOT_PATH : path
|
94
94
|
end
|
95
95
|
|
96
|
-
def content_length_from_request
|
96
|
+
def content_length_from_request(request)
|
97
97
|
if content_length = attribute_from_request(request, :content_length)
|
98
98
|
content_length.to_i
|
99
99
|
end
|
100
100
|
end
|
101
101
|
|
102
|
-
def port_from_request
|
102
|
+
def port_from_request(request)
|
103
103
|
if port = attribute_from_request(request, :port)
|
104
104
|
port.to_i
|
105
105
|
end
|
106
106
|
end
|
107
107
|
|
108
|
-
def attribute_from_request
|
109
|
-
if request.respond_to?
|
108
|
+
def attribute_from_request(request, attribute_method)
|
109
|
+
if request.respond_to?(attribute_method)
|
110
110
|
request.send(attribute_method)
|
111
111
|
end
|
112
112
|
end
|
113
113
|
|
114
|
-
def attribute_from_env
|
114
|
+
def attribute_from_env(request, key)
|
115
115
|
if env = attribute_from_request(request, :env)
|
116
116
|
env[key]
|
117
117
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/transaction/abstract_segment'
|
6
6
|
require 'new_relic/agent/span_event_primitive'
|
@@ -15,16 +15,16 @@ module NewRelic
|
|
15
15
|
# initialize it as an array that would be empty, have one item, or many items.
|
16
16
|
attr_reader :unscoped_metrics, :custom_transaction_attributes
|
17
17
|
|
18
|
-
def initialize
|
18
|
+
def initialize(name = nil, unscoped_metrics = nil, start_time = nil)
|
19
19
|
@unscoped_metrics = unscoped_metrics
|
20
|
-
super
|
20
|
+
super(name, start_time)
|
21
21
|
end
|
22
22
|
|
23
23
|
def attributes
|
24
24
|
@attributes ||= Attributes.new(NewRelic::Agent.instance.attribute_filter)
|
25
25
|
end
|
26
26
|
|
27
|
-
def add_agent_attribute(key, value, default_destinations=AttributeFilter::DST_SPAN_EVENTS)
|
27
|
+
def add_agent_attribute(key, value, default_destinations = AttributeFilter::DST_SPAN_EVENTS)
|
28
28
|
attributes.add_agent_attribute(key, value, default_destinations)
|
29
29
|
end
|
30
30
|
|
@@ -32,12 +32,13 @@ module NewRelic
|
|
32
32
|
if segment = NewRelic::Agent::Tracer.current_segment
|
33
33
|
segment.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
|
34
34
|
else
|
35
|
-
NewRelic::Agent.logger.debug
|
35
|
+
NewRelic::Agent.logger.debug("Attempted to merge untrusted attributes without segment")
|
36
36
|
end
|
37
37
|
end
|
38
38
|
|
39
39
|
def merge_untrusted_agent_attributes(agent_attributes, prefix, default_destinations)
|
40
40
|
return if agent_attributes.nil?
|
41
|
+
|
41
42
|
attributes.merge_untrusted_agent_attributes(agent_attributes, prefix, default_destinations)
|
42
43
|
end
|
43
44
|
|
@@ -45,20 +46,26 @@ module NewRelic
|
|
45
46
|
attributes.merge_custom_attributes(p)
|
46
47
|
end
|
47
48
|
|
49
|
+
def self.finish(segment)
|
50
|
+
return unless segment
|
51
|
+
|
52
|
+
segment.finish
|
53
|
+
end
|
54
|
+
|
48
55
|
private
|
49
56
|
|
50
57
|
def record_metrics
|
51
58
|
if record_scoped_metric?
|
52
|
-
metric_cache.record_scoped_and_unscoped
|
59
|
+
metric_cache.record_scoped_and_unscoped(name, duration, exclusive_duration)
|
53
60
|
else
|
54
|
-
append_unscoped_metric
|
61
|
+
append_unscoped_metric(name)
|
55
62
|
end
|
56
63
|
if unscoped_metrics
|
57
|
-
metric_cache.record_unscoped
|
64
|
+
metric_cache.record_unscoped(unscoped_metrics, duration, exclusive_duration)
|
58
65
|
end
|
59
66
|
end
|
60
67
|
|
61
|
-
def append_unscoped_metric
|
68
|
+
def append_unscoped_metric(metric)
|
62
69
|
if @unscoped_metrics
|
63
70
|
if Array === @unscoped_metrics
|
64
71
|
if unscoped_metrics.frozen?
|
@@ -79,8 +86,11 @@ module NewRelic
|
|
79
86
|
end
|
80
87
|
|
81
88
|
def record_span_event
|
89
|
+
# don't record a span event if the transaction is ignored
|
90
|
+
return if transaction.ignore?
|
91
|
+
|
82
92
|
aggregator = ::NewRelic::Agent.agent.span_event_aggregator
|
83
|
-
priority
|
93
|
+
priority = transaction.priority
|
84
94
|
|
85
95
|
aggregator.record(priority: priority) do
|
86
96
|
SpanEventPrimitive.for_segment(self)
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/transaction/transaction_sample_buffer'
|
6
6
|
|
@@ -8,7 +8,6 @@ module NewRelic
|
|
8
8
|
module Agent
|
9
9
|
class Transaction
|
10
10
|
class SlowestSampleBuffer < TransactionSampleBuffer
|
11
|
-
|
12
11
|
CAPACITY = 1
|
13
12
|
|
14
13
|
def capacity
|
@@ -18,7 +17,6 @@ module NewRelic
|
|
18
17
|
def allow_sample?(sample)
|
19
18
|
sample.threshold && sample.duration >= sample.threshold
|
20
19
|
end
|
21
|
-
|
22
20
|
end
|
23
21
|
end
|
24
22
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'new_relic/agent/transaction/transaction_sample_buffer'
|
6
6
|
|