newrelic_rpm 8.15.0 → 9.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.build_ignore +26 -0
- data/CHANGELOG.md +538 -44
- data/CONTRIBUTING.md +1 -1
- data/Gemfile +1 -1
- data/README.md +11 -6
- data/Rakefile +9 -9
- data/Thorfile +1 -1
- data/bin/newrelic +1 -0
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +36 -36
- data/init.rb +1 -1
- data/lib/new_relic/agent/agent.rb +3 -16
- data/lib/new_relic/agent/agent_helpers/connect.rb +5 -10
- data/lib/new_relic/agent/agent_helpers/harvest.rb +4 -4
- data/lib/new_relic/agent/agent_helpers/shutdown.rb +5 -5
- data/lib/new_relic/agent/agent_helpers/special_startup.rb +3 -4
- data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +47 -39
- data/lib/new_relic/agent/agent_helpers/startup.rb +13 -13
- data/lib/new_relic/agent/agent_helpers/transmit.rb +6 -6
- data/lib/new_relic/agent/agent_logger.rb +9 -9
- data/lib/new_relic/agent/attribute_filter.rb +2 -4
- data/lib/new_relic/agent/attribute_pre_filtering.rb +109 -0
- data/lib/new_relic/agent/attribute_processing.rb +2 -2
- data/lib/new_relic/agent/audit_logger.rb +5 -5
- data/lib/new_relic/agent/autostart.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +2 -2
- data/lib/new_relic/agent/commands/agent_command_router.rb +5 -4
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +8 -8
- data/lib/new_relic/agent/configuration/default_source.rb +428 -586
- data/lib/new_relic/agent/configuration/environment_source.rb +2 -2
- data/lib/new_relic/agent/configuration/high_security_source.rb +3 -5
- data/lib/new_relic/agent/configuration/manager.rb +16 -2
- data/lib/new_relic/agent/configuration/security_policy_source.rb +10 -26
- data/lib/new_relic/agent/configuration/server_source.rb +24 -24
- data/lib/new_relic/agent/configuration/yaml_source.rb +17 -4
- data/lib/new_relic/agent/connect/request_builder.rb +1 -1
- data/lib/new_relic/agent/connect/response_handler.rb +1 -1
- data/lib/new_relic/agent/custom_event_aggregator.rb +4 -4
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
- data/lib/new_relic/agent/database/obfuscator.rb +2 -2
- data/lib/new_relic/agent/database.rb +4 -18
- data/lib/new_relic/agent/datastores/metric_helper.rb +5 -5
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +11 -11
- data/lib/new_relic/agent/datastores/redis.rb +6 -6
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +8 -10
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +10 -10
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +7 -7
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +6 -6
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +7 -7
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +4 -4
- data/lib/new_relic/agent/distributed_tracing.rb +6 -6
- data/lib/new_relic/agent/error_collector.rb +36 -8
- data/lib/new_relic/agent/error_filter.rb +5 -5
- data/lib/new_relic/agent/error_trace_aggregator.rb +5 -4
- data/lib/new_relic/agent/event_loop.rb +3 -3
- data/lib/new_relic/agent/external.rb +1 -1
- data/lib/new_relic/agent/harvester.rb +1 -3
- data/lib/new_relic/agent/heap.rb +2 -1
- data/lib/new_relic/agent/hostname.rb +1 -1
- data/lib/new_relic/agent/http_clients/abstract.rb +9 -21
- data/lib/new_relic/agent/http_clients/async_http_wrappers.rb +83 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +7 -3
- data/lib/new_relic/agent/http_clients/ethon_wrappers.rb +111 -0
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +7 -5
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -0
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +6 -2
- data/lib/new_relic/agent/http_clients/httpx_wrappers.rb +93 -0
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +5 -1
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +8 -5
- data/lib/new_relic/agent/http_clients/uri_util.rb +2 -2
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +6 -19
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +42 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +3 -2
- 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 +10 -10
- data/lib/new_relic/agent/instrumentation/active_job.rb +16 -3
- data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +3 -3
- data/lib/new_relic/agent/instrumentation/active_record.rb +4 -3
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +38 -36
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +5 -4
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +2 -2
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +3 -2
- data/lib/new_relic/agent/instrumentation/active_storage.rb +4 -0
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +2 -30
- data/lib/new_relic/agent/instrumentation/active_support.rb +21 -6
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/instrumentation.rb +13 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/prepend.rb +37 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +4 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +3 -1
- data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/async_http/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/async_http/instrumentation.rb +37 -0
- data/lib/new_relic/agent/instrumentation/async_http/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/async_http.rb +26 -0
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +12 -3
- data/lib/new_relic/agent/instrumentation/bunny.rb +1 -1
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +3 -4
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +7 -6
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +9 -5
- data/lib/new_relic/agent/instrumentation/curb.rb +1 -1
- data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
- data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +2 -1
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +4 -1
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +2 -1
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +2 -2
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +8 -4
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +2 -2
- data/lib/new_relic/agent/instrumentation/ethon/chain.rb +39 -0
- data/lib/new_relic/agent/instrumentation/ethon/instrumentation.rb +105 -0
- data/lib/new_relic/agent/instrumentation/ethon/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/ethon.rb +39 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +5 -1
- data/lib/new_relic/agent/instrumentation/excon.rb +3 -3
- data/lib/new_relic/agent/instrumentation/fiber/chain.rb +27 -0
- data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +23 -0
- data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +25 -0
- data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +8 -4
- data/lib/new_relic/agent/instrumentation/grape.rb +4 -4
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +7 -2
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +8 -4
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +2 -2
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +2 -2
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +4 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +4 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +1 -1
- data/lib/new_relic/agent/instrumentation/httpx/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/httpx/instrumentation.rb +51 -0
- data/lib/new_relic/agent/instrumentation/httpx/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpx.rb +27 -0
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +3 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +1 -1
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +3 -1
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +14 -5
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +3 -1
- data/lib/new_relic/agent/instrumentation/memcache.rb +12 -12
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +3 -3
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +1 -1
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +6 -8
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +5 -1
- data/lib/new_relic/agent/instrumentation/net_http.rb +2 -2
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +46 -1
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +7 -3
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +2 -2
- data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +7 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +7 -2
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +14 -1
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +12 -15
- data/lib/new_relic/agent/instrumentation/rake.rb +3 -3
- data/lib/new_relic/agent/instrumentation/redis/constants.rb +1 -1
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +6 -1
- data/lib/new_relic/agent/instrumentation/redis.rb +1 -1
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +4 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +1 -1
- data/lib/new_relic/agent/instrumentation/roda/chain.rb +43 -0
- data/lib/new_relic/agent/instrumentation/roda/ignorer.rb +45 -0
- data/lib/new_relic/agent/instrumentation/roda/instrumentation.rb +68 -0
- data/lib/new_relic/agent/instrumentation/roda/prepend.rb +24 -0
- data/lib/new_relic/agent/instrumentation/roda/roda_transaction_namer.rb +29 -0
- data/lib/new_relic/agent/instrumentation/roda.rb +36 -0
- data/lib/new_relic/agent/instrumentation/sequel.rb +8 -9
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +10 -10
- data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +4 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +26 -3
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +6 -3
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +10 -5
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -4
- data/lib/new_relic/agent/instrumentation/stripe.rb +28 -0
- data/lib/new_relic/agent/instrumentation/stripe_subscriber.rb +77 -0
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +3 -8
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +6 -1
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +10 -6
- data/lib/new_relic/agent/javascript_instrumentor.rb +29 -24
- data/lib/new_relic/agent/linking_metadata.rb +2 -2
- data/lib/new_relic/agent/log_event_aggregator.rb +64 -17
- data/lib/new_relic/agent/log_event_attributes.rb +115 -0
- data/lib/new_relic/agent/logging.rb +77 -37
- data/lib/new_relic/agent/messaging.rb +9 -7
- data/lib/new_relic/agent/method_tracer.rb +7 -7
- data/lib/new_relic/agent/method_tracer_helpers.rb +27 -6
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +4 -5
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +1 -1
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +12 -1
- data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +2 -2
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +0 -1
- data/lib/new_relic/agent/new_relic_service.rb +47 -32
- data/lib/new_relic/agent/obfuscator.rb +1 -1
- data/lib/new_relic/agent/parameter_filtering.rb +6 -6
- data/lib/new_relic/agent/pipe_channel_manager.rb +7 -6
- data/lib/new_relic/agent/pipe_service.rb +5 -3
- data/lib/new_relic/agent/priority_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +0 -1
- data/lib/new_relic/agent/rules_engine.rb +1 -1
- data/lib/new_relic/agent/sampler.rb +2 -1
- data/lib/new_relic/agent/sampler_collection.rb +1 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +5 -5
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +9 -9
- data/lib/new_relic/agent/samplers/memory_sampler.rb +9 -9
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +4 -4
- data/lib/new_relic/agent/span_event_primitive.rb +18 -6
- data/lib/new_relic/agent/sql_sampler.rb +2 -2
- data/lib/new_relic/agent/stats.rb +1 -1
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/system_info.rb +36 -10
- data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
- data/lib/new_relic/agent/threading/backtrace_node.rb +3 -3
- data/lib/new_relic/agent/threading/backtrace_service.rb +3 -7
- data/lib/new_relic/agent/threading/thread_profile.rb +5 -5
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +25 -16
- data/lib/new_relic/agent/transaction/abstract_segment.rb +109 -48
- data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +7 -6
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +13 -14
- data/lib/new_relic/agent/transaction/external_request_segment.rb +16 -13
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +2 -3
- data/lib/new_relic/agent/transaction/request_attributes.rb +47 -11
- data/lib/new_relic/agent/transaction/segment.rb +1 -1
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/trace.rb +1 -1
- data/lib/new_relic/agent/transaction/trace_context.rb +4 -4
- data/lib/new_relic/agent/transaction/trace_node.rb +8 -7
- data/lib/new_relic/agent/transaction/tracing.rb +10 -4
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction.rb +90 -58
- data/lib/new_relic/agent/transaction_error_primitive.rb +21 -5
- data/lib/new_relic/agent/transaction_event_aggregator.rb +4 -4
- data/lib/new_relic/agent/transaction_event_primitive.rb +22 -3
- data/lib/new_relic/agent/transaction_sampler.rb +3 -3
- data/lib/new_relic/agent/transaction_time_aggregator.rb +7 -3
- data/lib/new_relic/agent/utilization/aws.rb +1 -1
- data/lib/new_relic/agent/utilization/azure.rb +3 -3
- data/lib/new_relic/agent/utilization/gcp.rb +4 -6
- data/lib/new_relic/agent/utilization/pcf.rb +1 -1
- data/lib/new_relic/agent/utilization/vendor.rb +6 -8
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
- data/lib/new_relic/agent/vm/mri_vm.rb +9 -8
- data/lib/new_relic/agent/worker_loop.rb +1 -1
- data/lib/new_relic/agent.rb +133 -36
- data/lib/new_relic/cli/command.rb +4 -3
- data/lib/new_relic/cli/commands/deployments.rb +26 -25
- data/lib/new_relic/cli/commands/install.rb +23 -23
- data/lib/new_relic/collection_helper.rb +2 -2
- data/lib/new_relic/constants.rb +10 -8
- data/lib/new_relic/control/class_methods.rb +4 -10
- data/lib/new_relic/control/frameworks/rails.rb +44 -20
- data/lib/new_relic/control/frameworks/roda.rb +20 -0
- data/lib/new_relic/control/instance_methods.rb +6 -6
- data/lib/new_relic/control/instrumentation.rb +1 -15
- data/lib/new_relic/control/private_instance_methods.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +20 -18
- data/lib/new_relic/environment_report.rb +4 -4
- data/lib/new_relic/helper.rb +2 -1
- data/lib/new_relic/language_support.rb +10 -1
- data/lib/new_relic/latest_changes.rb +6 -6
- data/lib/new_relic/local_environment.rb +0 -10
- data/lib/new_relic/noticed_error.rb +25 -20
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +0 -16
- data/lib/new_relic/rack/browser_monitoring.rb +21 -17
- data/lib/new_relic/recipes/capistrano3.rb +1 -1
- data/lib/new_relic/recipes/capistrano_legacy.rb +6 -6
- data/lib/new_relic/recipes/helpers/send_deployment.rb +5 -5
- data/lib/new_relic/supportability_helper.rb +4 -1
- data/lib/new_relic/traced_thread.rb +2 -3
- data/lib/new_relic/version.rb +2 -2
- data/lib/newrelic_rpm.rb +4 -4
- data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +6 -6
- data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +4 -4
- data/lib/tasks/bump_version.rake +21 -0
- data/lib/tasks/config.rake +13 -12
- data/lib/tasks/coverage_report.rake +4 -4
- data/lib/tasks/helpers/config.html.erb +93 -0
- data/lib/tasks/helpers/format.rb +19 -15
- data/lib/tasks/helpers/newrelicyml.rb +144 -0
- data/lib/tasks/helpers/version_bump.rb +62 -0
- data/lib/tasks/install.rake +4 -4
- data/lib/tasks/instrumentation_generator/instrumentation.thor +16 -19
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +1 -1
- data/lib/tasks/instrumentation_generator/templates/chain.tt +1 -1
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +1 -1
- data/lib/tasks/newrelic.rb +1 -0
- data/lib/tasks/newrelicyml.rake +13 -0
- data/lib/tasks/tests.rake +77 -6
- data/newrelic.yml +393 -274
- data/newrelic_rpm.gemspec +41 -30
- data/test/agent_helper.rb +25 -24
- metadata +172 -35
- data/.gitignore +0 -42
- data/.project +0 -23
- data/.rubocop.yml +0 -1946
- data/.rubocop_todo.yml +0 -62
- data/.simplecov +0 -15
- data/.snyk +0 -11
- data/.yardopts +0 -27
- data/Brewfile +0 -12
- data/DOCKER.md +0 -167
- data/Dockerfile +0 -10
- data/Guardfile +0 -26
- data/config/database.yml +0 -5
- data/config.dot +0 -278
- data/docker-compose.yml +0 -107
- data/lefthook.yml +0 -9
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -83
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -33
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -215
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -36
- data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -41
- data/lib/new_relic/agent/range_extensions.rb +0 -27
- data/lib/tasks/helpers/removers.rb +0 -33
- data/lib/tasks/multiverse.rake +0 -6
- data/lib/tasks/multiverse.rb +0 -77
@@ -37,7 +37,7 @@ module NewRelic
|
|
37
37
|
NewRelic::Agent.logger.debug("Synthetics transaction event limit (#{metadata[:capacity]}) reached. Further synthetics events this harvest period dropped.")
|
38
38
|
|
39
39
|
engine = NewRelic::Agent.instance.stats_engine
|
40
|
-
engine.tl_record_supportability_metric_count(
|
40
|
+
engine.tl_record_supportability_metric_count('SyntheticsEventAggregator/synthetics_events_dropped', num_dropped)
|
41
41
|
end
|
42
42
|
end
|
43
43
|
end
|
@@ -13,6 +13,8 @@ require 'socket'
|
|
13
13
|
module NewRelic
|
14
14
|
module Agent
|
15
15
|
module SystemInfo
|
16
|
+
DOCKER_CGROUPS_V2_PATTERN = %r{.*/docker/containers/([0-9a-f]{64})/.*}.freeze
|
17
|
+
|
16
18
|
def self.ruby_os_identifier
|
17
19
|
RbConfig::CONFIG['target_os']
|
18
20
|
end
|
@@ -128,7 +130,7 @@ module NewRelic
|
|
128
130
|
|
129
131
|
num_physical_packages = cores.keys.map(&:first).uniq.size
|
130
132
|
num_physical_cores = cores.size
|
131
|
-
num_logical_processors = cores.values.
|
133
|
+
num_logical_processors = cores.values.sum
|
132
134
|
|
133
135
|
if num_physical_cores == 0
|
134
136
|
num_logical_processors = total_processors
|
@@ -172,15 +174,39 @@ module NewRelic
|
|
172
174
|
proc_try_read('/proc/version')
|
173
175
|
end
|
174
176
|
|
177
|
+
# When operating within a Docker container, attempt to obtain the
|
178
|
+
# container id.
|
179
|
+
#
|
180
|
+
# First look for `/proc/self/mountinfo` to exist on disk to signify
|
181
|
+
# cgroups v2. If that file exists, read it and expect it to contain one
|
182
|
+
# or more "/docker/containers/<container_id>/" lines from which the
|
183
|
+
# container id can be gleaned.
|
184
|
+
#
|
185
|
+
# Next look for `/proc/self/cgroup` to exist on disk to signify cgroup v1.
|
186
|
+
# If that file exists, read it and parse the "cpu" group info in the hope
|
187
|
+
# of finding a 64 character container id value.
|
188
|
+
#
|
189
|
+
# For non-cgroups based containers, use a `nil` value for the container
|
190
|
+
# id without generating any warnings or errors.
|
175
191
|
def self.docker_container_id
|
176
192
|
return unless ruby_os_identifier.include?('linux')
|
177
193
|
|
194
|
+
cgroupsv2_based_id = docker_container_id_for_cgroupsv2
|
195
|
+
return cgroupsv2_based_id if cgroupsv2_based_id
|
196
|
+
|
178
197
|
cgroup_info = proc_try_read('/proc/self/cgroup')
|
179
198
|
return unless cgroup_info
|
180
199
|
|
181
200
|
parse_docker_container_id(cgroup_info)
|
182
201
|
end
|
183
202
|
|
203
|
+
def self.docker_container_id_for_cgroupsv2
|
204
|
+
mountinfo = proc_try_read('/proc/self/mountinfo')
|
205
|
+
return unless mountinfo
|
206
|
+
|
207
|
+
Regexp.last_match(1) if mountinfo =~ DOCKER_CGROUPS_V2_PATTERN
|
208
|
+
end
|
209
|
+
|
184
210
|
def self.parse_docker_container_id(cgroup_info)
|
185
211
|
cpu_cgroup = parse_cgroup_ids(cgroup_info)['cpu']
|
186
212
|
return unless cpu_cgroup
|
@@ -202,7 +228,7 @@ module NewRelic
|
|
202
228
|
return
|
203
229
|
when /docker/
|
204
230
|
::NewRelic::Agent.logger.debug("Cgroup indicates docker but container_id unrecognized: '#{cpu_cgroup}'")
|
205
|
-
::NewRelic::Agent.increment_metric(
|
231
|
+
::NewRelic::Agent.increment_metric('Supportability/utilization/docker/error')
|
206
232
|
return
|
207
233
|
else
|
208
234
|
::NewRelic::Agent.logger.debug("Ignoring unrecognized cgroup ID format: '#{cpu_cgroup}'")
|
@@ -211,7 +237,7 @@ module NewRelic
|
|
211
237
|
|
212
238
|
if container_id && container_id.size != 64
|
213
239
|
::NewRelic::Agent.logger.debug("Found docker container_id with invalid length: #{container_id}")
|
214
|
-
::NewRelic::Agent.increment_metric(
|
240
|
+
::NewRelic::Agent.increment_metric('Supportability/utilization/docker/error')
|
215
241
|
nil
|
216
242
|
else
|
217
243
|
container_id
|
@@ -242,7 +268,7 @@ module NewRelic
|
|
242
268
|
def self.proc_try_read(path)
|
243
269
|
return nil unless File.exist?(path)
|
244
270
|
|
245
|
-
content =
|
271
|
+
content = +''
|
246
272
|
File.open(path) do |f|
|
247
273
|
loop do
|
248
274
|
begin
|
@@ -289,8 +315,8 @@ module NewRelic
|
|
289
315
|
|
290
316
|
if bid.ascii_only?
|
291
317
|
if bid.empty?
|
292
|
-
::NewRelic::Agent.logger.debug(
|
293
|
-
::NewRelic::Agent.increment_metric(
|
318
|
+
::NewRelic::Agent.logger.debug('boot_id not found in /proc/sys/kernel/random/boot_id')
|
319
|
+
::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
|
294
320
|
nil
|
295
321
|
|
296
322
|
elsif bid.bytesize == 36
|
@@ -298,19 +324,19 @@ module NewRelic
|
|
298
324
|
|
299
325
|
else
|
300
326
|
::NewRelic::Agent.logger.debug("Found boot_id with invalid length: #{bid}")
|
301
|
-
::NewRelic::Agent.increment_metric(
|
327
|
+
::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
|
302
328
|
bid[0, 128]
|
303
329
|
|
304
330
|
end
|
305
331
|
else
|
306
332
|
::NewRelic::Agent.logger.debug("Found boot_id with non-ASCII characters: #{bid}")
|
307
|
-
::NewRelic::Agent.increment_metric(
|
333
|
+
::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
|
308
334
|
nil
|
309
335
|
|
310
336
|
end
|
311
337
|
else
|
312
|
-
::NewRelic::Agent.logger.debug(
|
313
|
-
::NewRelic::Agent.increment_metric(
|
338
|
+
::NewRelic::Agent.logger.debug('boot_id not found in /proc/sys/kernel/random/boot_id')
|
339
|
+
::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
|
314
340
|
nil
|
315
341
|
|
316
342
|
end
|
@@ -70,7 +70,7 @@ module NewRelic
|
|
70
70
|
end
|
71
71
|
|
72
72
|
def dump_string
|
73
|
-
result =
|
73
|
+
result = +"#<BacktraceRoot:#{object_id}>"
|
74
74
|
child_results = @children.map { |c| c.dump_string(2) }.join("\n")
|
75
75
|
result << "\n" unless child_results.empty?
|
76
76
|
result << child_results
|
@@ -116,8 +116,8 @@ module NewRelic
|
|
116
116
|
def dump_string(indent = 0)
|
117
117
|
@file, @method, @line_no = parse_backtrace_frame(@raw_line)
|
118
118
|
indentation = ' ' * indent
|
119
|
-
result =
|
120
|
-
[#{@runnable_count}] #{@file}:#{@line_no} in #{@method}>"
|
119
|
+
result = +"#{indentation}#<BacktraceNode:#{object_id} ) + \
|
120
|
+
[#{@runnable_count}] #{@file}:#{@line_no} in #{@method}>"
|
121
121
|
child_results = @children.map { |c| c.dump_string(indent + 2) }.join("\n")
|
122
122
|
result << "\n" unless child_results.empty?
|
123
123
|
result << child_results
|
@@ -6,7 +6,7 @@ module NewRelic
|
|
6
6
|
module Agent
|
7
7
|
module Threading
|
8
8
|
class BacktraceService
|
9
|
-
ALL_TRANSACTIONS =
|
9
|
+
ALL_TRANSACTIONS = '**ALL**'.freeze
|
10
10
|
|
11
11
|
def self.is_supported?
|
12
12
|
!is_resque?
|
@@ -41,9 +41,7 @@ module NewRelic
|
|
41
41
|
@overhead_percent_threshold = new_value
|
42
42
|
end
|
43
43
|
|
44
|
-
|
45
|
-
event_listener.subscribe(:transaction_finished, &method(:on_transaction_finished))
|
46
|
-
end
|
44
|
+
event_listener&.subscribe(:transaction_finished, &method(:on_transaction_finished))
|
47
45
|
end
|
48
46
|
|
49
47
|
# Public interface
|
@@ -221,9 +219,7 @@ module NewRelic
|
|
221
219
|
|
222
220
|
# This method is expected to be called with @lock held.
|
223
221
|
def aggregate_global_backtrace(backtrace, bucket, thread)
|
224
|
-
|
225
|
-
@profiles[ALL_TRANSACTIONS].aggregate(backtrace, bucket, thread)
|
226
|
-
end
|
222
|
+
@profiles[ALL_TRANSACTIONS]&.aggregate(backtrace, bucket, thread)
|
227
223
|
end
|
228
224
|
|
229
225
|
# This method is expected to be called with @lock held.
|
@@ -72,7 +72,7 @@ module NewRelic
|
|
72
72
|
all_nodes = @traces.values.map { |n| n.flattened }.flatten
|
73
73
|
|
74
74
|
NewRelic::Agent.instance.stats_engine
|
75
|
-
.tl_record_supportability_metric_count(
|
75
|
+
.tl_record_supportability_metric_count('ThreadProfiler/NodeCount', all_nodes.size)
|
76
76
|
|
77
77
|
all_nodes.sort! do |a, b|
|
78
78
|
# we primarily prefer higher runnable_count
|
@@ -103,10 +103,10 @@ module NewRelic
|
|
103
103
|
convert_N_trace_nodes_to_arrays(THREAD_PROFILER_NODES)
|
104
104
|
|
105
105
|
{
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
106
|
+
'OTHER' => @traces[:other].as_array,
|
107
|
+
'REQUEST' => @traces[:request].as_array,
|
108
|
+
'AGENT' => @traces[:agent].as_array,
|
109
|
+
'BACKGROUND' => @traces[:background].as_array
|
110
110
|
}
|
111
111
|
end
|
112
112
|
|
@@ -66,9 +66,10 @@ module NewRelic
|
|
66
66
|
#
|
67
67
|
# @api public
|
68
68
|
def transaction_sampled?
|
69
|
-
|
70
|
-
|
71
|
-
|
69
|
+
txn = current_transaction
|
70
|
+
return false unless txn
|
71
|
+
|
72
|
+
txn.sampled?
|
72
73
|
end
|
73
74
|
alias_method :sampled?, :transaction_sampled?
|
74
75
|
|
@@ -107,7 +108,7 @@ module NewRelic
|
|
107
108
|
current_transaction.notice_error(exception)
|
108
109
|
raise
|
109
110
|
ensure
|
110
|
-
finishable
|
111
|
+
finishable&.finish
|
111
112
|
end
|
112
113
|
end
|
113
114
|
|
@@ -246,8 +247,8 @@ module NewRelic
|
|
246
247
|
log_error('start_segment', exception)
|
247
248
|
end
|
248
249
|
|
249
|
-
UNKNOWN =
|
250
|
-
OTHER =
|
250
|
+
UNKNOWN = 'Unknown'.freeze
|
251
|
+
OTHER = 'other'.freeze
|
251
252
|
|
252
253
|
# Creates and starts a datastore segment used to time
|
253
254
|
# datastore operations.
|
@@ -355,9 +356,8 @@ module NewRelic
|
|
355
356
|
|
356
357
|
yield
|
357
358
|
rescue => exception
|
358
|
-
|
359
|
-
|
360
|
-
end
|
359
|
+
# needs else branch coverage
|
360
|
+
segment.notice_error(exception) if segment&.is_a?(Transaction::AbstractSegment)
|
361
361
|
raise
|
362
362
|
end
|
363
363
|
|
@@ -410,12 +410,22 @@ module NewRelic
|
|
410
410
|
|
411
411
|
alias_method :tl_clear, :clear_state
|
412
412
|
|
413
|
-
def
|
414
|
-
|
415
|
-
|
413
|
+
def current_segment_key
|
414
|
+
::Fiber.current.object_id
|
415
|
+
end
|
416
|
+
|
417
|
+
def thread_tracing_enabled?
|
418
|
+
NewRelic::Agent.config[:'instrumentation.thread.tracing']
|
419
|
+
end
|
420
|
+
|
421
|
+
def thread_block_with_current_transaction(segment_name:, parent: nil, &block)
|
422
|
+
parent ||= current_segment
|
423
|
+
current_txn = ::Thread.current[:newrelic_tracer_state]&.current_transaction if ::Thread.current[:newrelic_tracer_state]&.is_execution_traced?
|
424
|
+
proc do |*args|
|
416
425
|
begin
|
417
|
-
if current_txn
|
426
|
+
if current_txn && !current_txn.finished?
|
418
427
|
NewRelic::Agent::Tracer.state.current_transaction = current_txn
|
428
|
+
current_txn.async = true
|
419
429
|
segment_name += "/Thread#{::Thread.current.object_id}/Fiber#{::Fiber.current.object_id}" if NewRelic::Agent.config[:'thread_ids_enabled']
|
420
430
|
segment = NewRelic::Agent::Tracer.start_segment(name: segment_name, parent: parent)
|
421
431
|
end
|
@@ -478,7 +488,8 @@ module NewRelic
|
|
478
488
|
end
|
479
489
|
|
480
490
|
def pop_traced
|
481
|
-
|
491
|
+
# needs else branch coverage
|
492
|
+
@untraced.pop if @untraced # rubocop:disable Style/SafeNavigation
|
482
493
|
end
|
483
494
|
|
484
495
|
def is_execution_traced?
|
@@ -498,7 +509,5 @@ module NewRelic
|
|
498
509
|
attr_accessor :sql_sampler_transaction_data
|
499
510
|
end
|
500
511
|
end
|
501
|
-
|
502
|
-
TransactionState = Tracer
|
503
512
|
end
|
504
513
|
end
|
@@ -2,7 +2,6 @@
|
|
2
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
3
|
# frozen_string_literal: true
|
4
4
|
|
5
|
-
require 'new_relic/agent/range_extensions'
|
6
5
|
require 'new_relic/agent/guid_generator'
|
7
6
|
|
8
7
|
module NewRelic
|
@@ -20,14 +19,17 @@ module NewRelic
|
|
20
19
|
# after its parent. We will use the optimized exclusive duration
|
21
20
|
# calculation in all other cases.
|
22
21
|
#
|
23
|
-
attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid, :
|
22
|
+
attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid, :starting_segment_key
|
24
23
|
attr_accessor :name, :parent, :children_time, :transaction, :transaction_name
|
25
24
|
attr_writer :record_metrics, :record_scoped_metric, :record_on_finish
|
26
25
|
attr_reader :noticed_error
|
27
26
|
|
27
|
+
CALLBACK = :@callback
|
28
|
+
SEGMENT = 'segment'
|
29
|
+
|
28
30
|
def initialize(name = nil, start_time = nil)
|
29
31
|
@name = name
|
30
|
-
@
|
32
|
+
@starting_segment_key = NewRelic::Agent::Tracer.current_segment_key
|
31
33
|
@transaction_name = nil
|
32
34
|
@transaction = nil
|
33
35
|
@guid = NewRelic::Agent::GuidGenerator.generate_guid
|
@@ -50,13 +52,14 @@ module NewRelic
|
|
50
52
|
@code_function = nil
|
51
53
|
@code_lineno = nil
|
52
54
|
@code_namespace = nil
|
55
|
+
invoke_callback
|
53
56
|
end
|
54
57
|
|
55
58
|
def start
|
56
59
|
@start_time ||= Process.clock_gettime(Process::CLOCK_REALTIME)
|
57
60
|
return unless transaction
|
58
61
|
|
59
|
-
parent
|
62
|
+
parent&.child_start(self)
|
60
63
|
end
|
61
64
|
|
62
65
|
def finish
|
@@ -105,38 +108,6 @@ module NewRelic
|
|
105
108
|
@start_time.to_f..@end_time.to_f
|
106
109
|
end
|
107
110
|
|
108
|
-
def timings_overlap?(timing1, timing2)
|
109
|
-
(timing1.first >= timing2.first && timing1.first <= timing2.last) ||
|
110
|
-
(timing2.first >= timing1.first && timing2.first <= timing1.last)
|
111
|
-
end
|
112
|
-
|
113
|
-
def merge_timings(timing1, timing2)
|
114
|
-
[([timing1.first, timing2.first].min),
|
115
|
-
([timing1.last, timing2.last].max)]
|
116
|
-
end
|
117
|
-
|
118
|
-
# @children_timings is an array of array, with each inner array
|
119
|
-
# holding exactly 2 values, a child segment's start time and finish
|
120
|
-
# time (in that order). When it's time to record, these timings are
|
121
|
-
# converted into an array of range objects (using the same start and
|
122
|
-
# end values as the original array). Any two range objects that
|
123
|
-
# intersect and merged into a larger range. This checking for a
|
124
|
-
# intersections and merging of ranges is expensive, so the operation
|
125
|
-
# is only done at recording time.
|
126
|
-
def children_time_ranges
|
127
|
-
@children_time_ranges ||= begin
|
128
|
-
overlapped = @children_timings.each_with_object([]) do |timing, timings|
|
129
|
-
i = timings.index { |t| timings_overlap?(t, timing) }
|
130
|
-
if i
|
131
|
-
timings[i] = merge_timings(timing, timings[i])
|
132
|
-
else
|
133
|
-
timings << timing
|
134
|
-
end
|
135
|
-
end
|
136
|
-
overlapped.map { |t| Range.new(t.first, t.last) }
|
137
|
-
end
|
138
|
-
end
|
139
|
-
|
140
111
|
def children_time_ranges?
|
141
112
|
!@children_timings.empty?
|
142
113
|
end
|
@@ -228,7 +199,7 @@ module NewRelic
|
|
228
199
|
|
229
200
|
if finished?
|
230
201
|
transaction.async = true
|
231
|
-
parent
|
202
|
+
parent&.descendant_complete(self, segment)
|
232
203
|
end
|
233
204
|
end
|
234
205
|
|
@@ -262,19 +233,19 @@ module NewRelic
|
|
262
233
|
|
263
234
|
def force_finish
|
264
235
|
finish
|
265
|
-
NewRelic::Agent.logger.warn
|
266
|
-
"the end of transaction. Timing information for this segment's" \
|
267
|
-
"parent #{parent
|
236
|
+
NewRelic::Agent.logger.send(transaction.async? ? :debug : :warn, "Segment: #{name} was unfinished at " \
|
237
|
+
"the end of transaction. Timing information for this segment's " \
|
238
|
+
"parent #{parent&.name} in #{transaction.best_name} may be inaccurate.")
|
268
239
|
end
|
269
240
|
|
270
241
|
def run_complete_callbacks
|
271
242
|
segment_complete
|
272
|
-
parent
|
243
|
+
parent&.child_complete(self)
|
273
244
|
transaction.segment_complete(self)
|
274
245
|
end
|
275
246
|
|
276
247
|
def record_metrics
|
277
|
-
raise NotImplementedError,
|
248
|
+
raise NotImplementedError, 'Subclasses must implement record_metrics'
|
278
249
|
end
|
279
250
|
|
280
251
|
# callback for subclasses to override
|
@@ -299,12 +270,6 @@ module NewRelic
|
|
299
270
|
end
|
300
271
|
|
301
272
|
def record_exclusive_duration
|
302
|
-
overlapping_duration = if children_time_ranges?
|
303
|
-
RangeExtensions.compute_overlap(time_range, children_time_ranges)
|
304
|
-
else
|
305
|
-
0.0
|
306
|
-
end
|
307
|
-
|
308
273
|
@exclusive_duration = duration - children_time - overlapping_duration
|
309
274
|
transaction.total_time += @exclusive_duration
|
310
275
|
params[:exclusive_duration_millis] = @exclusive_duration * 1000 if transaction.async?
|
@@ -314,6 +279,51 @@ module NewRelic
|
|
314
279
|
transaction.metrics
|
315
280
|
end
|
316
281
|
|
282
|
+
def ranges_intersect?(r1, r2)
|
283
|
+
r1.begin > r2.begin ? r2.cover?(r1.begin) : r1.cover?(r2.begin)
|
284
|
+
end
|
285
|
+
|
286
|
+
def range_overlap(range)
|
287
|
+
return 0.0 unless ranges_intersect?(range, time_range)
|
288
|
+
|
289
|
+
[range.end, time_range.end].min - [range.begin, time_range.begin].max
|
290
|
+
end
|
291
|
+
|
292
|
+
# Child segments operating concurrently with this segment may have
|
293
|
+
# start and end times that overlap with this segment's own times. The
|
294
|
+
# amount of overlap needs to be removed from the `children_time` total
|
295
|
+
# when calculating an `@exclusive_duration` value to be added to the
|
296
|
+
# transaction's total time.
|
297
|
+
#
|
298
|
+
# If there aren't any child segments, return 0.0. Otherwise, take the
|
299
|
+
# `@children_timings` array of arrays (each array holds a child
|
300
|
+
# segment's start time and end time), sort it by the first elements
|
301
|
+
# (start times), and use the start and finish times to create Range
|
302
|
+
# objects. Combine all of the child segment ranges that overlap with
|
303
|
+
# one another into new bigger ranges. Then take those bigger ranges
|
304
|
+
# and calculate how much overlap there is between them and this
|
305
|
+
# segment's own time range. Keep a running sum of all of the overlap
|
306
|
+
# amounts and then return it.
|
307
|
+
def overlapping_duration
|
308
|
+
sum = 0.0
|
309
|
+
return sum unless children_time_ranges?
|
310
|
+
|
311
|
+
@children_timings.sort_by!(&:first)
|
312
|
+
range = Range.new(*@children_timings.first)
|
313
|
+
(1..(@children_timings.size - 1)).each do |i|
|
314
|
+
possible = Range.new(*@children_timings[i])
|
315
|
+
|
316
|
+
if ranges_intersect?(range, possible)
|
317
|
+
range = range.begin..possible.end
|
318
|
+
else
|
319
|
+
sum += range_overlap(range)
|
320
|
+
range = possible
|
321
|
+
end
|
322
|
+
end
|
323
|
+
|
324
|
+
sum += range_overlap(range)
|
325
|
+
end
|
326
|
+
|
317
327
|
def transaction_state
|
318
328
|
@transaction_state ||= if @transaction
|
319
329
|
transaction.state
|
@@ -321,6 +331,57 @@ module NewRelic
|
|
321
331
|
Tracer.state
|
322
332
|
end
|
323
333
|
end
|
334
|
+
|
335
|
+
# for segment callback usage info, see self.set_segment_callback
|
336
|
+
def invoke_callback
|
337
|
+
return unless self.class.instance_variable_defined?(CALLBACK)
|
338
|
+
|
339
|
+
NewRelic::Agent.logger.debug("Invoking callback for #{self.class.name}...")
|
340
|
+
self.class.instance_variable_get(CALLBACK).call
|
341
|
+
rescue Exception => e
|
342
|
+
NewRelic::Agent.logger.error("Error encountered while invoking callback for #{self.class.name}: " +
|
343
|
+
"#{e.class} - #{e.message}")
|
344
|
+
end
|
345
|
+
|
346
|
+
# Setting and invoking a segment callback
|
347
|
+
# =======================================
|
348
|
+
# Each individual segment class such as `ExternalRequestSegment` allows
|
349
|
+
# for exactly one instance of a `Proc` (meaning a proc or lambda) to be
|
350
|
+
# set as a callback. A callback can be set on a segment class by calling
|
351
|
+
# `.set_segment_callback` with a proc or lambda as the only argument.
|
352
|
+
# If set, the callback will be invoked with `#call` at segment class
|
353
|
+
# initialization time.
|
354
|
+
#
|
355
|
+
# Example usage:
|
356
|
+
# callback = -> { puts 'Hello, World! }
|
357
|
+
# ExternalRequestSegment.set_segment_callback(callback)
|
358
|
+
# ExternalRequestSegment.new(library, uri, procedure)
|
359
|
+
#
|
360
|
+
# A callback set on a segment class will only be called when that
|
361
|
+
# specific segment class is initialized. Other segment classes will not
|
362
|
+
# be impacted.
|
363
|
+
#
|
364
|
+
# Great caution should be taken in the defining of the callback block
|
365
|
+
# to not have the block perform anything too time consuming or resource
|
366
|
+
# intensive in order to keep the New Relic Ruby agent operating
|
367
|
+
# normally.
|
368
|
+
#
|
369
|
+
# Given that callbacks are user defined, they must be set entirely at
|
370
|
+
# the user's own risk. It is recommended that each callback use
|
371
|
+
# conditional logic that only performs work for certain qualified
|
372
|
+
# segments. It is recommended that each callback be thoroughly tested
|
373
|
+
# in non-production environments before being introduced to production
|
374
|
+
# environments.
|
375
|
+
def self.set_segment_callback(callback_proc)
|
376
|
+
unless callback_proc.is_a?(Proc)
|
377
|
+
NewRelic::Agent.logger.error("#{self}.#{__method__}: expected an argument of type Proc, " \
|
378
|
+
"got #{callback_proc.class}")
|
379
|
+
return
|
380
|
+
end
|
381
|
+
|
382
|
+
NewRelic::Agent.record_api_supportability_metric(:set_segment_callback)
|
383
|
+
instance_variable_set(CALLBACK, callback_proc)
|
384
|
+
end
|
324
385
|
end
|
325
386
|
end
|
326
387
|
end
|
@@ -24,7 +24,7 @@ module NewRelic
|
|
24
24
|
@nosql_statement = nil
|
25
25
|
@record_sql = true
|
26
26
|
set_instance_info(host, port_path_or_id)
|
27
|
-
@database_name = database_name
|
27
|
+
@database_name = database_name&.to_s
|
28
28
|
super(Datastores::MetricHelper.scoped_metric_for(product, operation, collection),
|
29
29
|
nil,
|
30
30
|
start_time)
|
@@ -35,7 +35,7 @@ module NewRelic
|
|
35
35
|
end
|
36
36
|
|
37
37
|
def caller_transport_type
|
38
|
-
@caller_transport_type ||=
|
38
|
+
@caller_transport_type ||= 'Unknown'
|
39
39
|
end
|
40
40
|
|
41
41
|
def accept_transport_type_from_api(value)
|
@@ -68,8 +68,9 @@ module NewRelic
|
|
68
68
|
)
|
69
69
|
end
|
70
70
|
|
71
|
-
def log_request_headers(headers, direction =
|
72
|
-
NewRelic::Agent.
|
71
|
+
def log_request_headers(headers, direction = 'OUTGOING')
|
72
|
+
printed_headers = headers.is_a?(NewRelic::Agent::HTTPClients::AbstractRequest) ? headers.headers : headers
|
73
|
+
NewRelic::Agent.logger.debug("#{direction} REQUEST HEADERS: #{printed_headers}")
|
73
74
|
end
|
74
75
|
|
75
76
|
def insert_headers(headers)
|
@@ -82,12 +83,12 @@ module NewRelic
|
|
82
83
|
end
|
83
84
|
|
84
85
|
def consume_message_headers(headers, tracer_state, transport_type)
|
85
|
-
log_request_headers(headers,
|
86
|
+
log_request_headers(headers, 'INCOMING')
|
86
87
|
consume_message_distributed_tracing_headers(headers, transport_type)
|
87
88
|
consume_message_cross_app_tracing_headers(headers, tracer_state)
|
88
89
|
consume_message_synthetics_headers(headers)
|
89
90
|
rescue => e
|
90
|
-
NewRelic::Agent.logger.error(
|
91
|
+
NewRelic::Agent.logger.error('Error in consume_message_headers', e)
|
91
92
|
end
|
92
93
|
|
93
94
|
def assign_intrinsics
|
@@ -135,7 +136,7 @@ module NewRelic
|
|
135
136
|
transaction.synthetics_payload = incoming_payload
|
136
137
|
end
|
137
138
|
rescue => e
|
138
|
-
NewRelic::Agent.logger.error(
|
139
|
+
NewRelic::Agent.logger.error('Error in consume_message_synthetics_header', e)
|
139
140
|
end
|
140
141
|
|
141
142
|
def consume_message_distributed_tracing_headers(headers, transport_type)
|