newrelic_rpm 6.8.0.360 → 9.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +14 -1
- data/.rubocop.yml +1845 -0
- data/.rubocop_todo.yml +61 -0
- data/.simplecov +16 -0
- data/.snyk +11 -0
- data/.yardopts +1 -0
- data/Brewfile +13 -0
- data/CHANGELOG.md +4029 -2514
- data/CONTRIBUTING.md +132 -19
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Gemfile +5 -2
- data/Guardfile +21 -8
- data/LICENSE +202 -38
- data/README.md +86 -87
- data/Rakefile +32 -32
- data/THIRD_PARTY_NOTICES.md +28 -0
- data/Thorfile +5 -0
- data/bin/newrelic +4 -2
- data/bin/newrelic_cmd +2 -0
- data/bin/nrdebug +86 -63
- data/config.dot +5 -5
- data/docker-compose.yml +107 -0
- data/init.rb +5 -7
- data/install.rb +3 -3
- data/lefthook.yml +9 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +14 -10
- data/lib/new_relic/agent/agent.rb +114 -942
- data/lib/new_relic/agent/agent_helpers/connect.rb +222 -0
- data/lib/new_relic/agent/agent_helpers/harvest.rb +153 -0
- data/lib/new_relic/agent/agent_helpers/shutdown.rb +72 -0
- data/lib/new_relic/agent/agent_helpers/special_startup.rb +74 -0
- data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +175 -0
- data/lib/new_relic/agent/agent_helpers/startup.rb +202 -0
- data/lib/new_relic/agent/agent_helpers/transmit.rb +76 -0
- data/lib/new_relic/agent/agent_logger.rb +28 -24
- data/lib/new_relic/agent/attribute_filter.rb +66 -49
- data/lib/new_relic/agent/attribute_processing.rb +10 -10
- data/lib/new_relic/agent/attributes.rb +9 -8
- data/lib/new_relic/agent/audit_logger.rb +22 -7
- data/lib/new_relic/agent/autostart.rb +22 -21
- data/lib/new_relic/agent/chained_call.rb +2 -2
- data/lib/new_relic/agent/commands/agent_command.rb +5 -5
- data/lib/new_relic/agent/commands/agent_command_router.rb +16 -14
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +17 -15
- data/lib/new_relic/agent/configuration/default_source.rb +1444 -1167
- data/lib/new_relic/agent/configuration/dotted_hash.rb +7 -6
- data/lib/new_relic/agent/configuration/environment_source.rb +14 -12
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +41 -18
- data/lib/new_relic/agent/configuration/high_security_source.rb +12 -13
- data/lib/new_relic/agent/configuration/manager.rb +96 -70
- data/lib/new_relic/agent/configuration/manual_source.rb +2 -2
- data/lib/new_relic/agent/configuration/mask_defaults.rb +4 -4
- data/lib/new_relic/agent/configuration/security_policy_source.rb +93 -96
- data/lib/new_relic/agent/configuration/server_source.rb +44 -42
- data/lib/new_relic/agent/configuration/yaml_source.rb +36 -12
- data/lib/new_relic/agent/configuration.rb +2 -2
- data/lib/new_relic/agent/connect/request_builder.rb +19 -19
- data/lib/new_relic/agent/connect/response_handler.rb +6 -9
- data/lib/new_relic/agent/custom_event_aggregator.rb +16 -16
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +6 -7
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +18 -17
- data/lib/new_relic/agent/database/obfuscator.rb +5 -5
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +4 -4
- data/lib/new_relic/agent/database.rb +47 -56
- data/lib/new_relic/agent/database_adapter.rb +35 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +22 -23
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +8 -7
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +18 -22
- data/lib/new_relic/agent/datastores/mongo.rb +7 -12
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +10 -16
- data/lib/new_relic/agent/datastores.rb +14 -16
- data/lib/new_relic/agent/deprecator.rb +2 -2
- data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +13 -12
- data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +90 -70
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +163 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +38 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +245 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +127 -0
- data/lib/new_relic/agent/distributed_tracing.rb +113 -32
- data/lib/new_relic/agent/encoding_normalizer.rb +5 -3
- data/lib/new_relic/agent/error_collector.rb +129 -65
- data/lib/new_relic/agent/error_event_aggregator.rb +9 -8
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +10 -8
- data/lib/new_relic/agent/event_aggregator.rb +23 -22
- data/lib/new_relic/agent/event_buffer.rb +8 -9
- data/lib/new_relic/agent/event_listener.rb +2 -3
- data/lib/new_relic/agent/event_loop.rb +28 -26
- data/lib/new_relic/agent/external.rb +19 -52
- data/lib/new_relic/agent/guid_generator.rb +14 -12
- data/lib/new_relic/agent/harvester.rb +6 -9
- data/lib/new_relic/agent/heap.rb +9 -10
- data/lib/new_relic/agent/hostname.rb +22 -9
- data/lib/new_relic/agent/http_clients/abstract.rb +69 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +30 -26
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +37 -21
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +22 -23
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +18 -17
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +28 -8
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +17 -17
- data/lib/new_relic/agent/http_clients/uri_util.rb +13 -14
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +10 -25
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +42 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +46 -34
- data/lib/new_relic/agent/instrumentation/action_dispatch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb +64 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb +33 -0
- data/lib/new_relic/agent/instrumentation/action_mailer.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb +85 -0
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +28 -21
- data/lib/new_relic/agent/instrumentation/active_job.rb +34 -14
- data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +21 -7
- data/lib/new_relic/agent/instrumentation/active_record.rb +97 -47
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +97 -73
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +53 -66
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +36 -12
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +37 -24
- data/lib/new_relic/agent/instrumentation/active_storage.rb +8 -4
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +9 -30
- data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
- data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/bunny.rb +14 -138
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +21 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +27 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby.rb +31 -0
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +75 -63
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
- data/lib/new_relic/agent/instrumentation/curb.rb +16 -201
- data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
- data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +38 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +31 -52
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +67 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +10 -8
- data/lib/new_relic/agent/instrumentation/excon.rb +29 -31
- data/lib/new_relic/agent/instrumentation/fiber/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
- data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
- data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/grape.rb +17 -123
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +12 -32
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +6 -7
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +60 -125
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +103 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +57 -71
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +16 -15
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +11 -11
- data/lib/new_relic/agent/instrumentation/mongo.rb +7 -132
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +53 -17
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
- data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +75 -9
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +22 -58
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +7 -7
- data/lib/new_relic/agent/instrumentation/queue_time.rb +9 -10
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +33 -141
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +22 -57
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +5 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +10 -9
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +18 -6
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +9 -6
- data/lib/new_relic/agent/instrumentation/rails_notifications/custom_events.rb +30 -0
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +142 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +18 -158
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +94 -0
- data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
- data/lib/new_relic/agent/instrumentation/redis.rb +20 -103
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +33 -41
- data/lib/new_relic/agent/instrumentation/sequel.rb +17 -20
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +13 -13
- data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +30 -46
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +31 -37
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +126 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +4 -4
- data/lib/new_relic/agent/instrumentation/sinatra.rb +35 -165
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
- data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +42 -0
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +14 -76
- data/lib/new_relic/agent/instrumentation.rb +2 -2
- data/lib/new_relic/agent/internal_agent_error.rb +3 -3
- data/lib/new_relic/agent/javascript_instrumentor.rb +59 -48
- data/lib/new_relic/agent/linking_metadata.rb +44 -0
- data/lib/new_relic/agent/local_log_decorator.rb +37 -0
- data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
- data/lib/new_relic/agent/log_once.rb +2 -2
- data/lib/new_relic/agent/log_priority.rb +20 -0
- data/lib/new_relic/agent/logging.rb +104 -51
- data/lib/new_relic/agent/memory_logger.rb +3 -3
- data/lib/new_relic/agent/messaging.rb +74 -156
- data/lib/new_relic/agent/method_tracer.rb +157 -150
- data/lib/new_relic/agent/method_tracer_helpers.rb +89 -12
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +117 -0
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +28 -0
- data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +3 -4
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +8 -13
- data/lib/new_relic/agent/monitors.rb +26 -0
- data/lib/new_relic/agent/new_relic_service/encoders.rb +8 -8
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +7 -7
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +3 -3
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -5
- data/lib/new_relic/agent/new_relic_service.rb +266 -193
- data/lib/new_relic/agent/noticeable_error.rb +19 -0
- data/lib/new_relic/agent/null_logger.rb +8 -4
- data/lib/new_relic/agent/obfuscator.rb +9 -11
- data/lib/new_relic/agent/parameter_filtering.rb +30 -16
- data/lib/new_relic/agent/payload_metric_mapping.rb +10 -11
- data/lib/new_relic/agent/pipe_channel_manager.rb +34 -23
- data/lib/new_relic/agent/pipe_service.rb +14 -9
- data/lib/new_relic/agent/prepend_supportability.rb +3 -3
- data/lib/new_relic/agent/priority_sampled_buffer.rb +16 -16
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +12 -12
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -14
- data/lib/new_relic/agent/rules_engine.rb +6 -5
- data/lib/new_relic/agent/sampler.rb +6 -6
- data/lib/new_relic/agent/sampler_collection.rb +5 -6
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +9 -8
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +21 -18
- data/lib/new_relic/agent/samplers/memory_sampler.rb +33 -22
- data/lib/new_relic/agent/samplers/object_sampler.rb +3 -3
- data/lib/new_relic/agent/samplers/vm_sampler.rb +22 -20
- data/lib/new_relic/agent/span_event_aggregator.rb +16 -16
- data/lib/new_relic/agent/span_event_primitive.rb +106 -68
- data/lib/new_relic/agent/sql_sampler.rb +23 -23
- data/lib/new_relic/agent/stats.rb +80 -43
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +11 -13
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +13 -14
- data/lib/new_relic/agent/stats_engine.rb +9 -9
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +9 -10
- data/lib/new_relic/agent/system_info.rb +97 -68
- data/lib/new_relic/agent/threading/agent_thread.rb +19 -15
- data/lib/new_relic/agent/threading/backtrace_node.rb +13 -14
- data/lib/new_relic/agent/threading/backtrace_service.rb +18 -22
- data/lib/new_relic/agent/threading/thread_profile.rb +25 -25
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +3 -3
- data/lib/new_relic/agent/tracer.rb +127 -107
- data/lib/new_relic/agent/transaction/abstract_segment.rb +145 -49
- data/lib/new_relic/agent/transaction/datastore_segment.rb +23 -19
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +185 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +76 -86
- data/lib/new_relic/agent/transaction/external_request_segment.rb +67 -77
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +34 -46
- data/lib/new_relic/agent/transaction/request_attributes.rb +40 -40
- data/lib/new_relic/agent/transaction/segment.rb +41 -11
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +2 -4
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +3 -3
- data/lib/new_relic/agent/transaction/trace.rb +19 -17
- data/lib/new_relic/agent/transaction/trace_builder.rb +11 -11
- data/lib/new_relic/agent/transaction/trace_context.rb +102 -93
- data/lib/new_relic/agent/transaction/trace_node.rb +31 -32
- data/lib/new_relic/agent/transaction/tracing.rb +22 -13
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +7 -7
- data/lib/new_relic/agent/transaction.rb +239 -198
- data/lib/new_relic/agent/transaction_error_primitive.rb +32 -28
- data/lib/new_relic/agent/transaction_event_aggregator.rb +17 -17
- data/lib/new_relic/agent/transaction_event_primitive.rb +43 -47
- data/lib/new_relic/agent/transaction_event_recorder.rb +17 -16
- data/lib/new_relic/agent/transaction_metrics.rb +11 -10
- data/lib/new_relic/agent/transaction_sampler.rb +8 -9
- data/lib/new_relic/agent/transaction_time_aggregator.rb +33 -28
- data/lib/new_relic/agent/utilization/aws.rb +35 -5
- data/lib/new_relic/agent/utilization/azure.rb +7 -7
- data/lib/new_relic/agent/utilization/gcp.rb +11 -11
- data/lib/new_relic/agent/utilization/pcf.rb +7 -6
- data/lib/new_relic/agent/utilization/vendor.rb +45 -30
- data/lib/new_relic/agent/utilization_data.rb +8 -6
- data/lib/new_relic/agent/vm/jruby_vm.rb +2 -2
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +4 -4
- data/lib/new_relic/agent/vm/mri_vm.rb +54 -26
- data/lib/new_relic/agent/vm/snapshot.rb +6 -6
- data/lib/new_relic/agent/vm.rb +2 -2
- data/lib/new_relic/agent/worker_loop.rb +11 -13
- data/lib/new_relic/agent.rb +159 -109
- data/lib/new_relic/cli/command.rb +22 -24
- data/lib/new_relic/cli/commands/deployments.rb +101 -51
- data/lib/new_relic/cli/commands/install.rb +33 -35
- data/lib/new_relic/coerce.rb +19 -15
- data/lib/new_relic/collection_helper.rb +51 -49
- data/lib/new_relic/constants.rb +38 -0
- data/lib/new_relic/control/class_methods.rb +6 -6
- data/lib/new_relic/control/frameworks/external.rb +3 -3
- data/lib/new_relic/control/frameworks/rails.rb +50 -32
- data/lib/new_relic/control/frameworks/rails3.rb +4 -5
- data/lib/new_relic/control/frameworks/rails4.rb +2 -2
- data/lib/new_relic/control/frameworks/rails_notifications.rb +2 -2
- data/lib/new_relic/control/frameworks/ruby.rb +4 -4
- data/lib/new_relic/control/frameworks/sinatra.rb +8 -2
- data/lib/new_relic/control/frameworks.rb +2 -2
- data/lib/new_relic/control/instance_methods.rb +28 -46
- data/lib/new_relic/control/instrumentation.rb +26 -12
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +4 -5
- data/lib/new_relic/control.rb +2 -3
- data/lib/new_relic/delayed_job_injection.rb +2 -2
- data/lib/new_relic/dependency_detection.rb +138 -31
- data/lib/new_relic/environment_report.rb +42 -36
- data/lib/new_relic/helper.rb +50 -8
- data/lib/new_relic/language_support.rb +31 -7
- data/lib/new_relic/latest_changes.rb +11 -10
- data/lib/new_relic/local_environment.rb +23 -27
- data/lib/new_relic/metric_data.rb +32 -27
- data/lib/new_relic/metric_spec.rb +9 -7
- data/lib/new_relic/noticed_error.rb +58 -47
- data/lib/new_relic/rack/agent_hooks.rb +2 -2
- data/lib/new_relic/rack/agent_middleware.rb +6 -4
- data/lib/new_relic/rack/browser_monitoring.rb +136 -117
- data/lib/new_relic/rack.rb +2 -2
- data/lib/new_relic/recipes/capistrano3.rb +5 -63
- data/lib/new_relic/recipes/capistrano_legacy.rb +25 -28
- data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
- data/lib/new_relic/recipes.rb +2 -2
- data/lib/new_relic/supportability_helper.rb +23 -7
- data/lib/new_relic/traced_thread.rb +39 -0
- data/lib/new_relic/version.rb +7 -18
- data/lib/newrelic_rpm.rb +21 -34
- data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +18 -21
- data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +10 -16
- data/lib/tasks/all.rb +4 -4
- data/lib/tasks/config.rake +24 -119
- data/lib/tasks/coverage_report.rake +28 -0
- data/lib/tasks/helpers/config.html.erb +21 -0
- data/lib/tasks/helpers/format.rb +123 -0
- data/lib/tasks/helpers/matches.rb +12 -0
- data/lib/tasks/helpers/prompt.rb +24 -0
- data/lib/tasks/helpers/removers.rb +33 -0
- data/lib/tasks/install.rake +8 -4
- data/lib/tasks/instrumentation_generator/README.md +63 -0
- data/lib/tasks/instrumentation_generator/TODO.md +33 -0
- data/lib/tasks/instrumentation_generator/instrumentation.thor +121 -0
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
- data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
- data/lib/tasks/multiverse.rake +4 -0
- data/lib/tasks/multiverse.rb +23 -9
- data/lib/tasks/newrelic.rb +3 -2
- data/lib/tasks/tests.rake +17 -17
- data/newrelic.yml +672 -3
- data/newrelic_rpm.gemspec +46 -39
- data/recipes/newrelic.rb +3 -3
- data/test/agent_helper.rb +340 -110
- metadata +272 -97
- data/.travis.yml +0 -210
- data/bin/mongrel_rpm +0 -33
- data/cert/cacert.pem +0 -1177
- data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
- data/lib/new_relic/agent/distributed_trace_intrinsics.rb +0 -90
- data/lib/new_relic/agent/distributed_trace_metrics.rb +0 -74
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -30
- data/lib/new_relic/agent/distributed_trace_payload.rb +0 -175
- data/lib/new_relic/agent/distributed_trace_transport_type.rb +0 -43
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -74
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -202
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -46
- data/lib/new_relic/agent/instrumentation/http.rb +0 -46
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
- data/lib/new_relic/agent/instrumentation/net.rb +0 -50
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -26
- data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -33
- data/lib/new_relic/agent/range_extensions.rb +0 -47
- data/lib/new_relic/agent/supported_versions.rb +0 -275
- data/lib/new_relic/agent/trace_context.rb +0 -244
- data/lib/new_relic/agent/trace_context_payload.rb +0 -134
- data/lib/new_relic/agent/trace_context_request_monitor.rb +0 -42
- data/lib/new_relic/build.rb +0 -2
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/new_relic/metrics.rb +0 -13
- data/lib/tasks/config.html.erb +0 -32
- data/true +0 -0
- /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -0,0 +1,245 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require_relative 'trace_context_payload'
|
6
|
+
|
7
|
+
module NewRelic
|
8
|
+
module Agent
|
9
|
+
module DistributedTracing
|
10
|
+
class TraceContext
|
11
|
+
VERSION = 0x0
|
12
|
+
|
13
|
+
COMMA = ','
|
14
|
+
EQUALS = '='
|
15
|
+
INVALID_TRACE_ID = ('0' * 32)
|
16
|
+
INVALID_PARENT_ID = ('0' * 16)
|
17
|
+
INVALID_VERSION = 'ff'
|
18
|
+
|
19
|
+
TRACE_ID_KEY = 'trace_id'
|
20
|
+
TRACE_FLAGS_KEY = 'trace_flags'
|
21
|
+
PARENT_ID_KEY = 'parent_id'
|
22
|
+
VERSION_KEY = 'version'
|
23
|
+
UNDEFINED_FIELDS_KEY = 'undefined_fields'
|
24
|
+
|
25
|
+
TP_VERSION = "(?<#{VERSION_KEY}>[a-f\\d]{2})"
|
26
|
+
TP_TRACE_ID = "(?<#{TRACE_ID_KEY}>[a-f\\d]{32})"
|
27
|
+
TP_PARENT_ID = "(?<#{PARENT_ID_KEY}>[a-f\\d]{16})"
|
28
|
+
TP_TRACE_FLAGS = "(?<#{TRACE_FLAGS_KEY}>\\d{2})"
|
29
|
+
TP_UNDEFINED_FIELDS = "(?<#{UNDEFINED_FIELDS_KEY}>-[a-zA-Z\\d-]*)"
|
30
|
+
TRACE_PARENT_REGEX = /\A#{TP_VERSION}-#{TP_TRACE_ID}-#{TP_PARENT_ID}-#{TP_TRACE_FLAGS}#{TP_UNDEFINED_FIELDS}?\z/
|
31
|
+
|
32
|
+
TRACE_PARENT_FORMAT_STRING = '%02x-%s-%s-%02x'
|
33
|
+
|
34
|
+
MAX_TRACE_STATE_SIZE = 512 # bytes
|
35
|
+
MAX_TRACE_STATE_ENTRY_SIZE = 128 # bytes
|
36
|
+
|
37
|
+
SUPPORTABILITY_TRACE_PARENT_PARSE_EXCEPTION = 'Supportability/TraceContext/TraceParent/Parse/Exception'
|
38
|
+
SUPPORTABILITY_TRACE_STATE_PARSE_EXCEPTION = 'Supportability/TraceContext/TraceState/Parse/Exception'
|
39
|
+
SUPPORTABILITY_TRACE_STATE_INVALID_NR_ENTRY = 'Supportability/TraceContext/TraceState/InvalidNrEntry'
|
40
|
+
|
41
|
+
class << self
|
42
|
+
def insert(format: NewRelic::FORMAT_NON_RACK,
|
43
|
+
carrier: nil,
|
44
|
+
parent_id: nil,
|
45
|
+
trace_id: nil,
|
46
|
+
trace_flags: nil,
|
47
|
+
trace_state: nil)
|
48
|
+
|
49
|
+
trace_parent_header = trace_parent_header_for_format(format)
|
50
|
+
carrier[trace_parent_header] = format_trace_parent( \
|
51
|
+
trace_id: trace_id,
|
52
|
+
parent_id: parent_id,
|
53
|
+
trace_flags: trace_flags
|
54
|
+
)
|
55
|
+
|
56
|
+
trace_state_header = trace_state_header_for_format(format)
|
57
|
+
carrier[trace_state_header] = trace_state if trace_state && !trace_state.empty?
|
58
|
+
end
|
59
|
+
|
60
|
+
def parse(format: NewRelic::FORMAT_NON_RACK,
|
61
|
+
carrier: nil,
|
62
|
+
trace_state_entry_key: nil)
|
63
|
+
trace_parent = extract_traceparent(format, carrier)
|
64
|
+
unless trace_parent_valid?(trace_parent)
|
65
|
+
NewRelic::Agent.increment_metric(SUPPORTABILITY_TRACE_PARENT_PARSE_EXCEPTION)
|
66
|
+
return nil
|
67
|
+
end
|
68
|
+
|
69
|
+
begin
|
70
|
+
if header_data = extract_tracestate(format, carrier, trace_state_entry_key)
|
71
|
+
header_data.trace_parent = trace_parent
|
72
|
+
header_data
|
73
|
+
end
|
74
|
+
rescue Exception
|
75
|
+
NewRelic::Agent.increment_metric(SUPPORTABILITY_TRACE_STATE_PARSE_EXCEPTION)
|
76
|
+
return nil
|
77
|
+
end
|
78
|
+
end
|
79
|
+
|
80
|
+
def create_trace_state_entry(entry_key, payload)
|
81
|
+
+"#{entry_key}=#{payload}"
|
82
|
+
end
|
83
|
+
|
84
|
+
private
|
85
|
+
|
86
|
+
def format_trace_parent(trace_id: nil,
|
87
|
+
parent_id: nil,
|
88
|
+
trace_flags: nil)
|
89
|
+
sprintf(TRACE_PARENT_FORMAT_STRING,
|
90
|
+
VERSION,
|
91
|
+
trace_id,
|
92
|
+
parent_id,
|
93
|
+
trace_flags)
|
94
|
+
end
|
95
|
+
|
96
|
+
def extract_traceparent(format, carrier)
|
97
|
+
header_name = trace_parent_header_for_format(format)
|
98
|
+
return unless header = carrier[header_name]
|
99
|
+
|
100
|
+
if matchdata = header.match(TRACE_PARENT_REGEX)
|
101
|
+
TRACE_PARENT_REGEX.named_captures.inject({}) do |hash, (name, (index))|
|
102
|
+
hash[name] = matchdata[index]
|
103
|
+
hash
|
104
|
+
end
|
105
|
+
end
|
106
|
+
end
|
107
|
+
|
108
|
+
def trace_parent_valid?(trace_parent)
|
109
|
+
return false if trace_parent.nil?
|
110
|
+
return false if trace_parent[TRACE_ID_KEY] == INVALID_TRACE_ID
|
111
|
+
return false if trace_parent[PARENT_ID_KEY] == INVALID_PARENT_ID
|
112
|
+
return false if trace_parent[VERSION_KEY] == INVALID_VERSION
|
113
|
+
return false if trace_parent[VERSION_KEY].to_i(16) == VERSION && !trace_parent[UNDEFINED_FIELDS_KEY].nil?
|
114
|
+
|
115
|
+
true
|
116
|
+
end
|
117
|
+
|
118
|
+
def trace_parent_header_for_format(format)
|
119
|
+
if format == NewRelic::FORMAT_RACK
|
120
|
+
NewRelic::HTTP_TRACEPARENT_KEY
|
121
|
+
else
|
122
|
+
NewRelic::TRACEPARENT_KEY
|
123
|
+
end
|
124
|
+
end
|
125
|
+
|
126
|
+
def trace_state_header_for_format(format)
|
127
|
+
if format == NewRelic::FORMAT_RACK
|
128
|
+
NewRelic::HTTP_TRACESTATE_KEY
|
129
|
+
else
|
130
|
+
NewRelic::TRACESTATE_KEY
|
131
|
+
end
|
132
|
+
end
|
133
|
+
|
134
|
+
def extract_tracestate(format, carrier, trace_state_entry_key)
|
135
|
+
header_name = trace_state_header_for_format(format)
|
136
|
+
header = carrier[header_name]
|
137
|
+
return HeaderData.create if header.nil? || header.empty?
|
138
|
+
|
139
|
+
payload = nil
|
140
|
+
trace_state_size = 0
|
141
|
+
trace_state_vendors = +''
|
142
|
+
trace_state = header.split(COMMA).map(&:strip)
|
143
|
+
trace_state.reject! do |entry|
|
144
|
+
if entry == NewRelic::EMPTY_STR
|
145
|
+
false
|
146
|
+
else
|
147
|
+
vendor_id = entry.slice(0, entry.index(EQUALS))
|
148
|
+
if vendor_id == trace_state_entry_key
|
149
|
+
payload = entry.slice!(trace_state_entry_key.size + 1, entry.size)
|
150
|
+
true
|
151
|
+
else
|
152
|
+
trace_state_size += entry.size
|
153
|
+
trace_state_vendors << vendor_id << COMMA
|
154
|
+
false
|
155
|
+
end
|
156
|
+
end
|
157
|
+
end
|
158
|
+
|
159
|
+
trace_state_vendors.chomp!(COMMA)
|
160
|
+
|
161
|
+
HeaderData.create(trace_state_payload: payload ? decode_payload(payload) : nil,
|
162
|
+
trace_state_entries: trace_state,
|
163
|
+
trace_state_size: trace_state_size,
|
164
|
+
trace_state_vendors: trace_state_vendors)
|
165
|
+
end
|
166
|
+
|
167
|
+
def decode_payload(payload)
|
168
|
+
TraceContextPayload.from_s(payload)
|
169
|
+
rescue
|
170
|
+
if payload
|
171
|
+
NewRelic::Agent.increment_metric(SUPPORTABILITY_TRACE_STATE_INVALID_NR_ENTRY)
|
172
|
+
end
|
173
|
+
return nil
|
174
|
+
end
|
175
|
+
end
|
176
|
+
|
177
|
+
class HeaderData
|
178
|
+
class << self
|
179
|
+
def create(trace_parent: nil,
|
180
|
+
trace_state_payload: nil,
|
181
|
+
trace_state_entries: nil,
|
182
|
+
trace_state_size: 0,
|
183
|
+
trace_state_vendors: nil)
|
184
|
+
new(trace_parent, \
|
185
|
+
trace_state_payload, \
|
186
|
+
trace_state_entries, \
|
187
|
+
trace_state_size, \
|
188
|
+
trace_state_vendors)
|
189
|
+
end
|
190
|
+
end
|
191
|
+
|
192
|
+
def initialize(trace_parent, trace_state_payload, trace_state_entries, trace_state_size, trace_state_vendors)
|
193
|
+
@trace_parent = trace_parent
|
194
|
+
@trace_state = nil
|
195
|
+
@trace_state_entries = trace_state_entries
|
196
|
+
@trace_state_payload = trace_state_payload
|
197
|
+
@trace_state_size = trace_state_size
|
198
|
+
@trace_state_vendors = trace_state_vendors
|
199
|
+
end
|
200
|
+
|
201
|
+
attr_accessor :trace_parent, :trace_state_payload, :trace_state_vendors
|
202
|
+
|
203
|
+
def trace_state(trace_state_entry)
|
204
|
+
@trace_state ||= join_trace_state(trace_state_entry.size)
|
205
|
+
@trace_state_entries = nil
|
206
|
+
|
207
|
+
trace_state_entry = "#{trace_state_entry}#{@trace_state}"
|
208
|
+
end
|
209
|
+
|
210
|
+
def trace_id
|
211
|
+
@trace_parent[TRACE_ID_KEY]
|
212
|
+
end
|
213
|
+
|
214
|
+
def parent_id
|
215
|
+
@trace_parent[PARENT_ID_KEY]
|
216
|
+
end
|
217
|
+
|
218
|
+
private
|
219
|
+
|
220
|
+
def join_trace_state(trace_state_entry_size)
|
221
|
+
return @trace_state || NewRelic::EMPTY_STR if @trace_state_entries.nil? || @trace_state_entries.empty?
|
222
|
+
|
223
|
+
max_size = MAX_TRACE_STATE_SIZE - trace_state_entry_size
|
224
|
+
return @trace_state_entries.join(COMMA).prepend(COMMA) if @trace_state_size < max_size
|
225
|
+
|
226
|
+
joined_trace_state = +''
|
227
|
+
|
228
|
+
used_size = 0
|
229
|
+
|
230
|
+
@trace_state_entries.each do |entry|
|
231
|
+
entry_size = entry.size + 1
|
232
|
+
break if used_size + entry_size > max_size
|
233
|
+
next if entry_size > MAX_TRACE_STATE_ENTRY_SIZE
|
234
|
+
|
235
|
+
joined_trace_state << COMMA << entry
|
236
|
+
used_size += entry_size
|
237
|
+
end
|
238
|
+
|
239
|
+
joined_trace_state
|
240
|
+
end
|
241
|
+
end
|
242
|
+
end
|
243
|
+
end
|
244
|
+
end
|
245
|
+
end
|
@@ -0,0 +1,127 @@
|
|
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 'new_relic/coerce'
|
6
|
+
|
7
|
+
module NewRelic
|
8
|
+
module Agent
|
9
|
+
class TraceContextPayload
|
10
|
+
VERSION = 0
|
11
|
+
PARENT_TYPE = 0
|
12
|
+
DELIMITER = '-'.freeze
|
13
|
+
SUPPORTABILITY_PARSE_EXCEPTION = 'Supportability/TraceContext/Parse/Exception'.freeze
|
14
|
+
|
15
|
+
TRUE_CHAR = '1'.freeze
|
16
|
+
FALSE_CHAR = '0'.freeze
|
17
|
+
|
18
|
+
PARENT_TYPES = %w[App Browser Mobile].map(&:freeze).freeze
|
19
|
+
|
20
|
+
class << self
|
21
|
+
def create(version: VERSION,
|
22
|
+
parent_type: PARENT_TYPE,
|
23
|
+
parent_account_id: nil,
|
24
|
+
parent_app_id: nil,
|
25
|
+
id: nil,
|
26
|
+
transaction_id: nil,
|
27
|
+
sampled: nil,
|
28
|
+
priority: nil,
|
29
|
+
timestamp: now_ms)
|
30
|
+
|
31
|
+
new(version, parent_type, parent_account_id, parent_app_id, id,
|
32
|
+
transaction_id, sampled, priority, timestamp)
|
33
|
+
end
|
34
|
+
|
35
|
+
include NewRelic::Coerce
|
36
|
+
|
37
|
+
def from_s(payload_string)
|
38
|
+
attrs = payload_string.split(DELIMITER)
|
39
|
+
|
40
|
+
payload = create( \
|
41
|
+
version: int!(attrs[0]),
|
42
|
+
parent_type: int!(attrs[1]),
|
43
|
+
parent_account_id: attrs[2],
|
44
|
+
parent_app_id: attrs[3],
|
45
|
+
id: value_or_nil(attrs[4]),
|
46
|
+
transaction_id: value_or_nil(attrs[5]),
|
47
|
+
sampled: value_or_nil(attrs[6]) ? boolean_int!(attrs[6]) == 1 : nil,
|
48
|
+
priority: float!(attrs[7]),
|
49
|
+
timestamp: int!(attrs[8])
|
50
|
+
)
|
51
|
+
handle_invalid_payload(message: 'payload missing attributes') unless payload.valid?
|
52
|
+
payload
|
53
|
+
rescue => e
|
54
|
+
handle_invalid_payload(error: e)
|
55
|
+
raise
|
56
|
+
end
|
57
|
+
|
58
|
+
private
|
59
|
+
|
60
|
+
def now_ms
|
61
|
+
Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond)
|
62
|
+
end
|
63
|
+
|
64
|
+
def handle_invalid_payload(error: nil, message: nil)
|
65
|
+
NewRelic::Agent.increment_metric(SUPPORTABILITY_PARSE_EXCEPTION)
|
66
|
+
if error
|
67
|
+
NewRelic::Agent.logger.warn('Error parsing trace context payload', error)
|
68
|
+
elsif message
|
69
|
+
NewRelic::Agent.logger.warn("Error parsing trace context payload: #{message}")
|
70
|
+
end
|
71
|
+
end
|
72
|
+
end
|
73
|
+
|
74
|
+
attr_accessor :version,
|
75
|
+
:parent_type_id,
|
76
|
+
:parent_account_id,
|
77
|
+
:parent_app_id,
|
78
|
+
:id,
|
79
|
+
:transaction_id,
|
80
|
+
:sampled,
|
81
|
+
:priority,
|
82
|
+
:timestamp
|
83
|
+
|
84
|
+
alias_method :sampled?, :sampled
|
85
|
+
|
86
|
+
def initialize(version, parent_type_id, parent_account_id, parent_app_id,
|
87
|
+
id, transaction_id, sampled, priority, timestamp)
|
88
|
+
@version = version
|
89
|
+
@parent_type_id = parent_type_id
|
90
|
+
@parent_account_id = parent_account_id
|
91
|
+
@parent_app_id = parent_app_id
|
92
|
+
@id = id
|
93
|
+
@transaction_id = transaction_id
|
94
|
+
@sampled = sampled
|
95
|
+
@priority = priority
|
96
|
+
@timestamp = timestamp
|
97
|
+
end
|
98
|
+
|
99
|
+
def parent_type
|
100
|
+
@parent_type_string ||= PARENT_TYPES[@parent_type_id]
|
101
|
+
end
|
102
|
+
|
103
|
+
def valid?
|
104
|
+
version \
|
105
|
+
&& parent_type_id \
|
106
|
+
&& !parent_account_id.empty? \
|
107
|
+
&& !parent_app_id.empty? \
|
108
|
+
&& timestamp
|
109
|
+
rescue
|
110
|
+
false
|
111
|
+
end
|
112
|
+
|
113
|
+
def to_s
|
114
|
+
result = version.to_s # required
|
115
|
+
result << DELIMITER << parent_type_id.to_s # required
|
116
|
+
result << DELIMITER << parent_account_id # required
|
117
|
+
result << DELIMITER << parent_app_id # required
|
118
|
+
result << DELIMITER << (id || NewRelic::EMPTY_STR)
|
119
|
+
result << DELIMITER << (transaction_id || NewRelic::EMPTY_STR)
|
120
|
+
result << DELIMITER << (sampled ? TRUE_CHAR : FALSE_CHAR)
|
121
|
+
result << DELIMITER << sprintf('%.6f', priority)
|
122
|
+
result << DELIMITER << timestamp.to_s # required
|
123
|
+
result
|
124
|
+
end
|
125
|
+
end
|
126
|
+
end
|
127
|
+
end
|
@@ -1,8 +1,14 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
|
-
|
5
|
+
require_relative 'distributed_tracing/cross_app_payload'
|
6
|
+
require_relative 'distributed_tracing/cross_app_tracing'
|
7
|
+
|
8
|
+
require_relative 'distributed_tracing/distributed_trace_transport_type'
|
9
|
+
require_relative 'distributed_tracing/distributed_trace_payload'
|
10
|
+
|
11
|
+
require_relative 'distributed_tracing/trace_context'
|
6
12
|
|
7
13
|
module NewRelic
|
8
14
|
module Agent
|
@@ -14,54 +20,129 @@ module NewRelic
|
|
14
20
|
#
|
15
21
|
# @api public
|
16
22
|
module DistributedTracing
|
23
|
+
extend NewRelic::SupportabilityHelper
|
17
24
|
extend self
|
18
25
|
|
19
|
-
#
|
20
|
-
#
|
21
|
-
#
|
22
|
-
#
|
23
|
-
#
|
26
|
+
# Adds the Distributed Trace headers so that the downstream service can participate in a
|
27
|
+
# distributed trace. This method should be called every time an outbound call is made
|
28
|
+
# since the header payload contains a timestamp.
|
29
|
+
#
|
30
|
+
# Distributed Tracing must be enabled to use this method.
|
31
|
+
#
|
32
|
+
# +insert_distributed_trace_headers+ always inserts W3C trace context headers and inserts
|
33
|
+
# New Relic distributed tracing header by default. New Relic headers may be suppressed by
|
34
|
+
# setting +exclude_new_relic_header+ to +true+ in your configuration file.
|
24
35
|
#
|
25
|
-
# @
|
26
|
-
#
|
27
|
-
#
|
36
|
+
# @param headers [Hash] Is a Hash to which the distributed trace headers
|
37
|
+
# will be inserted.
|
38
|
+
#
|
39
|
+
# @return {Transaction} The transaction the headers were inserted from,
|
40
|
+
# or +nil+ if headers were not inserted.
|
28
41
|
#
|
29
42
|
# @api public
|
30
|
-
|
31
|
-
|
32
|
-
|
43
|
+
#
|
44
|
+
def insert_distributed_trace_headers(headers = {})
|
45
|
+
record_api_supportability_metric(:insert_distributed_trace_headers)
|
46
|
+
|
47
|
+
unless Agent.config[:'distributed_tracing.enabled']
|
48
|
+
NewRelic::Agent.logger.warn('Not configured to insert distributed trace headers')
|
49
|
+
return nil
|
33
50
|
end
|
51
|
+
|
52
|
+
return unless valid_api_argument_class?(headers, 'headers', Hash)
|
53
|
+
|
54
|
+
return unless transaction = Transaction.tl_current
|
55
|
+
|
56
|
+
transaction.distributed_tracer.insert_headers(headers)
|
57
|
+
transaction
|
34
58
|
rescue => e
|
35
|
-
NewRelic::Agent.logger.error
|
59
|
+
NewRelic::Agent.logger.error('error during insert_distributed_trace_headers', e)
|
36
60
|
nil
|
37
61
|
end
|
38
62
|
|
39
|
-
#
|
40
|
-
#
|
41
|
-
#
|
42
|
-
#
|
43
|
-
#
|
63
|
+
# Accepts distributed tracing headers from any source that has been packaged
|
64
|
+
# as a Ruby Hash, thereby allowing the user to manually inject distributed
|
65
|
+
# tracing headers. It is optimized to process +HTTP_TRACEPARENT+, +HTTP_TRACESTATE+,
|
66
|
+
# and +HTTP_NEWRELIC+ as the given Hash keys. which is the most common scenario
|
67
|
+
# from Rack middleware in most Ruby applications. However, the Hash keys are
|
68
|
+
# case-insensitive and the "HTTP_" prefixes may also be omitted.
|
69
|
+
#
|
70
|
+
# Calling this method is not necessary in a typical HTTP trace as
|
71
|
+
# distributed tracing is already handled by the agent.
|
72
|
+
#
|
73
|
+
# When used, invoke this method as early as possible in a transaction's life-cycle
|
74
|
+
# as calling after the headers are already created will have no effect.
|
75
|
+
#
|
76
|
+
# This method accepts both W3C trace context and New Relic distributed tracing headers.
|
77
|
+
# When both are present, only the W3C headers are utilized. When W3C trace context
|
78
|
+
# headers are present, New Relic headers are ignored regardless if W3C trace context
|
79
|
+
# headers are valid and parsable.
|
80
|
+
#
|
81
|
+
# @param headers [Hash] Incoming distributed trace headers as a Ruby
|
82
|
+
# Hash object. Hash keys are expected to be one of
|
83
|
+
# +TRACEPARENT+, +TRACESTATE+, +NEWRELIC+ and are
|
84
|
+
# case-insensitive, with or without "HTTP_" prefixes.
|
44
85
|
#
|
45
|
-
#
|
46
|
-
#
|
86
|
+
# either as a JSON string or as a
|
87
|
+
# header-friendly string returned from
|
88
|
+
# {DistributedTracePayload#http_safe}
|
47
89
|
#
|
48
|
-
# @param
|
49
|
-
#
|
50
|
-
#
|
51
|
-
# {DistributedTracePayload#http_safe}
|
90
|
+
# @param transport_Type [String] May be one of: +HTTP+, +HTTPS+, +Kafka+, +JMS+,
|
91
|
+
# +IronMQ+, +AMQP+, +Queue+, +Other+. Values are
|
92
|
+
# case sensitive. All other values result in +Unknown+
|
52
93
|
#
|
53
|
-
# @return nil
|
94
|
+
# @return {Transaction} if successful, +nil+ otherwise
|
54
95
|
#
|
55
96
|
# @api public
|
56
|
-
|
57
|
-
|
58
|
-
|
97
|
+
#
|
98
|
+
def accept_distributed_trace_headers(headers, transport_type = NewRelic::HTTP)
|
99
|
+
record_api_supportability_metric(:accept_distributed_trace_headers)
|
100
|
+
|
101
|
+
unless Agent.config[:'distributed_tracing.enabled']
|
102
|
+
NewRelic::Agent.logger.warn('Not configured to accept distributed trace headers')
|
103
|
+
return nil
|
59
104
|
end
|
60
|
-
|
105
|
+
|
106
|
+
return unless valid_api_argument_class?(headers, 'headers', Hash)
|
107
|
+
return unless valid_api_argument_class?(transport_type, 'transport_type', String)
|
108
|
+
|
109
|
+
return unless transaction = Transaction.tl_current
|
110
|
+
|
111
|
+
# assume we have Rack conforming keys when transport_type is HTTP(S)
|
112
|
+
# otherwise, fish for key/value pairs regardless of prefix and case-sensitivity.
|
113
|
+
hdr = if transport_type.start_with?(NewRelic::HTTP)
|
114
|
+
headers
|
115
|
+
else
|
116
|
+
# start with the most common case first
|
117
|
+
hdr = {
|
118
|
+
NewRelic::HTTP_TRACEPARENT_KEY => headers[NewRelic::TRACEPARENT_KEY],
|
119
|
+
NewRelic::HTTP_TRACESTATE_KEY => headers[NewRelic::TRACESTATE_KEY],
|
120
|
+
NewRelic::HTTP_NEWRELIC_KEY => headers[NewRelic::NEWRELIC_KEY]
|
121
|
+
}
|
122
|
+
|
123
|
+
# when not found, search for any casing for trace context headers, ignoring potential prefixes
|
124
|
+
hdr[NewRelic::HTTP_TRACEPARENT_KEY] ||= variant_key_value(headers, NewRelic::TRACEPARENT_KEY)
|
125
|
+
hdr[NewRelic::HTTP_TRACESTATE_KEY] ||= variant_key_value(headers, NewRelic::TRACESTATE_KEY)
|
126
|
+
hdr[NewRelic::HTTP_NEWRELIC_KEY] ||= variant_key_value(headers, NewRelic::CANDIDATE_NEWRELIC_KEYS)
|
127
|
+
hdr
|
128
|
+
end
|
129
|
+
|
130
|
+
transaction.distributed_tracer.accept_incoming_request(hdr, transport_type)
|
131
|
+
transaction
|
61
132
|
rescue => e
|
62
|
-
NewRelic::Agent.logger.error
|
133
|
+
NewRelic::Agent.logger.error('error during accept_distributed_trace_headers', e)
|
63
134
|
nil
|
64
135
|
end
|
136
|
+
|
137
|
+
private
|
138
|
+
|
139
|
+
def has_variant_key?(key, variants)
|
140
|
+
key.to_s.downcase.end_with?(*Array(variants))
|
141
|
+
end
|
142
|
+
|
143
|
+
def variant_key_value(headers, variants)
|
144
|
+
(headers.detect { |k, v| has_variant_key?(k, variants) } || NewRelic::EMPTY_ARRAY)[1]
|
145
|
+
end
|
65
146
|
end
|
66
147
|
end
|
67
148
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
# This module was extracted from NewRelic::JSONWrapper
|
6
6
|
|
@@ -19,12 +19,14 @@ module NewRelic
|
|
19
19
|
normalize_string(object.to_s)
|
20
20
|
when Array
|
21
21
|
return object if object.empty?
|
22
|
+
|
22
23
|
object.map { |x| normalize_object(x) }
|
23
24
|
when Hash
|
24
25
|
return object if object.empty?
|
26
|
+
|
25
27
|
hash = {}
|
26
28
|
object.each_pair do |k, v|
|
27
|
-
k = normalize_string(k)
|
29
|
+
k = normalize_string(k) if k.is_a?(String)
|
28
30
|
k = normalize_string(k.to_s) if k.is_a?(Symbol)
|
29
31
|
hash[k] = normalize_object(v)
|
30
32
|
end
|