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,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
|
module NewRelic
|
6
6
|
module Agent
|
@@ -10,7 +10,7 @@ module NewRelic
|
|
10
10
|
|
11
11
|
MAXIMUM_COMMAND_LENGTH = 1000
|
12
12
|
MAXIMUM_ARGUMENT_LENGTH = 64
|
13
|
-
CHUNK_SIZE
|
13
|
+
CHUNK_SIZE = (MAXIMUM_ARGUMENT_LENGTH - 5) / 2
|
14
14
|
PREFIX_RANGE = (0...CHUNK_SIZE)
|
15
15
|
SUFFIX_RANGE = (-CHUNK_SIZE..-1)
|
16
16
|
|
@@ -25,20 +25,18 @@ module NewRelic
|
|
25
25
|
|
26
26
|
def self.format_command(command_with_args)
|
27
27
|
if Agent.config[:'transaction_tracer.record_redis_arguments']
|
28
|
-
result =
|
28
|
+
result = String.new('')
|
29
29
|
|
30
30
|
append_command_with_args(result, command_with_args)
|
31
31
|
|
32
32
|
trim_result(result) if result.length >= MAXIMUM_COMMAND_LENGTH
|
33
33
|
result.strip!
|
34
34
|
result
|
35
|
-
else
|
36
|
-
nil
|
37
35
|
end
|
38
36
|
end
|
39
37
|
|
40
38
|
def self.format_pipeline_commands(commands_with_args)
|
41
|
-
result =
|
39
|
+
result = String.new('')
|
42
40
|
|
43
41
|
commands_with_args.each do |command|
|
44
42
|
if result.length >= MAXIMUM_COMMAND_LENGTH
|
@@ -117,7 +115,7 @@ module NewRelic
|
|
117
115
|
end
|
118
116
|
|
119
117
|
def self.trim_result(result)
|
120
|
-
result.slice!((MAXIMUM_COMMAND_LENGTH-ELLIPSES.length)..-1)
|
118
|
+
result.slice!((MAXIMUM_COMMAND_LENGTH - ELLIPSES.length)..-1)
|
121
119
|
result.strip!
|
122
120
|
result << ELLIPSES
|
123
121
|
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/datastores/metric_helper'
|
6
6
|
|
@@ -13,7 +13,6 @@ module NewRelic
|
|
13
13
|
#
|
14
14
|
# @api public
|
15
15
|
module Datastores
|
16
|
-
|
17
16
|
# @!group Tracing query methods
|
18
17
|
|
19
18
|
# Add Datastore tracing to a method. This properly generates the metrics
|
@@ -21,7 +20,7 @@ module NewRelic
|
|
21
20
|
# query content into Transaction Traces. Use wrap if you want to provide
|
22
21
|
# that functionality.
|
23
22
|
#
|
24
|
-
# @param [Class]
|
23
|
+
# @param [Class] klass the class to instrument
|
25
24
|
#
|
26
25
|
# @param [String, Symbol] method_name the name of instance method to
|
27
26
|
# instrument
|
@@ -33,18 +32,18 @@ module NewRelic
|
|
33
32
|
#
|
34
33
|
# @api public
|
35
34
|
#
|
36
|
-
def self.trace(
|
35
|
+
def self.trace(klass, method_name, product, operation = method_name)
|
37
36
|
NewRelic::Agent.record_api_supportability_metric(:trace)
|
38
37
|
|
39
|
-
|
38
|
+
klass.class_eval do
|
40
39
|
method_name_without_newrelic = "#{method_name}_without_newrelic"
|
41
40
|
|
42
|
-
if NewRelic::Helper.instance_methods_include?(
|
43
|
-
|
41
|
+
if NewRelic::Helper.instance_methods_include?(klass, method_name) &&
|
42
|
+
!NewRelic::Helper.instance_methods_include?(klass, method_name_without_newrelic)
|
44
43
|
|
45
|
-
visibility = NewRelic::Helper.instance_method_visibility(
|
44
|
+
visibility = NewRelic::Helper.instance_method_visibility(klass, method_name)
|
46
45
|
|
47
|
-
alias_method
|
46
|
+
alias_method(method_name_without_newrelic, method_name)
|
48
47
|
|
49
48
|
define_method(method_name) do |*args, &blk|
|
50
49
|
segment = NewRelic::Agent::Tracer.start_datastore_segment(
|
@@ -54,12 +53,12 @@ module NewRelic
|
|
54
53
|
begin
|
55
54
|
send(method_name_without_newrelic, *args, &blk)
|
56
55
|
ensure
|
57
|
-
|
56
|
+
::NewRelic::Agent::Transaction::Segment.finish(segment)
|
58
57
|
end
|
59
58
|
end
|
60
59
|
|
61
|
-
send
|
62
|
-
send
|
60
|
+
send(visibility, method_name)
|
61
|
+
send(visibility, method_name_without_newrelic)
|
63
62
|
end
|
64
63
|
end
|
65
64
|
end
|
@@ -123,11 +122,11 @@ module NewRelic
|
|
123
122
|
ensure
|
124
123
|
begin
|
125
124
|
if callback
|
126
|
-
elapsed_time = (
|
125
|
+
elapsed_time = Process.clock_gettime(Process::CLOCK_REALTIME) - segment.start_time
|
127
126
|
callback.call(result, segment.name, elapsed_time)
|
128
127
|
end
|
129
128
|
ensure
|
130
|
-
|
129
|
+
::NewRelic::Agent::Transaction::Segment.finish(segment)
|
131
130
|
end
|
132
131
|
end
|
133
132
|
end
|
@@ -202,7 +201,6 @@ module NewRelic
|
|
202
201
|
end
|
203
202
|
nil
|
204
203
|
end
|
205
|
-
|
206
204
|
end
|
207
205
|
end
|
208
206
|
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
|
module NewRelic
|
6
6
|
module Agent
|
@@ -8,26 +8,26 @@ module NewRelic
|
|
8
8
|
attr_reader :id, :transaction, :referring_guid, :referring_trip_id, :referring_path_hash
|
9
9
|
|
10
10
|
def initialize(id, transaction, transaction_info)
|
11
|
-
@id
|
12
|
-
@transaction
|
11
|
+
@id = id
|
12
|
+
@transaction = transaction
|
13
13
|
|
14
14
|
transaction_info ||= []
|
15
|
-
@referring_guid
|
15
|
+
@referring_guid = transaction_info[0]
|
16
16
|
# unused_flag = transaction_info[1]
|
17
|
-
@referring_trip_id
|
17
|
+
@referring_trip_id = string_or_false_for(transaction_info[2])
|
18
18
|
@referring_path_hash = string_or_false_for(transaction_info[3])
|
19
19
|
end
|
20
20
|
|
21
21
|
def as_json_array(content_length)
|
22
|
-
queue_time_in_seconds = [transaction.queue_time
|
23
|
-
start_time_in_seconds = [transaction.start_time
|
24
|
-
app_time_in_seconds
|
22
|
+
queue_time_in_seconds = [transaction.queue_time, 0.0].max
|
23
|
+
start_time_in_seconds = [transaction.start_time, 0.0].max
|
24
|
+
app_time_in_seconds = Process.clock_gettime(Process::CLOCK_REALTIME) - start_time_in_seconds
|
25
25
|
|
26
26
|
[
|
27
27
|
NewRelic::Agent.config[:cross_process_id],
|
28
28
|
transaction.best_name,
|
29
|
-
queue_time_in_seconds
|
30
|
-
app_time_in_seconds
|
29
|
+
queue_time_in_seconds,
|
30
|
+
app_time_in_seconds,
|
31
31
|
content_length,
|
32
32
|
transaction.guid,
|
33
33
|
false
|
@@ -1,5 +1,4 @@
|
|
1
1
|
# -*- ruby -*-
|
2
|
-
# encoding: utf-8
|
3
2
|
# This file is distributed under New Relic's license terms.
|
4
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
5
4
|
# frozen_string_literal: true
|
@@ -18,7 +17,7 @@ module NewRelic
|
|
18
17
|
# The cross app transaction header for "outgoing" calls
|
19
18
|
NR_TXN_HEADER = 'X-NewRelic-Transaction'
|
20
19
|
|
21
|
-
NR_MESSAGE_BROKER_ID_HEADER
|
20
|
+
NR_MESSAGE_BROKER_ID_HEADER = 'NewRelicID'
|
22
21
|
NR_MESSAGE_BROKER_TXN_HEADER = 'NewRelicTransaction'
|
23
22
|
NR_MESSAGE_BROKER_SYNTHETICS_HEADER = 'NewRelicSynthetics'
|
24
23
|
|
@@ -52,30 +51,35 @@ module NewRelic
|
|
52
51
|
result
|
53
52
|
end
|
54
53
|
|
55
|
-
def insert_cross_app_header
|
54
|
+
def insert_cross_app_header(headers)
|
56
55
|
return unless CrossAppTracing.cross_app_enabled?
|
56
|
+
|
57
57
|
@is_cross_app_caller = true
|
58
|
-
txn_guid
|
59
|
-
trip_id
|
58
|
+
txn_guid = transaction.guid
|
59
|
+
trip_id = cat_trip_id
|
60
60
|
path_hash = cat_path_hash
|
61
61
|
|
62
|
-
insert_request_headers
|
62
|
+
insert_request_headers(headers, txn_guid, trip_id, path_hash)
|
63
63
|
end
|
64
64
|
|
65
|
-
def add_message_cat_headers
|
65
|
+
def add_message_cat_headers(headers)
|
66
66
|
return unless CrossAppTracing.cross_app_enabled?
|
67
|
+
|
67
68
|
@is_cross_app_caller = true
|
68
|
-
insert_message_headers
|
69
|
-
transaction.guid,
|
70
|
-
cat_trip_id,
|
71
|
-
cat_path_hash,
|
72
|
-
transaction.raw_synthetics_header
|
69
|
+
insert_message_headers(headers,
|
70
|
+
transaction.guid,
|
71
|
+
cat_trip_id,
|
72
|
+
cat_path_hash,
|
73
|
+
transaction.raw_synthetics_header)
|
73
74
|
end
|
74
75
|
|
75
76
|
def record_cross_app_metrics
|
76
77
|
if (id = cross_app_payload && cross_app_payload.id)
|
77
|
-
app_time_in_seconds = [
|
78
|
-
|
78
|
+
app_time_in_seconds = [
|
79
|
+
Process.clock_gettime(Process::CLOCK_REALTIME) - transaction.start_time,
|
80
|
+
0.0
|
81
|
+
].max
|
82
|
+
NewRelic::Agent.record_metric("ClientApplication/#{id}/all", app_time_in_seconds)
|
79
83
|
end
|
80
84
|
end
|
81
85
|
|
@@ -86,8 +90,8 @@ module NewRelic
|
|
86
90
|
|
87
91
|
private
|
88
92
|
|
89
|
-
def insert_message_headers
|
90
|
-
headers[NR_MESSAGE_BROKER_ID_HEADER]
|
93
|
+
def insert_message_headers(headers, txn_guid, trip_id, path_hash, synthetics_header)
|
94
|
+
headers[NR_MESSAGE_BROKER_ID_HEADER] = obfuscator.obfuscate(Agent.config[:cross_process_id])
|
91
95
|
headers[NR_MESSAGE_BROKER_TXN_HEADER] = obfuscator.obfuscate(::JSON.dump([txn_guid, false, trip_id, path_hash]))
|
92
96
|
headers[NR_MESSAGE_BROKER_SYNTHETICS_HEADER] = synthetics_header if synthetics_header
|
93
97
|
end
|
@@ -109,14 +113,16 @@ module NewRelic
|
|
109
113
|
end
|
110
114
|
|
111
115
|
return unless transaction.include_guid?
|
116
|
+
|
112
117
|
payload[:guid] = transaction.guid
|
113
118
|
|
114
119
|
return unless is_cross_app?
|
115
|
-
|
116
|
-
|
120
|
+
|
121
|
+
trip_id = cat_trip_id
|
122
|
+
path_hash = cat_path_hash
|
117
123
|
referring_path_hash = cat_referring_path_hash
|
118
124
|
|
119
|
-
payload[:cat_trip_id]
|
125
|
+
payload[:cat_trip_id] = trip_id if trip_id
|
120
126
|
payload[:cat_referring_path_hash] = referring_path_hash if referring_path_hash
|
121
127
|
|
122
128
|
if path_hash
|
@@ -131,6 +137,7 @@ module NewRelic
|
|
131
137
|
|
132
138
|
###############
|
133
139
|
module_function
|
140
|
+
|
134
141
|
###############
|
135
142
|
|
136
143
|
def cross_app_enabled?
|
@@ -143,7 +150,7 @@ module NewRelic
|
|
143
150
|
if Agent.config[:cross_process_id] && Agent.config[:cross_process_id].length > 0
|
144
151
|
true
|
145
152
|
else
|
146
|
-
NewRelic::Agent.logger.debug
|
153
|
+
NewRelic::Agent.logger.debug("No cross_process_id configured")
|
147
154
|
false
|
148
155
|
end
|
149
156
|
end
|
@@ -152,26 +159,25 @@ module NewRelic
|
|
152
159
|
if Agent.config[:encoding_key] && Agent.config[:encoding_key].length > 0
|
153
160
|
true
|
154
161
|
else
|
155
|
-
NewRelic::Agent.logger.debug
|
162
|
+
NewRelic::Agent.logger.debug("No encoding_key set")
|
156
163
|
false
|
157
164
|
end
|
158
165
|
end
|
159
166
|
|
160
167
|
def cross_application_tracer_enabled?
|
161
168
|
!NewRelic::Agent.config[:"distributed_tracing.enabled"] &&
|
162
|
-
|
163
|
-
NewRelic::Agent.config[:cross_application_tracing])
|
169
|
+
NewRelic::Agent.config[:"cross_application_tracer.enabled"]
|
164
170
|
end
|
165
171
|
|
166
172
|
def obfuscator
|
167
173
|
@obfuscator ||= NewRelic::Agent::Obfuscator.new(Agent.config[:encoding_key])
|
168
174
|
end
|
169
175
|
|
170
|
-
def insert_request_headers
|
176
|
+
def insert_request_headers(request, txn_guid, trip_id, path_hash)
|
171
177
|
cross_app_id = NewRelic::Agent.config[:cross_process_id]
|
172
|
-
txn_data
|
178
|
+
txn_data = ::JSON.dump([txn_guid, false, trip_id, path_hash])
|
173
179
|
|
174
|
-
request[NR_ID_HEADER]
|
180
|
+
request[NR_ID_HEADER] = obfuscator.obfuscate(cross_app_id)
|
175
181
|
request[NR_TXN_HEADER] = obfuscator.obfuscate(txn_data)
|
176
182
|
end
|
177
183
|
|
@@ -179,7 +185,7 @@ module NewRelic
|
|
179
185
|
if !!response[NR_APPDATA_HEADER]
|
180
186
|
true
|
181
187
|
else
|
182
|
-
NewRelic::Agent.logger.debug
|
188
|
+
NewRelic::Agent.logger.debug("No #{NR_APPDATA_HEADER} header")
|
183
189
|
false
|
184
190
|
end
|
185
191
|
end
|
@@ -209,27 +215,27 @@ module NewRelic
|
|
209
215
|
!!(xp_id =~ /\A\d+#\d+\z/)
|
210
216
|
end
|
211
217
|
|
212
|
-
def message_has_crossapp_request_header?
|
218
|
+
def message_has_crossapp_request_header?(headers)
|
213
219
|
!!headers[NR_MESSAGE_BROKER_ID_HEADER]
|
214
220
|
end
|
215
221
|
|
216
|
-
def reject_messaging_cat_headers
|
217
|
-
headers.reject {|k,_| k == NR_MESSAGE_BROKER_ID_HEADER || k == NR_MESSAGE_BROKER_TXN_HEADER}
|
222
|
+
def reject_messaging_cat_headers(headers)
|
223
|
+
headers.reject { |k, _| k == NR_MESSAGE_BROKER_ID_HEADER || k == NR_MESSAGE_BROKER_TXN_HEADER }
|
218
224
|
end
|
219
225
|
|
220
|
-
def trusts?
|
226
|
+
def trusts?(id)
|
221
227
|
split_id = id.match(/(\d+)#\d+/)
|
222
228
|
return false if split_id.nil?
|
223
229
|
|
224
|
-
NewRelic::Agent.config[:trusted_account_ids].include?
|
230
|
+
NewRelic::Agent.config[:trusted_account_ids].include?(split_id.captures.first.to_i)
|
225
231
|
end
|
226
232
|
|
227
|
-
def trusted_valid_cross_app_id?
|
233
|
+
def trusted_valid_cross_app_id?(id)
|
228
234
|
valid_cross_app_id?(id) && trusts?(id)
|
229
235
|
end
|
230
236
|
|
231
237
|
# From inbound request headers
|
232
|
-
def assign_intrinsic_transaction_attributes
|
238
|
+
def assign_intrinsic_transaction_attributes(state)
|
233
239
|
# We expect to get the before call to set the id (if we have it) before
|
234
240
|
# this, and then write our custom parameter when the transaction starts
|
235
241
|
return unless (txn = state.current_transaction)
|
@@ -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
|
@@ -10,22 +9,23 @@ module NewRelic
|
|
10
9
|
|
11
10
|
# Intrinsic Keys
|
12
11
|
INTRINSIC_KEYS = [
|
13
|
-
PARENT_TYPE_KEY
|
14
|
-
PARENT_APP_KEY
|
15
|
-
PARENT_ACCOUNT_ID_KEY
|
16
|
-
PARENT_TRANSPORT_TYPE_KEY
|
17
|
-
PARENT_TRANSPORT_DURATION_KEY
|
18
|
-
GUID_KEY
|
19
|
-
TRACE_ID_KEY
|
20
|
-
PARENT_TRANSACTION_ID_KEY
|
21
|
-
PARENT_SPAN_ID_KEY
|
22
|
-
SAMPLED_KEY
|
12
|
+
PARENT_TYPE_KEY = "parent.type",
|
13
|
+
PARENT_APP_KEY = "parent.app",
|
14
|
+
PARENT_ACCOUNT_ID_KEY = "parent.account",
|
15
|
+
PARENT_TRANSPORT_TYPE_KEY = "parent.transportType",
|
16
|
+
PARENT_TRANSPORT_DURATION_KEY = "parent.transportDuration",
|
17
|
+
GUID_KEY = "guid",
|
18
|
+
TRACE_ID_KEY = "traceId",
|
19
|
+
PARENT_TRANSACTION_ID_KEY = "parentId",
|
20
|
+
PARENT_SPAN_ID_KEY = "parentSpanId",
|
21
|
+
SAMPLED_KEY = "sampled"
|
23
22
|
].freeze
|
24
23
|
|
25
24
|
# This method extracts intrinsics from the transaction_payload and
|
26
25
|
# inserts them into the specified destination.
|
27
|
-
def copy_to_hash
|
26
|
+
def copy_to_hash(transaction_payload, destination)
|
28
27
|
return unless enabled?
|
28
|
+
|
29
29
|
INTRINSIC_KEYS.each do |key|
|
30
30
|
value = transaction_payload[key]
|
31
31
|
destination[key] = value unless value.nil?
|
@@ -34,17 +34,19 @@ module NewRelic
|
|
34
34
|
|
35
35
|
# This method extracts intrinsics from the transaction_payload and
|
36
36
|
# inserts them as intrinsics in the specified transaction_attributes
|
37
|
-
def copy_to_attributes
|
37
|
+
def copy_to_attributes(transaction_payload, destination)
|
38
38
|
return unless enabled?
|
39
|
+
|
39
40
|
INTRINSIC_KEYS.each do |key|
|
40
|
-
next unless transaction_payload.key?
|
41
|
-
|
41
|
+
next unless transaction_payload.key?(key)
|
42
|
+
|
43
|
+
destination.add_intrinsic_attribute(key, transaction_payload[key])
|
42
44
|
end
|
43
45
|
end
|
44
46
|
|
45
47
|
# This method takes all distributed tracing intrinsics from the transaction
|
46
48
|
# and the trace_payload, and populates them into the destination
|
47
|
-
def copy_from_transaction
|
49
|
+
def copy_from_transaction(transaction, trace_payload, destination)
|
48
50
|
destination[GUID_KEY] = transaction.guid
|
49
51
|
destination[SAMPLED_KEY] = transaction.sampled?
|
50
52
|
destination[TRACE_ID_KEY] = transaction.trace_id
|
@@ -53,19 +55,18 @@ module NewRelic
|
|
53
55
|
destination[PARENT_SPAN_ID_KEY] = transaction.parent_span_id
|
54
56
|
end
|
55
57
|
|
56
|
-
copy_parent_attributes
|
58
|
+
copy_parent_attributes(transaction, trace_payload, destination)
|
57
59
|
end
|
58
60
|
|
59
|
-
def copy_parent_attributes
|
61
|
+
def copy_parent_attributes(transaction, trace_payload, destination)
|
60
62
|
transport_type = transaction.distributed_tracer.caller_transport_type
|
61
|
-
destination[PARENT_TRANSPORT_TYPE_KEY] = DistributedTraceTransportType.from
|
63
|
+
destination[PARENT_TRANSPORT_TYPE_KEY] = DistributedTraceTransportType.from(transport_type)
|
62
64
|
|
63
65
|
if trace_payload
|
64
66
|
destination[PARENT_TYPE_KEY] = trace_payload.parent_type
|
65
67
|
destination[PARENT_APP_KEY] = trace_payload.parent_app_id
|
66
68
|
destination[PARENT_ACCOUNT_ID_KEY] = trace_payload.parent_account_id
|
67
|
-
|
68
|
-
destination[PARENT_TRANSPORT_DURATION_KEY] = transaction.calculate_transport_duration trace_payload
|
69
|
+
destination[PARENT_TRANSPORT_DURATION_KEY] = transaction.calculate_transport_duration(trace_payload)
|
69
70
|
|
70
71
|
if parent_transaction_id = transaction.distributed_tracer.parent_transaction_id
|
71
72
|
destination[PARENT_TRANSACTION_ID_KEY] = parent_transaction_id
|
@@ -78,7 +79,6 @@ module NewRelic
|
|
78
79
|
def enabled?
|
79
80
|
return Agent.config[:'distributed_tracing.enabled']
|
80
81
|
end
|
81
|
-
|
82
82
|
end
|
83
83
|
end
|
84
84
|
end
|
@@ -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
|
@@ -22,17 +21,18 @@ module NewRelic
|
|
22
21
|
end
|
23
22
|
end
|
24
23
|
|
25
|
-
def record_metrics_for_transaction
|
24
|
+
def record_metrics_for_transaction(transaction)
|
26
25
|
return unless Agent.config[:'distributed_tracing.enabled']
|
26
|
+
|
27
27
|
dt = transaction.distributed_tracer
|
28
28
|
payload = dt.distributed_trace_payload || dt.trace_state_payload
|
29
29
|
|
30
|
-
record_caller_by_duration_metrics
|
31
|
-
record_transport_duration_metrics
|
32
|
-
record_errors_by_caller_metrics
|
30
|
+
record_caller_by_duration_metrics(transaction, payload)
|
31
|
+
record_transport_duration_metrics(transaction, payload)
|
32
|
+
record_errors_by_caller_metrics(transaction, payload)
|
33
33
|
end
|
34
34
|
|
35
|
-
def prefix_for_metric
|
35
|
+
def prefix_for_metric(name, transaction, payload)
|
36
36
|
if payload
|
37
37
|
"#{name}/" \
|
38
38
|
"#{payload.parent_type}/" \
|
@@ -44,31 +44,31 @@ module NewRelic
|
|
44
44
|
end
|
45
45
|
end
|
46
46
|
|
47
|
-
def record_caller_by_duration_metrics
|
48
|
-
prefix = prefix_for_metric
|
49
|
-
record_unscoped_metric
|
47
|
+
def record_caller_by_duration_metrics(transaction, payload)
|
48
|
+
prefix = prefix_for_metric("DurationByCaller", transaction, payload)
|
49
|
+
record_unscoped_metric(transaction, prefix, transaction.duration)
|
50
50
|
end
|
51
51
|
|
52
|
-
def record_transport_duration_metrics
|
52
|
+
def record_transport_duration_metrics(transaction, payload)
|
53
53
|
return unless payload
|
54
54
|
|
55
|
-
prefix = prefix_for_metric
|
56
|
-
duration = transaction.calculate_transport_duration
|
57
|
-
record_unscoped_metric
|
55
|
+
prefix = prefix_for_metric("TransportDuration", transaction, payload)
|
56
|
+
duration = transaction.calculate_transport_duration(payload)
|
57
|
+
record_unscoped_metric(transaction, prefix, duration)
|
58
58
|
end
|
59
59
|
|
60
|
-
def record_errors_by_caller_metrics
|
60
|
+
def record_errors_by_caller_metrics(transaction, payload)
|
61
61
|
return unless transaction.exceptions.size > 0
|
62
62
|
|
63
|
-
prefix = prefix_for_metric
|
64
|
-
record_unscoped_metric
|
63
|
+
prefix = prefix_for_metric("ErrorsByCaller", transaction, payload)
|
64
|
+
record_unscoped_metric(transaction, prefix, 1)
|
65
65
|
end
|
66
66
|
|
67
67
|
private
|
68
68
|
|
69
|
-
def record_unscoped_metric
|
70
|
-
transaction.metrics.record_unscoped
|
71
|
-
transaction.metrics.record_unscoped
|
69
|
+
def record_unscoped_metric(transaction, prefix, duration)
|
70
|
+
transaction.metrics.record_unscoped("#{prefix}/#{ALL_SUFFIX}", duration)
|
71
|
+
transaction.metrics.record_unscoped("#{prefix}/#{transaction_type_suffix}", duration)
|
72
72
|
end
|
73
73
|
end
|
74
74
|
end
|