newrelic_rpm 6.3.0.355 → 9.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +15 -1
- data/.rubocop.yml +1845 -0
- data/.rubocop_todo.yml +61 -0
- data/.simplecov +16 -0
- data/.snyk +11 -0
- data/.yardopts +1 -0
- data/Brewfile +13 -0
- data/CHANGELOG.md +4102 -2416
- data/CONTRIBUTING.md +132 -19
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Gemfile +5 -2
- data/Guardfile +25 -6
- data/LICENSE +202 -38
- data/README.md +86 -87
- data/Rakefile +32 -32
- data/THIRD_PARTY_NOTICES.md +28 -0
- data/Thorfile +5 -0
- data/bin/newrelic +4 -2
- data/bin/newrelic_cmd +2 -0
- data/bin/nrdebug +86 -63
- data/config.dot +5 -5
- data/docker-compose.yml +107 -0
- data/init.rb +5 -7
- data/install.rb +3 -3
- data/lefthook.yml +9 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +14 -10
- data/lib/new_relic/agent/agent.rb +115 -882
- data/lib/new_relic/agent/agent_helpers/connect.rb +222 -0
- data/lib/new_relic/agent/agent_helpers/harvest.rb +153 -0
- data/lib/new_relic/agent/agent_helpers/shutdown.rb +72 -0
- data/lib/new_relic/agent/agent_helpers/special_startup.rb +74 -0
- data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +175 -0
- data/lib/new_relic/agent/agent_helpers/startup.rb +202 -0
- data/lib/new_relic/agent/agent_helpers/transmit.rb +76 -0
- data/lib/new_relic/agent/agent_logger.rb +30 -22
- data/lib/new_relic/agent/attribute_filter.rb +70 -53
- data/lib/new_relic/agent/attribute_processing.rb +10 -10
- data/lib/new_relic/agent/attributes.rb +153 -0
- data/lib/new_relic/agent/audit_logger.rb +22 -7
- data/lib/new_relic/agent/autostart.rb +34 -28
- data/lib/new_relic/agent/chained_call.rb +2 -2
- data/lib/new_relic/agent/commands/agent_command.rb +5 -5
- data/lib/new_relic/agent/commands/agent_command_router.rb +18 -35
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +17 -15
- data/lib/new_relic/agent/configuration/default_source.rb +1456 -1100
- data/lib/new_relic/agent/configuration/dotted_hash.rb +7 -6
- data/lib/new_relic/agent/configuration/environment_source.rb +17 -13
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +68 -0
- data/lib/new_relic/agent/configuration/high_security_source.rb +12 -12
- data/lib/new_relic/agent/configuration/manager.rb +97 -80
- data/lib/new_relic/agent/configuration/manual_source.rb +2 -2
- data/lib/new_relic/agent/configuration/mask_defaults.rb +4 -4
- data/lib/new_relic/agent/configuration/security_policy_source.rb +93 -96
- data/lib/new_relic/agent/configuration/server_source.rb +66 -40
- data/lib/new_relic/agent/configuration/yaml_source.rb +44 -15
- data/lib/new_relic/agent/configuration.rb +2 -2
- data/lib/new_relic/agent/connect/request_builder.rb +25 -27
- data/lib/new_relic/agent/connect/response_handler.rb +7 -10
- data/lib/new_relic/agent/custom_event_aggregator.rb +16 -16
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +6 -7
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +18 -17
- data/lib/new_relic/agent/database/obfuscator.rb +5 -5
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +4 -4
- data/lib/new_relic/agent/database.rb +47 -56
- data/lib/new_relic/agent/database_adapter.rb +35 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +22 -23
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +9 -8
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +18 -22
- data/lib/new_relic/agent/datastores/mongo.rb +7 -12
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +10 -16
- data/lib/new_relic/agent/datastores.rb +14 -16
- data/lib/new_relic/agent/deprecator.rb +2 -2
- data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +13 -12
- data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +90 -70
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +163 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +38 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +245 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +127 -0
- data/lib/new_relic/agent/distributed_tracing.rb +113 -32
- data/lib/new_relic/agent/encoding_normalizer.rb +5 -3
- data/lib/new_relic/agent/error_collector.rb +129 -65
- data/lib/new_relic/agent/error_event_aggregator.rb +10 -8
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +11 -8
- data/lib/new_relic/agent/event_aggregator.rb +43 -48
- data/lib/new_relic/agent/event_buffer.rb +8 -9
- data/lib/new_relic/agent/event_listener.rb +2 -3
- data/lib/new_relic/agent/event_loop.rb +28 -26
- data/lib/new_relic/agent/external.rb +19 -52
- data/lib/new_relic/agent/guid_generator.rb +30 -0
- data/lib/new_relic/agent/harvester.rb +6 -9
- data/lib/new_relic/agent/heap.rb +9 -10
- data/lib/new_relic/agent/hostname.rb +22 -9
- data/lib/new_relic/agent/http_clients/abstract.rb +69 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +30 -26
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +37 -21
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +22 -23
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +18 -17
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +28 -8
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +17 -17
- data/lib/new_relic/agent/http_clients/uri_util.rb +13 -14
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +22 -55
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +42 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +60 -72
- 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 +86 -62
- data/lib/new_relic/agent/instrumentation/active_job.rb +34 -14
- data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +21 -7
- data/lib/new_relic/agent/instrumentation/active_record.rb +97 -47
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +97 -73
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +70 -76
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +36 -12
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +65 -66
- data/lib/new_relic/agent/instrumentation/active_storage.rb +8 -4
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +11 -32
- data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
- data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/bunny.rb +14 -138
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +75 -63
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
- data/lib/new_relic/agent/instrumentation/curb.rb +16 -201
- data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
- data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +38 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +31 -52
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +67 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +10 -8
- data/lib/new_relic/agent/instrumentation/excon.rb +29 -31
- data/lib/new_relic/agent/instrumentation/fiber/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
- data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
- data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/grape.rb +17 -124
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +12 -32
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +6 -7
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +60 -125
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +103 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +57 -71
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +16 -15
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +11 -11
- data/lib/new_relic/agent/instrumentation/mongo.rb +7 -132
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +53 -17
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
- data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +142 -0
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +22 -58
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +7 -7
- data/lib/new_relic/agent/instrumentation/queue_time.rb +9 -10
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +33 -141
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +22 -57
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +5 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +10 -10
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +18 -6
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +9 -6
- data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +142 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +18 -158
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +94 -0
- data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
- data/lib/new_relic/agent/instrumentation/redis.rb +20 -103
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +33 -41
- data/lib/new_relic/agent/instrumentation/sequel.rb +17 -20
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +13 -13
- data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +30 -46
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +31 -37
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +126 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +4 -4
- data/lib/new_relic/agent/instrumentation/sinatra.rb +35 -165
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
- data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +42 -0
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +14 -76
- data/lib/new_relic/agent/instrumentation.rb +2 -2
- data/lib/new_relic/agent/internal_agent_error.rb +3 -3
- data/lib/new_relic/agent/javascript_instrumentor.rb +60 -49
- data/lib/new_relic/agent/linking_metadata.rb +44 -0
- data/lib/new_relic/agent/local_log_decorator.rb +37 -0
- data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
- data/lib/new_relic/agent/log_once.rb +2 -2
- data/lib/new_relic/agent/log_priority.rb +20 -0
- data/lib/new_relic/agent/logging.rb +182 -0
- data/lib/new_relic/agent/memory_logger.rb +3 -3
- data/lib/new_relic/agent/messaging.rb +74 -156
- data/lib/new_relic/agent/method_tracer.rb +157 -150
- data/lib/new_relic/agent/method_tracer_helpers.rb +89 -12
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +117 -0
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +28 -0
- data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +5 -6
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +8 -13
- data/lib/new_relic/agent/monitors.rb +26 -0
- data/lib/new_relic/agent/new_relic_service/encoders.rb +8 -8
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +7 -7
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +3 -3
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -5
- data/lib/new_relic/agent/new_relic_service.rb +273 -202
- data/lib/new_relic/agent/noticeable_error.rb +19 -0
- data/lib/new_relic/agent/null_logger.rb +8 -4
- data/lib/new_relic/agent/obfuscator.rb +9 -11
- data/lib/new_relic/agent/parameter_filtering.rb +30 -16
- data/lib/new_relic/agent/payload_metric_mapping.rb +10 -11
- data/lib/new_relic/agent/pipe_channel_manager.rb +34 -23
- data/lib/new_relic/agent/pipe_service.rb +14 -9
- data/lib/new_relic/agent/prepend_supportability.rb +3 -3
- data/lib/new_relic/agent/priority_sampled_buffer.rb +17 -15
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +12 -12
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -14
- data/lib/new_relic/agent/rules_engine.rb +6 -5
- data/lib/new_relic/agent/sampler.rb +6 -6
- data/lib/new_relic/agent/sampler_collection.rb +5 -6
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +9 -8
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +21 -18
- data/lib/new_relic/agent/samplers/memory_sampler.rb +33 -22
- data/lib/new_relic/agent/samplers/object_sampler.rb +3 -3
- data/lib/new_relic/agent/samplers/vm_sampler.rb +22 -20
- data/lib/new_relic/agent/span_event_aggregator.rb +17 -19
- data/lib/new_relic/agent/span_event_primitive.rb +118 -58
- data/lib/new_relic/agent/sql_sampler.rb +23 -23
- data/lib/new_relic/agent/stats.rb +80 -43
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +11 -13
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +13 -14
- data/lib/new_relic/agent/stats_engine.rb +9 -9
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +9 -10
- data/lib/new_relic/agent/system_info.rb +97 -68
- data/lib/new_relic/agent/threading/agent_thread.rb +19 -15
- data/lib/new_relic/agent/threading/backtrace_node.rb +13 -14
- data/lib/new_relic/agent/threading/backtrace_service.rb +21 -25
- data/lib/new_relic/agent/threading/thread_profile.rb +32 -46
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +3 -3
- data/lib/new_relic/agent/tracer.rb +159 -107
- data/lib/new_relic/agent/transaction/abstract_segment.rb +147 -51
- data/lib/new_relic/agent/transaction/datastore_segment.rb +23 -19
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +185 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +73 -164
- data/lib/new_relic/agent/transaction/external_request_segment.rb +67 -64
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +34 -46
- data/lib/new_relic/agent/transaction/request_attributes.rb +40 -40
- data/lib/new_relic/agent/transaction/segment.rb +46 -10
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +2 -4
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +3 -3
- data/lib/new_relic/agent/transaction/trace.rb +22 -25
- data/lib/new_relic/agent/transaction/trace_builder.rb +11 -12
- data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
- data/lib/new_relic/agent/transaction/trace_node.rb +36 -32
- data/lib/new_relic/agent/transaction/tracing.rb +16 -13
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +7 -7
- data/lib/new_relic/agent/transaction.rb +248 -205
- data/lib/new_relic/agent/transaction_error_primitive.rb +34 -37
- data/lib/new_relic/agent/transaction_event_aggregator.rb +17 -17
- data/lib/new_relic/agent/transaction_event_primitive.rb +44 -56
- data/lib/new_relic/agent/transaction_event_recorder.rb +17 -16
- data/lib/new_relic/agent/transaction_metrics.rb +11 -10
- data/lib/new_relic/agent/transaction_sampler.rb +9 -14
- data/lib/new_relic/agent/transaction_time_aggregator.rb +33 -28
- data/lib/new_relic/agent/utilization/aws.rb +35 -5
- data/lib/new_relic/agent/utilization/azure.rb +7 -7
- data/lib/new_relic/agent/utilization/gcp.rb +11 -11
- data/lib/new_relic/agent/utilization/pcf.rb +7 -6
- data/lib/new_relic/agent/utilization/vendor.rb +45 -30
- data/lib/new_relic/agent/utilization_data.rb +8 -6
- data/lib/new_relic/agent/vm/jruby_vm.rb +2 -2
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +4 -4
- data/lib/new_relic/agent/vm/mri_vm.rb +54 -26
- data/lib/new_relic/agent/vm/snapshot.rb +6 -6
- data/lib/new_relic/agent/vm.rb +2 -2
- data/lib/new_relic/agent/worker_loop.rb +11 -13
- data/lib/new_relic/agent.rb +219 -89
- data/lib/new_relic/cli/command.rb +22 -24
- data/lib/new_relic/cli/commands/deployments.rb +102 -52
- data/lib/new_relic/cli/commands/install.rb +33 -35
- data/lib/new_relic/coerce.rb +42 -15
- data/lib/new_relic/collection_helper.rb +51 -49
- data/lib/new_relic/constants.rb +38 -0
- data/lib/new_relic/control/class_methods.rb +6 -6
- data/lib/new_relic/control/frameworks/external.rb +3 -3
- data/lib/new_relic/control/frameworks/rails.rb +50 -32
- data/lib/new_relic/control/frameworks/rails3.rb +4 -5
- data/lib/new_relic/control/frameworks/rails4.rb +2 -2
- data/lib/new_relic/control/frameworks/rails_notifications.rb +2 -2
- data/lib/new_relic/control/frameworks/ruby.rb +4 -4
- data/lib/new_relic/control/frameworks/sinatra.rb +8 -2
- data/lib/new_relic/control/frameworks.rb +2 -2
- data/lib/new_relic/control/instance_methods.rb +33 -42
- data/lib/new_relic/control/instrumentation.rb +40 -12
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +4 -5
- data/lib/new_relic/control.rb +2 -3
- data/lib/new_relic/delayed_job_injection.rb +2 -2
- data/lib/new_relic/dependency_detection.rb +129 -31
- data/lib/new_relic/environment_report.rb +42 -36
- data/lib/new_relic/helper.rb +50 -8
- data/lib/new_relic/language_support.rb +31 -7
- data/lib/new_relic/latest_changes.rb +11 -10
- data/lib/new_relic/local_environment.rb +23 -27
- data/lib/new_relic/metric_data.rb +32 -27
- data/lib/new_relic/metric_spec.rb +9 -7
- data/lib/new_relic/noticed_error.rb +60 -45
- data/lib/new_relic/rack/agent_hooks.rb +2 -2
- data/lib/new_relic/rack/agent_middleware.rb +6 -4
- data/lib/new_relic/rack/browser_monitoring.rb +136 -115
- data/lib/new_relic/rack.rb +2 -2
- data/lib/new_relic/recipes/capistrano3.rb +5 -63
- data/lib/new_relic/recipes/capistrano_legacy.rb +25 -28
- data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
- data/lib/new_relic/recipes.rb +2 -2
- data/lib/new_relic/supportability_helper.rb +23 -7
- data/lib/new_relic/traced_thread.rb +39 -0
- data/lib/new_relic/version.rb +7 -18
- data/lib/newrelic_rpm.rb +21 -34
- data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +18 -21
- data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +10 -16
- data/lib/tasks/all.rb +4 -4
- data/lib/tasks/config.rake +24 -120
- data/lib/tasks/coverage_report.rake +28 -0
- data/lib/tasks/helpers/config.html.erb +21 -0
- data/lib/tasks/helpers/format.rb +123 -0
- data/lib/tasks/helpers/matches.rb +12 -0
- data/lib/tasks/helpers/prompt.rb +24 -0
- data/lib/tasks/helpers/removers.rb +33 -0
- data/lib/tasks/install.rake +8 -4
- data/lib/tasks/instrumentation_generator/README.md +63 -0
- data/lib/tasks/instrumentation_generator/TODO.md +33 -0
- data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
- data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
- data/lib/tasks/multiverse.rake +4 -0
- data/lib/tasks/multiverse.rb +23 -9
- data/lib/tasks/newrelic.rb +3 -2
- data/lib/tasks/tests.rake +17 -17
- data/newrelic.yml +672 -3
- data/newrelic_rpm.gemspec +50 -34
- data/recipes/newrelic.rb +3 -3
- data/test/agent_helper.rb +414 -98
- metadata +302 -93
- data/.travis.yml +0 -170
- data/bin/mongrel_rpm +0 -33
- data/cert/cacert.pem +0 -1177
- data/lib/new_relic/agent/commands/xray_session.rb +0 -55
- data/lib/new_relic/agent/commands/xray_session_collection.rb +0 -161
- data/lib/new_relic/agent/configuration/event_data.rb +0 -39
- data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -40
- data/lib/new_relic/agent/distributed_trace_payload.rb +0 -242
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -74
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -202
- data/lib/new_relic/agent/instrumentation/evented_subscriber.rb +0 -135
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -46
- data/lib/new_relic/agent/instrumentation/http.rb +0 -46
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
- data/lib/new_relic/agent/instrumentation/net.rb +0 -50
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
- data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
- data/lib/new_relic/agent/range_extensions.rb +0 -47
- data/lib/new_relic/agent/supported_versions.rb +0 -275
- data/lib/new_relic/agent/transaction/attributes.rb +0 -154
- data/lib/new_relic/agent/transaction/xray_sample_buffer.rb +0 -64
- data/lib/new_relic/build.rb +0 -2
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/new_relic/metrics.rb +0 -13
- data/lib/tasks/config.html.erb +0 -32
- data/lib/tasks/versions.html.erb +0 -28
- data/lib/tasks/versions.postface.html +0 -8
- data/lib/tasks/versions.preface.html +0 -9
- data/lib/tasks/versions.rake +0 -65
- data/lib/tasks/versions.txt.erb +0 -14
- /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -1,7 +1,6 @@
|
|
1
|
-
# -*- ruby -*-
|
2
|
-
# encoding: utf-8
|
3
1
|
# This file is distributed under New Relic's license terms.
|
4
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
5
4
|
|
6
5
|
require 'json'
|
7
6
|
|
@@ -9,27 +8,26 @@ module NewRelic
|
|
9
8
|
module Agent
|
10
9
|
module CrossAppTracing
|
11
10
|
# The cross app response header for "outgoing" calls
|
12
|
-
NR_APPDATA_HEADER = 'X-NewRelic-App-Data'
|
11
|
+
NR_APPDATA_HEADER = 'X-NewRelic-App-Data'
|
13
12
|
|
14
13
|
# The cross app id header for "outgoing" calls
|
15
|
-
NR_ID_HEADER = 'X-NewRelic-ID'
|
14
|
+
NR_ID_HEADER = 'X-NewRelic-ID'
|
16
15
|
|
17
16
|
# The cross app transaction header for "outgoing" calls
|
18
|
-
NR_TXN_HEADER = 'X-NewRelic-Transaction'
|
17
|
+
NR_TXN_HEADER = 'X-NewRelic-Transaction'
|
19
18
|
|
20
|
-
NR_MESSAGE_BROKER_ID_HEADER
|
21
|
-
NR_MESSAGE_BROKER_TXN_HEADER = 'NewRelicTransaction'
|
22
|
-
NR_MESSAGE_BROKER_SYNTHETICS_HEADER = 'NewRelicSynthetics'
|
19
|
+
NR_MESSAGE_BROKER_ID_HEADER = 'NewRelicID'
|
20
|
+
NR_MESSAGE_BROKER_TXN_HEADER = 'NewRelicTransaction'
|
21
|
+
NR_MESSAGE_BROKER_SYNTHETICS_HEADER = 'NewRelicSynthetics'
|
23
22
|
|
24
23
|
attr_accessor :is_cross_app_caller, :cross_app_payload, :cat_path_hashes
|
25
24
|
|
26
25
|
def is_cross_app_caller?
|
27
|
-
@is_cross_app_caller
|
28
|
-
@is_cross_app_caller
|
26
|
+
@is_cross_app_caller ||= false
|
29
27
|
end
|
30
28
|
|
31
29
|
def is_cross_app_callee?
|
32
|
-
cross_app_payload
|
30
|
+
!cross_app_payload.nil?
|
33
31
|
end
|
34
32
|
|
35
33
|
def is_cross_app?
|
@@ -37,28 +35,66 @@ module NewRelic
|
|
37
35
|
end
|
38
36
|
|
39
37
|
def cat_trip_id
|
40
|
-
cross_app_payload
|
38
|
+
cross_app_payload&.referring_trip_id || transaction.guid
|
39
|
+
end
|
40
|
+
|
41
|
+
def cross_app_monitor
|
42
|
+
NewRelic::Agent.instance.monitors.cross_app_monitor
|
41
43
|
end
|
42
44
|
|
43
45
|
def cat_path_hash
|
44
46
|
referring_path_hash = cat_referring_path_hash || '0'
|
45
47
|
seed = referring_path_hash.to_i(16)
|
46
|
-
result =
|
48
|
+
result = cross_app_monitor.path_hash(transaction.best_name, seed)
|
47
49
|
record_cat_path_hash(result)
|
48
50
|
result
|
49
51
|
end
|
50
52
|
|
51
|
-
def
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
53
|
+
def insert_cross_app_header(headers)
|
54
|
+
return unless CrossAppTracing.cross_app_enabled?
|
55
|
+
|
56
|
+
@is_cross_app_caller = true
|
57
|
+
txn_guid = transaction.guid
|
58
|
+
trip_id = cat_trip_id
|
59
|
+
path_hash = cat_path_hash
|
60
|
+
|
61
|
+
insert_request_headers(headers, txn_guid, trip_id, path_hash)
|
62
|
+
end
|
63
|
+
|
64
|
+
def add_message_cat_headers(headers)
|
65
|
+
return unless CrossAppTracing.cross_app_enabled?
|
66
|
+
|
67
|
+
@is_cross_app_caller = true
|
68
|
+
insert_message_headers(headers,
|
69
|
+
transaction.guid,
|
70
|
+
cat_trip_id,
|
71
|
+
cat_path_hash,
|
72
|
+
transaction.raw_synthetics_header)
|
73
|
+
end
|
74
|
+
|
75
|
+
def record_cross_app_metrics
|
76
|
+
if (id = cross_app_payload&.id)
|
77
|
+
app_time_in_seconds = [
|
78
|
+
Process.clock_gettime(Process::CLOCK_REALTIME) - transaction.start_time,
|
79
|
+
0.0
|
80
|
+
].max
|
81
|
+
NewRelic::Agent.record_metric("ClientApplication/#{id}/all", app_time_in_seconds)
|
82
|
+
end
|
83
|
+
end
|
84
|
+
|
85
|
+
def assign_cross_app_intrinsics
|
86
|
+
transaction.attributes.add_intrinsic_attribute(:trip_id, cat_trip_id)
|
87
|
+
transaction.attributes.add_intrinsic_attribute(:path_hash, cat_path_hash)
|
58
88
|
end
|
59
89
|
|
60
90
|
private
|
61
91
|
|
92
|
+
def insert_message_headers(headers, txn_guid, trip_id, path_hash, synthetics_header)
|
93
|
+
headers[NR_MESSAGE_BROKER_ID_HEADER] = obfuscator.obfuscate(Agent.config[:cross_process_id])
|
94
|
+
headers[NR_MESSAGE_BROKER_TXN_HEADER] = obfuscator.obfuscate(::JSON.dump([txn_guid, false, trip_id, path_hash]))
|
95
|
+
headers[NR_MESSAGE_BROKER_SYNTHETICS_HEADER] = synthetics_header if synthetics_header
|
96
|
+
end
|
97
|
+
|
62
98
|
def record_cat_path_hash(hash)
|
63
99
|
@cat_path_hashes ||= []
|
64
100
|
if @cat_path_hashes.size < 10 && !@cat_path_hashes.include?(hash)
|
@@ -67,23 +103,25 @@ module NewRelic
|
|
67
103
|
end
|
68
104
|
|
69
105
|
def cat_referring_path_hash
|
70
|
-
cross_app_payload
|
106
|
+
cross_app_payload&.referring_path_hash
|
71
107
|
end
|
72
108
|
|
73
109
|
def append_cat_info(payload)
|
74
|
-
if (referring_guid = cross_app_payload
|
110
|
+
if (referring_guid = cross_app_payload&.referring_guid)
|
75
111
|
payload[:referring_transaction_guid] = referring_guid
|
76
112
|
end
|
77
113
|
|
78
|
-
return unless include_guid?
|
79
|
-
|
114
|
+
return unless transaction.include_guid?
|
115
|
+
|
116
|
+
payload[:guid] = transaction.guid
|
80
117
|
|
81
118
|
return unless is_cross_app?
|
82
|
-
|
83
|
-
|
119
|
+
|
120
|
+
trip_id = cat_trip_id
|
121
|
+
path_hash = cat_path_hash
|
84
122
|
referring_path_hash = cat_referring_path_hash
|
85
123
|
|
86
|
-
payload[:cat_trip_id]
|
124
|
+
payload[:cat_trip_id] = trip_id if trip_id
|
87
125
|
payload[:cat_referring_path_hash] = referring_path_hash if referring_path_hash
|
88
126
|
|
89
127
|
if path_hash
|
@@ -96,20 +134,9 @@ module NewRelic
|
|
96
134
|
end
|
97
135
|
end
|
98
136
|
|
99
|
-
def assign_cross_app_intrinsics
|
100
|
-
attributes.add_intrinsic_attribute(:trip_id, cat_trip_id)
|
101
|
-
attributes.add_intrinsic_attribute(:path_hash, cat_path_hash)
|
102
|
-
end
|
103
|
-
|
104
|
-
def record_cross_app_metrics
|
105
|
-
if (id = cross_app_payload && cross_app_payload.id)
|
106
|
-
app_time_in_seconds = [Time.now.to_f - @start_time.to_f, 0.0].max
|
107
|
-
NewRelic::Agent.record_metric "ClientApplication/#{id}/all", app_time_in_seconds
|
108
|
-
end
|
109
|
-
end
|
110
|
-
|
111
137
|
###############
|
112
138
|
module_function
|
139
|
+
|
113
140
|
###############
|
114
141
|
|
115
142
|
def cross_app_enabled?
|
@@ -119,38 +146,37 @@ module NewRelic
|
|
119
146
|
end
|
120
147
|
|
121
148
|
def valid_cross_process_id?
|
122
|
-
if
|
149
|
+
if Agent.config[:cross_process_id] && Agent.config[:cross_process_id].length > 0
|
123
150
|
true
|
124
151
|
else
|
125
|
-
NewRelic::Agent.logger.debug
|
152
|
+
NewRelic::Agent.logger.debug('No cross_process_id configured')
|
126
153
|
false
|
127
154
|
end
|
128
155
|
end
|
129
156
|
|
130
157
|
def valid_encoding_key?
|
131
|
-
if
|
158
|
+
if Agent.config[:encoding_key] && Agent.config[:encoding_key].length > 0
|
132
159
|
true
|
133
160
|
else
|
134
|
-
NewRelic::Agent.logger.debug
|
161
|
+
NewRelic::Agent.logger.debug('No encoding_key set')
|
135
162
|
false
|
136
163
|
end
|
137
164
|
end
|
138
165
|
|
139
166
|
def cross_application_tracer_enabled?
|
140
167
|
!NewRelic::Agent.config[:"distributed_tracing.enabled"] &&
|
141
|
-
|
142
|
-
NewRelic::Agent.config[:cross_application_tracing])
|
168
|
+
NewRelic::Agent.config[:"cross_application_tracer.enabled"]
|
143
169
|
end
|
144
170
|
|
145
171
|
def obfuscator
|
146
|
-
@obfuscator ||= NewRelic::Agent::Obfuscator.new(
|
172
|
+
@obfuscator ||= NewRelic::Agent::Obfuscator.new(Agent.config[:encoding_key])
|
147
173
|
end
|
148
174
|
|
149
|
-
def insert_request_headers
|
175
|
+
def insert_request_headers(request, txn_guid, trip_id, path_hash)
|
150
176
|
cross_app_id = NewRelic::Agent.config[:cross_process_id]
|
151
|
-
txn_data
|
177
|
+
txn_data = ::JSON.dump([txn_guid, false, trip_id, path_hash])
|
152
178
|
|
153
|
-
request[NR_ID_HEADER]
|
179
|
+
request[NR_ID_HEADER] = obfuscator.obfuscate(cross_app_id)
|
154
180
|
request[NR_TXN_HEADER] = obfuscator.obfuscate(txn_data)
|
155
181
|
end
|
156
182
|
|
@@ -158,7 +184,7 @@ module NewRelic
|
|
158
184
|
if !!response[NR_APPDATA_HEADER]
|
159
185
|
true
|
160
186
|
else
|
161
|
-
NewRelic::Agent.logger.debug
|
187
|
+
NewRelic::Agent.logger.debug("No #{NR_APPDATA_HEADER} header")
|
162
188
|
false
|
163
189
|
end
|
164
190
|
end
|
@@ -188,44 +214,38 @@ module NewRelic
|
|
188
214
|
!!(xp_id =~ /\A\d+#\d+\z/)
|
189
215
|
end
|
190
216
|
|
191
|
-
def
|
192
|
-
headers[NR_MESSAGE_BROKER_ID_HEADER] = obfuscator.obfuscate(NewRelic::Agent.config[:cross_process_id])
|
193
|
-
headers[NR_MESSAGE_BROKER_TXN_HEADER] = obfuscator.obfuscate(::JSON.dump([txn_guid, false, trip_id, path_hash]))
|
194
|
-
headers[NR_MESSAGE_BROKER_SYNTHETICS_HEADER] = synthetics_header if synthetics_header
|
195
|
-
end
|
196
|
-
|
197
|
-
def message_has_crossapp_request_header? headers
|
217
|
+
def message_has_crossapp_request_header?(headers)
|
198
218
|
!!headers[NR_MESSAGE_BROKER_ID_HEADER]
|
199
219
|
end
|
200
220
|
|
201
|
-
def reject_messaging_cat_headers
|
202
|
-
headers.reject {|k,_| k == NR_MESSAGE_BROKER_ID_HEADER || k == NR_MESSAGE_BROKER_TXN_HEADER}
|
221
|
+
def reject_messaging_cat_headers(headers)
|
222
|
+
headers.reject { |k, _| k == NR_MESSAGE_BROKER_ID_HEADER || k == NR_MESSAGE_BROKER_TXN_HEADER }
|
203
223
|
end
|
204
224
|
|
205
|
-
def trusts?
|
225
|
+
def trusts?(id)
|
206
226
|
split_id = id.match(/(\d+)#\d+/)
|
207
227
|
return false if split_id.nil?
|
208
228
|
|
209
|
-
NewRelic::Agent.config[:trusted_account_ids].include?
|
229
|
+
NewRelic::Agent.config[:trusted_account_ids].include?(split_id.captures.first.to_i)
|
210
230
|
end
|
211
231
|
|
212
|
-
def trusted_valid_cross_app_id?
|
232
|
+
def trusted_valid_cross_app_id?(id)
|
213
233
|
valid_cross_app_id?(id) && trusts?(id)
|
214
234
|
end
|
215
235
|
|
216
236
|
# From inbound request headers
|
217
|
-
def assign_intrinsic_transaction_attributes
|
237
|
+
def assign_intrinsic_transaction_attributes(state)
|
218
238
|
# We expect to get the before call to set the id (if we have it) before
|
219
239
|
# this, and then write our custom parameter when the transaction starts
|
220
|
-
return unless (
|
221
|
-
return unless (
|
240
|
+
return unless (txn = state.current_transaction)
|
241
|
+
return unless (payload = txn.distributed_tracer.cross_app_payload)
|
222
242
|
|
223
|
-
if (cross_app_id =
|
224
|
-
|
243
|
+
if (cross_app_id = payload.id)
|
244
|
+
txn.attributes.add_intrinsic_attribute(:client_cross_process_id, cross_app_id)
|
225
245
|
end
|
226
246
|
|
227
|
-
if (referring_guid =
|
228
|
-
|
247
|
+
if (referring_guid = payload.referring_guid)
|
248
|
+
txn.attributes.add_intrinsic_attribute(:referring_transaction_guid, referring_guid)
|
229
249
|
end
|
230
250
|
end
|
231
251
|
end
|
@@ -0,0 +1,84 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
module DistributedTraceAttributes
|
8
|
+
extend self
|
9
|
+
|
10
|
+
# Intrinsic Keys
|
11
|
+
INTRINSIC_KEYS = [
|
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'
|
22
|
+
].freeze
|
23
|
+
|
24
|
+
# This method extracts intrinsics from the transaction_payload and
|
25
|
+
# inserts them into the specified destination.
|
26
|
+
def copy_to_hash(transaction_payload, destination)
|
27
|
+
return unless enabled?
|
28
|
+
|
29
|
+
INTRINSIC_KEYS.each do |key|
|
30
|
+
value = transaction_payload[key]
|
31
|
+
destination[key] = value unless value.nil?
|
32
|
+
end
|
33
|
+
end
|
34
|
+
|
35
|
+
# This method extracts intrinsics from the transaction_payload and
|
36
|
+
# inserts them as intrinsics in the specified transaction_attributes
|
37
|
+
def copy_to_attributes(transaction_payload, destination)
|
38
|
+
return unless enabled?
|
39
|
+
|
40
|
+
INTRINSIC_KEYS.each do |key|
|
41
|
+
next unless transaction_payload.key?(key)
|
42
|
+
|
43
|
+
destination.add_intrinsic_attribute(key, transaction_payload[key])
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
# This method takes all distributed tracing intrinsics from the transaction
|
48
|
+
# and the trace_payload, and populates them into the destination
|
49
|
+
def copy_from_transaction(transaction, trace_payload, destination)
|
50
|
+
destination[GUID_KEY] = transaction.guid
|
51
|
+
destination[SAMPLED_KEY] = transaction.sampled?
|
52
|
+
destination[TRACE_ID_KEY] = transaction.trace_id
|
53
|
+
|
54
|
+
if transaction.parent_span_id
|
55
|
+
destination[PARENT_SPAN_ID_KEY] = transaction.parent_span_id
|
56
|
+
end
|
57
|
+
|
58
|
+
copy_parent_attributes(transaction, trace_payload, destination)
|
59
|
+
end
|
60
|
+
|
61
|
+
def copy_parent_attributes(transaction, trace_payload, destination)
|
62
|
+
transport_type = transaction.distributed_tracer.caller_transport_type
|
63
|
+
destination[PARENT_TRANSPORT_TYPE_KEY] = DistributedTraceTransportType.from(transport_type)
|
64
|
+
|
65
|
+
if trace_payload
|
66
|
+
destination[PARENT_TYPE_KEY] = trace_payload.parent_type
|
67
|
+
destination[PARENT_APP_KEY] = trace_payload.parent_app_id
|
68
|
+
destination[PARENT_ACCOUNT_ID_KEY] = trace_payload.parent_account_id
|
69
|
+
destination[PARENT_TRANSPORT_DURATION_KEY] = transaction.calculate_transport_duration(trace_payload)
|
70
|
+
|
71
|
+
if parent_transaction_id = transaction.distributed_tracer.parent_transaction_id
|
72
|
+
destination[PARENT_TRANSACTION_ID_KEY] = parent_transaction_id
|
73
|
+
end
|
74
|
+
end
|
75
|
+
end
|
76
|
+
|
77
|
+
private
|
78
|
+
|
79
|
+
def enabled?
|
80
|
+
return Agent.config[:'distributed_tracing.enabled']
|
81
|
+
end
|
82
|
+
end
|
83
|
+
end
|
84
|
+
end
|
@@ -0,0 +1,75 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
module DistributedTraceMetrics
|
8
|
+
extend self
|
9
|
+
|
10
|
+
ALL_SUFFIX = 'all'
|
11
|
+
ALL_WEB_SUFFIX = 'allWeb'
|
12
|
+
ALL_OTHER_SUFFIX = 'allOther'
|
13
|
+
|
14
|
+
UNKNOWN_CALLER_PREFIX = '%s/Unknown/Unknown/Unknown/%s'
|
15
|
+
|
16
|
+
def transaction_type_suffix
|
17
|
+
if Transaction.recording_web_transaction?
|
18
|
+
ALL_WEB_SUFFIX
|
19
|
+
else
|
20
|
+
ALL_OTHER_SUFFIX
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
def record_metrics_for_transaction(transaction)
|
25
|
+
return unless Agent.config[:'distributed_tracing.enabled']
|
26
|
+
|
27
|
+
dt = transaction.distributed_tracer
|
28
|
+
payload = dt.distributed_trace_payload || dt.trace_state_payload
|
29
|
+
|
30
|
+
record_caller_by_duration_metrics(transaction, payload)
|
31
|
+
record_transport_duration_metrics(transaction, payload)
|
32
|
+
record_errors_by_caller_metrics(transaction, payload)
|
33
|
+
end
|
34
|
+
|
35
|
+
def prefix_for_metric(name, transaction, payload)
|
36
|
+
if payload
|
37
|
+
"#{name}/" \
|
38
|
+
"#{payload.parent_type}/" \
|
39
|
+
"#{payload.parent_account_id}/" \
|
40
|
+
"#{payload.parent_app_id}/" \
|
41
|
+
"#{transaction.distributed_tracer.caller_transport_type}"
|
42
|
+
else
|
43
|
+
UNKNOWN_CALLER_PREFIX % [name, transaction.distributed_tracer.caller_transport_type]
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
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
|
+
end
|
51
|
+
|
52
|
+
def record_transport_duration_metrics(transaction, payload)
|
53
|
+
return unless payload
|
54
|
+
|
55
|
+
prefix = prefix_for_metric('TransportDuration', transaction, payload)
|
56
|
+
duration = transaction.calculate_transport_duration(payload)
|
57
|
+
record_unscoped_metric(transaction, prefix, duration)
|
58
|
+
end
|
59
|
+
|
60
|
+
def record_errors_by_caller_metrics(transaction, payload)
|
61
|
+
return unless transaction.exceptions.size > 0
|
62
|
+
|
63
|
+
prefix = prefix_for_metric('ErrorsByCaller', transaction, payload)
|
64
|
+
record_unscoped_metric(transaction, prefix, 1)
|
65
|
+
end
|
66
|
+
|
67
|
+
private
|
68
|
+
|
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
|
+
end
|
73
|
+
end
|
74
|
+
end
|
75
|
+
end
|
@@ -0,0 +1,163 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require 'json'
|
6
|
+
require 'base64'
|
7
|
+
|
8
|
+
module NewRelic
|
9
|
+
module Agent
|
10
|
+
#
|
11
|
+
# This class contains properties related to distributed traces.
|
12
|
+
# To obtain an instance, call
|
13
|
+
# {DistributedTracing#create_distributed_trace_payload}
|
14
|
+
#
|
15
|
+
# @api public
|
16
|
+
class DistributedTracePayload
|
17
|
+
extend Coerce
|
18
|
+
|
19
|
+
VERSION = [0, 1].freeze
|
20
|
+
PARENT_TYPE = 'App'
|
21
|
+
|
22
|
+
# Key names for serialization
|
23
|
+
VERSION_KEY = 'v'
|
24
|
+
DATA_KEY = 'd'
|
25
|
+
PARENT_TYPE_KEY = 'ty'
|
26
|
+
PARENT_ACCOUNT_ID_KEY = 'ac'
|
27
|
+
PARENT_APP_KEY = 'ap'
|
28
|
+
TRUSTED_ACCOUNT_KEY = 'tk'
|
29
|
+
ID_KEY = 'id'
|
30
|
+
TX_KEY = 'tx'
|
31
|
+
TRACE_ID_KEY = 'tr'
|
32
|
+
SAMPLED_KEY = 'sa'
|
33
|
+
TIMESTAMP_KEY = 'ti'
|
34
|
+
PRIORITY_KEY = 'pr'
|
35
|
+
|
36
|
+
class << self
|
37
|
+
def for_transaction(transaction)
|
38
|
+
return nil unless connected?
|
39
|
+
|
40
|
+
payload = new
|
41
|
+
payload.version = VERSION
|
42
|
+
payload.parent_type = PARENT_TYPE
|
43
|
+
payload.parent_account_id = Agent.config[:account_id]
|
44
|
+
payload.parent_app_id = Agent.config[:primary_application_id]
|
45
|
+
|
46
|
+
assign_trusted_account_key(payload, payload.parent_account_id)
|
47
|
+
|
48
|
+
payload.id = current_segment_id(transaction)
|
49
|
+
payload.transaction_id = transaction.guid
|
50
|
+
payload.timestamp = Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond)
|
51
|
+
payload.trace_id = transaction.trace_id
|
52
|
+
payload.sampled = transaction.sampled?
|
53
|
+
payload.priority = transaction.priority
|
54
|
+
|
55
|
+
payload
|
56
|
+
end
|
57
|
+
|
58
|
+
def from_json(serialized_payload)
|
59
|
+
raw_payload = JSON.parse(serialized_payload)
|
60
|
+
return raw_payload if raw_payload.nil?
|
61
|
+
|
62
|
+
payload_data = raw_payload[DATA_KEY]
|
63
|
+
|
64
|
+
payload = new
|
65
|
+
payload.version = raw_payload[VERSION_KEY]
|
66
|
+
payload.parent_type = payload_data[PARENT_TYPE_KEY]
|
67
|
+
payload.parent_account_id = payload_data[PARENT_ACCOUNT_ID_KEY]
|
68
|
+
payload.parent_app_id = payload_data[PARENT_APP_KEY]
|
69
|
+
payload.trusted_account_key = payload_data[TRUSTED_ACCOUNT_KEY]
|
70
|
+
payload.timestamp = payload_data[TIMESTAMP_KEY]
|
71
|
+
payload.id = payload_data[ID_KEY]
|
72
|
+
payload.transaction_id = payload_data[TX_KEY]
|
73
|
+
payload.trace_id = payload_data[TRACE_ID_KEY]
|
74
|
+
payload.sampled = payload_data[SAMPLED_KEY]
|
75
|
+
payload.priority = payload_data[PRIORITY_KEY]
|
76
|
+
|
77
|
+
payload
|
78
|
+
end
|
79
|
+
|
80
|
+
def from_http_safe(http_safe_payload)
|
81
|
+
decoded_payload = Base64.strict_decode64(http_safe_payload)
|
82
|
+
from_json(decoded_payload)
|
83
|
+
end
|
84
|
+
|
85
|
+
def major_version_matches?(payload)
|
86
|
+
payload.version[0] == VERSION[0]
|
87
|
+
end
|
88
|
+
|
89
|
+
private
|
90
|
+
|
91
|
+
def assign_trusted_account_key(payload, account_id)
|
92
|
+
trusted_account_key = Agent.config[:trusted_account_key]
|
93
|
+
|
94
|
+
if account_id != trusted_account_key
|
95
|
+
payload.trusted_account_key = trusted_account_key
|
96
|
+
end
|
97
|
+
end
|
98
|
+
|
99
|
+
def current_segment_id(transaction)
|
100
|
+
if Agent.config[:'span_events.enabled'] && transaction.current_segment
|
101
|
+
transaction.current_segment.guid
|
102
|
+
end
|
103
|
+
end
|
104
|
+
|
105
|
+
def connected?
|
106
|
+
Agent.instance.connected?
|
107
|
+
end
|
108
|
+
end
|
109
|
+
|
110
|
+
attr_accessor :version,
|
111
|
+
:parent_type,
|
112
|
+
:parent_account_id,
|
113
|
+
:parent_app_id,
|
114
|
+
:trusted_account_key,
|
115
|
+
:id,
|
116
|
+
:transaction_id,
|
117
|
+
:trace_id,
|
118
|
+
:sampled,
|
119
|
+
:priority,
|
120
|
+
:timestamp
|
121
|
+
|
122
|
+
alias_method :sampled?, :sampled
|
123
|
+
|
124
|
+
# Represent this payload as a raw JSON string.
|
125
|
+
#
|
126
|
+
# @return [String] Payload translated to JSON
|
127
|
+
#
|
128
|
+
# @api public
|
129
|
+
def text
|
130
|
+
result = {
|
131
|
+
VERSION_KEY => version
|
132
|
+
}
|
133
|
+
|
134
|
+
result[DATA_KEY] = {
|
135
|
+
PARENT_TYPE_KEY => parent_type,
|
136
|
+
PARENT_ACCOUNT_ID_KEY => parent_account_id,
|
137
|
+
PARENT_APP_KEY => parent_app_id,
|
138
|
+
TX_KEY => transaction_id,
|
139
|
+
TRACE_ID_KEY => trace_id,
|
140
|
+
SAMPLED_KEY => sampled,
|
141
|
+
PRIORITY_KEY => priority,
|
142
|
+
TIMESTAMP_KEY => timestamp
|
143
|
+
}
|
144
|
+
|
145
|
+
result[DATA_KEY][ID_KEY] = id if id
|
146
|
+
result[DATA_KEY][TRUSTED_ACCOUNT_KEY] = trusted_account_key if trusted_account_key
|
147
|
+
|
148
|
+
JSON.dump(result)
|
149
|
+
end
|
150
|
+
|
151
|
+
# Encode this payload as a string suitable for passing via an
|
152
|
+
# HTTP header.
|
153
|
+
#
|
154
|
+
# @return [String] Payload translated to JSON and encoded for
|
155
|
+
# inclusion in headers
|
156
|
+
#
|
157
|
+
# @api public
|
158
|
+
def http_safe
|
159
|
+
Base64.strict_encode64(text)
|
160
|
+
end
|
161
|
+
end
|
162
|
+
end
|
163
|
+
end
|
@@ -0,0 +1,38 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
module DistributedTraceTransportType
|
8
|
+
extend self
|
9
|
+
|
10
|
+
ALLOWABLE_TRANSPORT_TYPES = [
|
11
|
+
NewRelic::UNKNOWN,
|
12
|
+
NewRelic::HTTP,
|
13
|
+
NewRelic::HTTPS,
|
14
|
+
'Kafka',
|
15
|
+
'JMS',
|
16
|
+
'IronMQ',
|
17
|
+
'AMQP',
|
18
|
+
'Queue',
|
19
|
+
'Other'
|
20
|
+
].freeze
|
21
|
+
|
22
|
+
URL_SCHEMES = {
|
23
|
+
'http' => NewRelic::HTTP,
|
24
|
+
'https' => NewRelic::HTTPS
|
25
|
+
}.freeze
|
26
|
+
|
27
|
+
RACK_URL_SCHEME = 'rack.url_scheme'
|
28
|
+
|
29
|
+
def from(value)
|
30
|
+
ALLOWABLE_TRANSPORT_TYPES.include?(value) ? value : NewRelic::UNKNOWN
|
31
|
+
end
|
32
|
+
|
33
|
+
def for_rack_request(request)
|
34
|
+
URL_SCHEMES[request[RACK_URL_SCHEME]]
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|