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,8 @@
|
|
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
|
+
require 'fiber'
|
5
6
|
require 'new_relic/agent/transaction'
|
6
7
|
require 'new_relic/agent/transaction/segment'
|
7
8
|
require 'new_relic/agent/transaction/datastore_segment'
|
@@ -39,6 +40,38 @@ module NewRelic
|
|
39
40
|
state.current_transaction
|
40
41
|
end
|
41
42
|
|
43
|
+
# Returns the trace_id of the current_transaction, or +nil+ if
|
44
|
+
# none exists.
|
45
|
+
#
|
46
|
+
# @api public
|
47
|
+
def current_trace_id
|
48
|
+
if txn = current_transaction
|
49
|
+
txn.trace_id
|
50
|
+
end
|
51
|
+
end
|
52
|
+
alias_method :trace_id, :current_trace_id
|
53
|
+
|
54
|
+
# Returns the id of the current span, or +nil+ if none exists.
|
55
|
+
#
|
56
|
+
# @api public
|
57
|
+
def current_span_id
|
58
|
+
if span = current_segment
|
59
|
+
span.guid
|
60
|
+
end
|
61
|
+
end
|
62
|
+
alias_method :span_id, :current_span_id
|
63
|
+
|
64
|
+
# Returns a boolean indicating whether the current_transaction
|
65
|
+
# is sampled, or +nil+ if there is no current transaction.
|
66
|
+
#
|
67
|
+
# @api public
|
68
|
+
def transaction_sampled?
|
69
|
+
if txn = current_transaction
|
70
|
+
txn.sampled?
|
71
|
+
end
|
72
|
+
end
|
73
|
+
alias_method :sampled?, :transaction_sampled?
|
74
|
+
|
42
75
|
# Runs the given block of code in a transaction.
|
43
76
|
#
|
44
77
|
# @param [String] name reserved for New Relic internal use
|
@@ -54,9 +87,9 @@ module NewRelic
|
|
54
87
|
#
|
55
88
|
# @api public
|
56
89
|
def in_transaction(name: nil,
|
57
|
-
|
58
|
-
|
59
|
-
|
90
|
+
partial_name: nil,
|
91
|
+
category:,
|
92
|
+
options: {})
|
60
93
|
|
61
94
|
finishable = start_transaction_or_segment(
|
62
95
|
name: name,
|
@@ -70,11 +103,11 @@ module NewRelic
|
|
70
103
|
# only wrap the yield to be absolutely sure we don't report agent
|
71
104
|
# problems as app errors
|
72
105
|
yield
|
73
|
-
rescue =>
|
74
|
-
current_transaction.notice_error(
|
75
|
-
raise
|
106
|
+
rescue => exception
|
107
|
+
current_transaction.notice_error(exception)
|
108
|
+
raise
|
76
109
|
ensure
|
77
|
-
finishable
|
110
|
+
finishable&.finish
|
78
111
|
end
|
79
112
|
end
|
80
113
|
|
@@ -88,7 +121,7 @@ module NewRelic
|
|
88
121
|
# New-Relic-specific prefix
|
89
122
|
#
|
90
123
|
# @param [Symbol] category +:web+ for web transactions or
|
91
|
-
# +:
|
124
|
+
# +:task+ for background transactions
|
92
125
|
#
|
93
126
|
# @param [Hash] options reserved for New Relic internal use
|
94
127
|
#
|
@@ -98,15 +131,11 @@ module NewRelic
|
|
98
131
|
#
|
99
132
|
# @api public
|
100
133
|
def start_transaction_or_segment(name: nil,
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
end
|
107
|
-
if category.nil?
|
108
|
-
raise ArgumentError, 'missing required argument: category'
|
109
|
-
end
|
134
|
+
partial_name: nil,
|
135
|
+
category:,
|
136
|
+
options: {})
|
137
|
+
|
138
|
+
raise ArgumentError, 'missing required argument: name or partial_name' if name.nil? && partial_name.nil?
|
110
139
|
|
111
140
|
if name
|
112
141
|
options[:transaction_name] = name
|
@@ -122,25 +151,20 @@ module NewRelic
|
|
122
151
|
else
|
123
152
|
Transaction.start_new_transaction(state, category, options)
|
124
153
|
end
|
125
|
-
|
126
154
|
rescue ArgumentError
|
127
155
|
raise
|
128
|
-
rescue =>
|
129
|
-
log_error('start_transaction_or_segment',
|
156
|
+
rescue => exception
|
157
|
+
log_error('start_transaction_or_segment', exception)
|
130
158
|
end
|
131
159
|
|
132
160
|
# Takes name or partial_name and a category.
|
133
161
|
# Returns a transaction instance or nil
|
134
|
-
def start_transaction(
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
end
|
141
|
-
if category.nil?
|
142
|
-
raise ArgumentError, 'missing required argument: category'
|
143
|
-
end
|
162
|
+
def start_transaction(category:,
|
163
|
+
name: nil,
|
164
|
+
partial_name: nil,
|
165
|
+
**options)
|
166
|
+
|
167
|
+
raise ArgumentError, 'missing required argument: name or partial_name' if name.nil? && partial_name.nil?
|
144
168
|
|
145
169
|
return current_transaction if current_transaction
|
146
170
|
|
@@ -154,22 +178,24 @@ module NewRelic
|
|
154
178
|
end
|
155
179
|
|
156
180
|
Transaction.start_new_transaction(state,
|
157
|
-
|
158
|
-
|
181
|
+
category,
|
182
|
+
options)
|
159
183
|
rescue ArgumentError
|
160
184
|
raise
|
161
|
-
rescue =>
|
162
|
-
log_error('start_transaction',
|
185
|
+
rescue => exception
|
186
|
+
log_error('start_transaction', exception)
|
163
187
|
end
|
164
188
|
|
165
189
|
def create_distributed_trace_payload
|
166
190
|
return unless txn = current_transaction
|
167
|
-
|
191
|
+
|
192
|
+
txn.distributed_tracer.create_distributed_trace_payload
|
168
193
|
end
|
169
194
|
|
170
195
|
def accept_distributed_trace_payload(payload)
|
171
196
|
return unless txn = current_transaction
|
172
|
-
|
197
|
+
|
198
|
+
txn.distributed_tracer.accept_distributed_trace_payload(payload)
|
173
199
|
end
|
174
200
|
|
175
201
|
# Returns the currently active segment in the transaction in
|
@@ -179,6 +205,7 @@ module NewRelic
|
|
179
205
|
# @api public
|
180
206
|
def current_segment
|
181
207
|
return unless txn = current_transaction
|
208
|
+
|
182
209
|
txn.current_segment
|
183
210
|
end
|
184
211
|
|
@@ -206,25 +233,21 @@ module NewRelic
|
|
206
233
|
# +finish+ on it at the end of the code you're tracing
|
207
234
|
#
|
208
235
|
# @api public
|
209
|
-
def start_segment(name
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
# ruby 2.0.0 does not support required kwargs
|
215
|
-
raise ArgumentError, 'missing required argument: name' if name.nil?
|
216
|
-
|
217
|
-
segment = Transaction::Segment.new name, unscoped_metrics, start_time
|
218
|
-
start_and_add_segment segment, parent
|
236
|
+
def start_segment(name:,
|
237
|
+
unscoped_metrics: nil,
|
238
|
+
start_time: nil,
|
239
|
+
parent: nil)
|
219
240
|
|
241
|
+
segment = Transaction::Segment.new(name, unscoped_metrics, start_time)
|
242
|
+
start_and_add_segment(segment, parent)
|
220
243
|
rescue ArgumentError
|
221
244
|
raise
|
222
|
-
rescue =>
|
223
|
-
log_error('start_segment',
|
245
|
+
rescue => exception
|
246
|
+
log_error('start_segment', exception)
|
224
247
|
end
|
225
248
|
|
226
|
-
UNKNOWN =
|
227
|
-
OTHER =
|
249
|
+
UNKNOWN = 'Unknown'.freeze
|
250
|
+
OTHER = 'other'.freeze
|
228
251
|
|
229
252
|
# Creates and starts a datastore segment used to time
|
230
253
|
# datastore operations.
|
@@ -262,24 +285,23 @@ module NewRelic
|
|
262
285
|
#
|
263
286
|
# @api public
|
264
287
|
def start_datastore_segment(product: nil,
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
|
288
|
+
operation: nil,
|
289
|
+
collection: nil,
|
290
|
+
host: nil,
|
291
|
+
port_path_or_id: nil,
|
292
|
+
database_name: nil,
|
293
|
+
start_time: nil,
|
294
|
+
parent: nil)
|
272
295
|
|
273
296
|
product ||= UNKNOWN
|
274
297
|
operation ||= OTHER
|
275
298
|
|
276
|
-
segment = Transaction::DatastoreSegment.new
|
277
|
-
start_and_add_segment
|
278
|
-
|
299
|
+
segment = Transaction::DatastoreSegment.new(product, operation, collection, host, port_path_or_id, database_name)
|
300
|
+
start_and_add_segment(segment, parent)
|
279
301
|
rescue ArgumentError
|
280
302
|
raise
|
281
|
-
rescue =>
|
282
|
-
log_error('start_datastore_segment',
|
303
|
+
rescue => exception
|
304
|
+
log_error('start_datastore_segment', exception)
|
283
305
|
end
|
284
306
|
|
285
307
|
# Creates and starts an external request segment using the
|
@@ -309,41 +331,46 @@ module NewRelic
|
|
309
331
|
# you're tracing
|
310
332
|
#
|
311
333
|
# @api public
|
312
|
-
def start_external_request_segment(library
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
|
319
|
-
|
320
|
-
raise ArgumentError, 'missing required argument: uri' if uri.nil?
|
321
|
-
raise ArgumentError, 'missing required argument: procedure' if procedure.nil?
|
322
|
-
|
323
|
-
segment = Transaction::ExternalRequestSegment.new library, uri, procedure, start_time
|
324
|
-
start_and_add_segment segment, parent
|
325
|
-
|
334
|
+
def start_external_request_segment(library:,
|
335
|
+
uri:,
|
336
|
+
procedure:,
|
337
|
+
start_time: nil,
|
338
|
+
parent: nil)
|
339
|
+
|
340
|
+
segment = Transaction::ExternalRequestSegment.new(library, uri, procedure, start_time)
|
341
|
+
start_and_add_segment(segment, parent)
|
326
342
|
rescue ArgumentError
|
327
343
|
raise
|
328
|
-
rescue =>
|
329
|
-
log_error('start_external_request_segment',
|
344
|
+
rescue => exception
|
345
|
+
log_error('start_external_request_segment', exception)
|
346
|
+
end
|
347
|
+
|
348
|
+
# Will potentially capture and notice an error at the
|
349
|
+
# segment that was executing when error occurred.
|
350
|
+
# if passed +segment+ is something that doesn't
|
351
|
+
# respond to +notice_segment_error+ then this method
|
352
|
+
# is effectively just a yield to the given &block
|
353
|
+
def capture_segment_error(segment)
|
354
|
+
return unless block_given?
|
355
|
+
|
356
|
+
yield
|
357
|
+
rescue => exception
|
358
|
+
# needs else branch coverage
|
359
|
+
if segment && segment.is_a?(Transaction::AbstractSegment) # rubocop:disable Style/SafeNavigation
|
360
|
+
segment.notice_error(exception)
|
361
|
+
end
|
362
|
+
raise
|
330
363
|
end
|
331
364
|
|
332
365
|
# For New Relic internal use only.
|
333
|
-
def start_message_broker_segment(action
|
334
|
-
|
335
|
-
|
336
|
-
|
337
|
-
|
338
|
-
|
339
|
-
|
340
|
-
|
341
|
-
|
342
|
-
# ruby 2.0.0 does not support required kwargs
|
343
|
-
raise ArgumentError, 'missing required argument: action' if action.nil?
|
344
|
-
raise ArgumentError, 'missing required argument: library' if library.nil?
|
345
|
-
raise ArgumentError, 'missing required argument: destination_type' if destination_type.nil?
|
346
|
-
raise ArgumentError, 'missing required argument: destination_name' if destination_name.nil?
|
366
|
+
def start_message_broker_segment(action:,
|
367
|
+
library:,
|
368
|
+
destination_type:,
|
369
|
+
destination_name:,
|
370
|
+
headers: nil,
|
371
|
+
parameters: nil,
|
372
|
+
start_time: nil,
|
373
|
+
parent: nil)
|
347
374
|
|
348
375
|
segment = Transaction::MessageBrokerSegment.new(
|
349
376
|
action: action,
|
@@ -354,12 +381,11 @@ module NewRelic
|
|
354
381
|
parameters: parameters,
|
355
382
|
start_time: start_time
|
356
383
|
)
|
357
|
-
start_and_add_segment
|
358
|
-
|
384
|
+
start_and_add_segment(segment, parent)
|
359
385
|
rescue ArgumentError
|
360
386
|
raise
|
361
|
-
rescue =>
|
362
|
-
log_error('start_datastore_segment',
|
387
|
+
rescue => exception
|
388
|
+
log_error('start_datastore_segment', exception)
|
363
389
|
end
|
364
390
|
|
365
391
|
# This method should only be used by Tracer for access to the
|
@@ -385,13 +411,41 @@ module NewRelic
|
|
385
411
|
|
386
412
|
alias_method :tl_clear, :clear_state
|
387
413
|
|
414
|
+
def current_segment_key
|
415
|
+
::Fiber.current.object_id
|
416
|
+
end
|
417
|
+
|
418
|
+
def thread_tracing_enabled?
|
419
|
+
NewRelic::Agent.config[:'instrumentation.thread.tracing']
|
420
|
+
end
|
421
|
+
|
422
|
+
def thread_block_with_current_transaction(*args, segment_name:, parent: nil, &block)
|
423
|
+
parent ||= current_segment
|
424
|
+
current_txn = ::Thread.current[:newrelic_tracer_state]&.current_transaction if ::Thread.current[:newrelic_tracer_state]&.is_execution_traced?
|
425
|
+
proc do
|
426
|
+
begin
|
427
|
+
if current_txn
|
428
|
+
NewRelic::Agent::Tracer.state.current_transaction = current_txn
|
429
|
+
current_txn.async = true
|
430
|
+
segment_name += "/Thread#{::Thread.current.object_id}/Fiber#{::Fiber.current.object_id}" if NewRelic::Agent.config[:'thread_ids_enabled']
|
431
|
+
segment = NewRelic::Agent::Tracer.start_segment(name: segment_name, parent: parent)
|
432
|
+
end
|
433
|
+
NewRelic::Agent::Tracer.capture_segment_error(segment) do
|
434
|
+
yield(*args)
|
435
|
+
end
|
436
|
+
ensure
|
437
|
+
::NewRelic::Agent::Transaction::Segment.finish(segment)
|
438
|
+
end
|
439
|
+
end
|
440
|
+
end
|
441
|
+
|
388
442
|
private
|
389
443
|
|
390
|
-
def start_and_add_segment
|
444
|
+
def start_and_add_segment(segment, parent = nil)
|
391
445
|
tracer_state = state
|
392
446
|
if (txn = tracer_state.current_transaction) &&
|
393
|
-
|
394
|
-
txn.add_segment
|
447
|
+
tracer_state.tracing_enabled?
|
448
|
+
txn.add_segment(segment, parent)
|
395
449
|
else
|
396
450
|
segment.record_metrics = false
|
397
451
|
end
|
@@ -408,7 +462,6 @@ module NewRelic
|
|
408
462
|
# This is THE location to store thread local information during a transaction
|
409
463
|
# Need a new piece of data? Add a method here, NOT a new thread local variable.
|
410
464
|
class State
|
411
|
-
|
412
465
|
def initialize
|
413
466
|
@untraced = []
|
414
467
|
@current_transaction = nil
|
@@ -416,7 +469,7 @@ module NewRelic
|
|
416
469
|
end
|
417
470
|
|
418
471
|
# This starts the timer for the transaction.
|
419
|
-
def reset(transaction=nil)
|
472
|
+
def reset(transaction = nil)
|
420
473
|
# We purposefully don't reset @untraced or @record_sql
|
421
474
|
# since those are managed by NewRelic::Agent.disable_* calls explicitly
|
422
475
|
# and (more importantly) outside the scope of a transaction
|
@@ -426,7 +479,7 @@ module NewRelic
|
|
426
479
|
end
|
427
480
|
|
428
481
|
# Current transaction stack
|
429
|
-
|
482
|
+
attr_accessor :current_transaction
|
430
483
|
|
431
484
|
# Execution tracing on current thread
|
432
485
|
attr_accessor :untraced
|
@@ -436,7 +489,8 @@ module NewRelic
|
|
436
489
|
end
|
437
490
|
|
438
491
|
def pop_traced
|
439
|
-
|
492
|
+
# needs else branch coverage
|
493
|
+
@untraced.pop if @untraced # rubocop:disable Style/SafeNavigation
|
440
494
|
end
|
441
495
|
|
442
496
|
def is_execution_traced?
|
@@ -456,7 +510,5 @@ module NewRelic
|
|
456
510
|
attr_accessor :sql_sampler_transaction_data
|
457
511
|
end
|
458
512
|
end
|
459
|
-
|
460
|
-
TransactionState = Tracer
|
461
513
|
end
|
462
514
|
end
|