newrelic_rpm 8.9.0 → 8.10.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/.rubocop.yml +23 -8
- data/.rubocop_todo.yml +243 -0
- data/.simplecov +10 -2
- data/.snyk +11 -0
- data/Brewfile +1 -0
- data/CHANGELOG.md +78 -0
- data/Guardfile +1 -0
- data/Rakefile +5 -0
- data/Thorfile +6 -0
- data/bin/newrelic +2 -1
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +3 -2
- data/init.rb +3 -2
- data/install.rb +1 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +4 -3
- data/lib/new_relic/agent/agent/shutdown.rb +3 -2
- data/lib/new_relic/agent/agent/special_startup.rb +3 -2
- data/lib/new_relic/agent/agent/start_worker_thread.rb +15 -14
- data/lib/new_relic/agent/agent/startup.rb +11 -10
- data/lib/new_relic/agent/agent.rb +35 -33
- data/lib/new_relic/agent/agent_logger.rb +2 -1
- data/lib/new_relic/agent/attribute_filter.rb +1 -0
- data/lib/new_relic/agent/attribute_processing.rb +4 -3
- data/lib/new_relic/agent/attributes.rb +2 -1
- data/lib/new_relic/agent/audit_logger.rb +1 -0
- data/lib/new_relic/agent/autostart.rb +1 -0
- data/lib/new_relic/agent/chained_call.rb +1 -0
- data/lib/new_relic/agent/commands/agent_command.rb +1 -0
- data/lib/new_relic/agent/commands/agent_command_router.rb +4 -3
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -0
- data/lib/new_relic/agent/configuration/default_source.rb +35 -7
- data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -0
- data/lib/new_relic/agent/configuration/environment_source.rb +2 -1
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -0
- data/lib/new_relic/agent/configuration/high_security_source.rb +1 -0
- data/lib/new_relic/agent/configuration/manager.rb +2 -1
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -0
- data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -0
- data/lib/new_relic/agent/configuration/security_policy_source.rb +7 -3
- data/lib/new_relic/agent/configuration/server_source.rb +7 -6
- data/lib/new_relic/agent/configuration/yaml_source.rb +4 -1
- data/lib/new_relic/agent/configuration.rb +1 -0
- data/lib/new_relic/agent/connect/request_builder.rb +1 -0
- data/lib/new_relic/agent/connect/response_handler.rb +4 -3
- data/lib/new_relic/agent/custom_event_aggregator.rb +5 -4
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -0
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +1 -0
- data/lib/new_relic/agent/database/obfuscator.rb +2 -1
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -0
- data/lib/new_relic/agent/database.rb +3 -2
- data/lib/new_relic/agent/database_adapter.rb +1 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +9 -8
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +2 -0
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -0
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +2 -1
- data/lib/new_relic/agent/datastores/mongo.rb +1 -0
- data/lib/new_relic/agent/datastores/redis.rb +3 -2
- data/lib/new_relic/agent/datastores.rb +4 -3
- data/lib/new_relic/agent/deprecator.rb +1 -0
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +1 -0
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +16 -16
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +9 -9
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +18 -18
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +8 -8
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +2 -2
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +40 -39
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +16 -14
- data/lib/new_relic/agent/distributed_tracing.rb +17 -17
- data/lib/new_relic/agent/encoding_normalizer.rb +1 -0
- data/lib/new_relic/agent/error_collector.rb +6 -4
- data/lib/new_relic/agent/error_event_aggregator.rb +3 -3
- data/lib/new_relic/agent/error_filter.rb +1 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
- data/lib/new_relic/agent/event_aggregator.rb +20 -19
- data/lib/new_relic/agent/event_buffer.rb +1 -0
- data/lib/new_relic/agent/event_listener.rb +1 -0
- data/lib/new_relic/agent/event_loop.rb +7 -6
- data/lib/new_relic/agent/external.rb +9 -8
- data/lib/new_relic/agent/guid_generator.rb +2 -1
- data/lib/new_relic/agent/harvester.rb +1 -0
- data/lib/new_relic/agent/heap.rb +3 -2
- data/lib/new_relic/agent/hostname.rb +4 -2
- data/lib/new_relic/agent/http_clients/abstract.rb +1 -1
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +5 -5
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +4 -4
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +1 -1
- data/lib/new_relic/agent/http_clients/uri_util.rb +1 -1
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +6 -4
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +10 -4
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +6 -4
- data/lib/new_relic/agent/instrumentation/active_job.rb +2 -1
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +2 -1
- data/lib/new_relic/agent/instrumentation/active_record.rb +9 -8
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +15 -14
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +3 -2
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +5 -3
- data/lib/new_relic/agent/instrumentation/active_storage.rb +2 -1
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +16 -14
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +2 -1
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +2 -1
- data/lib/new_relic/agent/instrumentation/authlogic.rb +2 -1
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +10 -9
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +10 -10
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +4 -3
- data/lib/new_relic/agent/instrumentation/bunny.rb +1 -1
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +13 -9
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +21 -21
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +8 -8
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +2 -2
- data/lib/new_relic/agent/instrumentation/curb.rb +2 -1
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +43 -42
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +2 -2
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +3 -2
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
- data/lib/new_relic/agent/instrumentation/excon.rb +2 -1
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +6 -5
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +5 -4
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +4 -3
- data/lib/new_relic/agent/instrumentation/grape.rb +1 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +98 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +112 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +31 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +33 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +70 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +135 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +36 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +27 -0
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +24 -0
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +26 -0
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +6 -5
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +2 -1
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +4 -3
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +2 -1
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +2 -1
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +2 -1
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +5 -0
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +2 -1
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +2 -2
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +19 -19
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +8 -8
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +17 -14
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +14 -14
- data/lib/new_relic/agent/instrumentation/memcache.rb +1 -1
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +1 -0
- data/lib/new_relic/agent/instrumentation/mongo.rb +2 -1
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +14 -12
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +5 -4
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/net_http.rb +2 -1
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +5 -4
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +2 -1
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +3 -2
- data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +12 -11
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +7 -6
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +4 -3
- data/lib/new_relic/agent/instrumentation/rack.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +6 -5
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +3 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +3 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +3 -1
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +3 -2
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +2 -1
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +3 -2
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +3 -3
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +5 -5
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +3 -3
- data/lib/new_relic/agent/instrumentation/redis.rb +2 -1
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +2 -1
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +3 -2
- data/lib/new_relic/agent/instrumentation/sequel.rb +8 -7
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +6 -4
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +2 -1
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -1
- data/lib/new_relic/agent/instrumentation/sinatra.rb +2 -1
- data/lib/new_relic/agent/instrumentation/sunspot.rb +2 -1
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +2 -1
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/thread.rb +2 -1
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/tilt.rb +1 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +6 -5
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +2 -1
- data/lib/new_relic/agent/instrumentation.rb +1 -0
- data/lib/new_relic/agent/internal_agent_error.rb +1 -0
- data/lib/new_relic/agent/javascript_instrumentor.rb +7 -6
- data/lib/new_relic/agent/linking_metadata.rb +2 -2
- data/lib/new_relic/agent/log_event_aggregator.rb +6 -5
- data/lib/new_relic/agent/log_once.rb +1 -0
- data/lib/new_relic/agent/log_priority.rb +1 -0
- data/lib/new_relic/agent/logging.rb +13 -12
- data/lib/new_relic/agent/memory_logger.rb +1 -0
- data/lib/new_relic/agent/messaging.rb +18 -18
- data/lib/new_relic/agent/method_tracer.rb +6 -5
- data/lib/new_relic/agent/method_tracer_helpers.rb +8 -5
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +3 -2
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +3 -2
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -0
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +2 -1
- data/lib/new_relic/agent/monitors.rb +5 -4
- data/lib/new_relic/agent/new_relic_service/encoders.rb +2 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +4 -3
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -0
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -0
- data/lib/new_relic/agent/new_relic_service.rb +11 -11
- data/lib/new_relic/agent/noticible_error.rb +1 -1
- data/lib/new_relic/agent/null_logger.rb +1 -0
- data/lib/new_relic/agent/obfuscator.rb +2 -1
- data/lib/new_relic/agent/parameter_filtering.rb +1 -0
- data/lib/new_relic/agent/payload_metric_mapping.rb +1 -0
- data/lib/new_relic/agent/pipe_channel_manager.rb +6 -5
- data/lib/new_relic/agent/pipe_service.rb +1 -0
- data/lib/new_relic/agent/prepend_supportability.rb +2 -1
- data/lib/new_relic/agent/priority_sampled_buffer.rb +2 -1
- data/lib/new_relic/agent/range_extensions.rb +8 -27
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +2 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -0
- data/lib/new_relic/agent/rules_engine.rb +2 -1
- data/lib/new_relic/agent/sampler.rb +1 -0
- data/lib/new_relic/agent/sampler_collection.rb +1 -0
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -0
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -0
- data/lib/new_relic/agent/samplers/memory_sampler.rb +5 -4
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -0
- data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -0
- data/lib/new_relic/agent/span_event_aggregator.rb +2 -1
- data/lib/new_relic/agent/span_event_primitive.rb +15 -11
- data/lib/new_relic/agent/sql_sampler.rb +7 -6
- data/lib/new_relic/agent/stats.rb +3 -1
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -0
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +3 -2
- data/lib/new_relic/agent/stats_engine.rb +1 -0
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +6 -5
- data/lib/new_relic/agent/system_info.rb +8 -7
- data/lib/new_relic/agent/threading/agent_thread.rb +11 -6
- data/lib/new_relic/agent/threading/backtrace_node.rb +6 -3
- data/lib/new_relic/agent/threading/backtrace_service.rb +1 -0
- data/lib/new_relic/agent/threading/thread_profile.rb +1 -0
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -0
- data/lib/new_relic/agent/tracer.rb +17 -14
- data/lib/new_relic/agent/transaction/abstract_segment.rb +64 -31
- data/lib/new_relic/agent/transaction/datastore_segment.rb +12 -11
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +52 -47
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +21 -21
- data/lib/new_relic/agent/transaction/external_request_segment.rb +36 -27
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +6 -5
- data/lib/new_relic/agent/transaction/request_attributes.rb +29 -28
- data/lib/new_relic/agent/transaction/segment.rb +8 -7
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -0
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -0
- data/lib/new_relic/agent/transaction/trace.rb +3 -2
- data/lib/new_relic/agent/transaction/trace_builder.rb +10 -9
- data/lib/new_relic/agent/transaction/trace_context.rb +22 -19
- data/lib/new_relic/agent/transaction/trace_node.rb +9 -8
- data/lib/new_relic/agent/transaction/tracing.rb +7 -6
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -0
- data/lib/new_relic/agent/transaction.rb +22 -21
- data/lib/new_relic/agent/transaction_error_primitive.rb +9 -8
- data/lib/new_relic/agent/transaction_event_aggregator.rb +5 -4
- data/lib/new_relic/agent/transaction_event_primitive.rb +3 -3
- data/lib/new_relic/agent/transaction_event_recorder.rb +14 -12
- data/lib/new_relic/agent/transaction_metrics.rb +3 -2
- data/lib/new_relic/agent/transaction_sampler.rb +4 -3
- data/lib/new_relic/agent/transaction_time_aggregator.rb +13 -12
- data/lib/new_relic/agent/utilization/aws.rb +4 -3
- data/lib/new_relic/agent/utilization/azure.rb +1 -0
- data/lib/new_relic/agent/utilization/gcp.rb +6 -5
- data/lib/new_relic/agent/utilization/pcf.rb +3 -2
- data/lib/new_relic/agent/utilization/vendor.rb +27 -26
- data/lib/new_relic/agent/utilization_data.rb +1 -0
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -0
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -0
- data/lib/new_relic/agent/vm/mri_vm.rb +1 -0
- data/lib/new_relic/agent/vm/snapshot.rb +1 -0
- data/lib/new_relic/agent/vm.rb +1 -0
- data/lib/new_relic/agent/worker_loop.rb +2 -1
- data/lib/new_relic/agent.rb +11 -10
- data/lib/new_relic/cli/command.rb +5 -4
- data/lib/new_relic/cli/commands/deployments.rb +9 -8
- data/lib/new_relic/cli/commands/install.rb +6 -5
- data/lib/new_relic/coerce.rb +4 -4
- data/lib/new_relic/collection_helper.rb +2 -1
- data/lib/new_relic/control/class_methods.rb +1 -0
- data/lib/new_relic/control/frameworks/external.rb +1 -0
- data/lib/new_relic/control/frameworks/rails.rb +3 -2
- data/lib/new_relic/control/frameworks/rails3.rb +1 -0
- data/lib/new_relic/control/frameworks/rails4.rb +1 -0
- data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -0
- data/lib/new_relic/control/frameworks/ruby.rb +1 -0
- data/lib/new_relic/control/frameworks/sinatra.rb +1 -0
- data/lib/new_relic/control/frameworks.rb +1 -0
- data/lib/new_relic/control/instance_methods.rb +5 -4
- data/lib/new_relic/control/instrumentation.rb +7 -6
- data/lib/new_relic/control/server_methods.rb +2 -1
- data/lib/new_relic/control.rb +1 -0
- data/lib/new_relic/delayed_job_injection.rb +1 -0
- data/lib/new_relic/dependency_detection.rb +18 -16
- data/lib/new_relic/environment_report.rb +1 -0
- data/lib/new_relic/helper.rb +4 -3
- data/lib/new_relic/language_support.rb +6 -0
- data/lib/new_relic/latest_changes.rb +1 -0
- data/lib/new_relic/local_environment.rb +5 -6
- data/lib/new_relic/metric_data.rb +3 -2
- data/lib/new_relic/metric_spec.rb +2 -1
- data/lib/new_relic/noticed_error.rb +1 -1
- data/lib/new_relic/rack/agent_hooks.rb +1 -0
- data/lib/new_relic/rack/agent_middleware.rb +1 -0
- data/lib/new_relic/rack/browser_monitoring.rb +3 -2
- data/lib/new_relic/rack.rb +1 -0
- data/lib/new_relic/recipes/capistrano3.rb +7 -6
- data/lib/new_relic/recipes/capistrano_legacy.rb +12 -11
- data/lib/new_relic/recipes.rb +1 -0
- data/lib/new_relic/supportability_helper.rb +5 -4
- data/lib/new_relic/version.rb +3 -2
- data/lib/newrelic_rpm.rb +1 -0
- data/lib/sequel/extensions/newrelic_instrumentation.rb +6 -5
- data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -0
- data/lib/tasks/all.rb +1 -0
- data/lib/tasks/config.rake +2 -1
- data/lib/tasks/coverage_report.rake +22 -11
- data/lib/tasks/install.rake +1 -0
- data/lib/tasks/instrumentation_generator/README.md +63 -0
- data/lib/tasks/instrumentation_generator/TODO.md +33 -0
- data/lib/tasks/instrumentation_generator/instrumentation.thor +96 -0
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +10 -0
- data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +7 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +30 -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 +14 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +16 -0
- data/lib/tasks/multiverse.rake +1 -0
- data/lib/tasks/multiverse.rb +8 -7
- data/lib/tasks/newrelic.rb +1 -0
- data/lib/tasks/tests.rake +1 -0
- data/newrelic.yml +505 -486
- data/newrelic_rpm.gemspec +15 -17
- data/recipes/newrelic.rb +1 -0
- data/test/agent_helper.rb +114 -118
- metadata +58 -89
- data/bin/mongrel_rpm +0 -32
@@ -2,6 +2,7 @@
|
|
2
2
|
# encoding: utf-8
|
3
3
|
# This file is distributed under New Relic's license terms.
|
4
4
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
5
|
+
# frozen_string_literal: true
|
5
6
|
|
6
7
|
DependencyDetection.defer do
|
7
8
|
@name = :sequel
|
@@ -24,24 +25,24 @@ DependencyDetection.defer do
|
|
24
25
|
executes do
|
25
26
|
if supported_sequel_version?
|
26
27
|
|
27
|
-
::NewRelic::Agent.logger.info
|
28
|
+
::NewRelic::Agent.logger.info('Installing Sequel instrumentation')
|
28
29
|
|
29
30
|
if Sequel::Database.respond_to?(:extension)
|
30
|
-
Sequel::Database.extension
|
31
|
+
Sequel::Database.extension(:newrelic_instrumentation)
|
31
32
|
else
|
32
|
-
NewRelic::Agent.logger.info
|
33
|
-
NewRelic::Agent.logger.info
|
34
|
-
"https://newrelic.com/docs/ruby/sequel-instrumentation"
|
33
|
+
NewRelic::Agent.logger.info("Detected Sequel version %s." % [Sequel::VERSION])
|
34
|
+
NewRelic::Agent.logger.info("Please see additional documentation: " +
|
35
|
+
"https://newrelic.com/docs/ruby/sequel-instrumentation")
|
35
36
|
end
|
36
37
|
|
37
38
|
Sequel.synchronize { Sequel::DATABASES.dup }.each do |db|
|
38
|
-
db.extension
|
39
|
+
db.extension(:newrelic_instrumentation)
|
39
40
|
end
|
40
41
|
|
41
42
|
Sequel::Model.plugin(:newrelic_instrumentation) if defined?(Sequel::Model)
|
42
43
|
else
|
43
44
|
|
44
|
-
NewRelic::Agent.logger.info
|
45
|
+
NewRelic::Agent.logger.info("Sequel instrumentation requires at least version 3.37.0.")
|
45
46
|
|
46
47
|
end
|
47
48
|
end
|
@@ -1,5 +1,7 @@
|
|
1
|
+
# encoding: utf-8
|
1
2
|
# This file is distributed under New Relic's license terms.
|
2
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
3
5
|
|
4
6
|
DependencyDetection.defer do
|
5
7
|
@name = :sidekiq
|
@@ -9,7 +11,7 @@ DependencyDetection.defer do
|
|
9
11
|
end
|
10
12
|
|
11
13
|
executes do
|
12
|
-
::NewRelic::Agent.logger.info
|
14
|
+
::NewRelic::Agent.logger.info('Installing Sidekiq instrumentation')
|
13
15
|
end
|
14
16
|
|
15
17
|
executes do
|
@@ -80,16 +82,16 @@ DependencyDetection.defer do
|
|
80
82
|
|
81
83
|
Sidekiq.configure_client do |config|
|
82
84
|
config.client_middleware do |chain|
|
83
|
-
chain.add
|
85
|
+
chain.add(NewRelic::SidekiqInstrumentation::Client)
|
84
86
|
end
|
85
87
|
end
|
86
88
|
|
87
89
|
Sidekiq.configure_server do |config|
|
88
90
|
config.client_middleware do |chain|
|
89
|
-
chain.add
|
91
|
+
chain.add(NewRelic::SidekiqInstrumentation::Client)
|
90
92
|
end
|
91
93
|
config.server_middleware do |chain|
|
92
|
-
chain.add
|
94
|
+
chain.add(NewRelic::SidekiqInstrumentation::Server)
|
93
95
|
end
|
94
96
|
|
95
97
|
if config.respond_to?(:error_handlers)
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic::Agent::Instrumentation
|
6
7
|
module Sinatra
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic::Agent::Instrumentation
|
6
7
|
module Sinatra
|
@@ -30,7 +31,7 @@ module NewRelic::Agent::Instrumentation
|
|
30
31
|
def set_newrelic_ignore(type, *routes)
|
31
32
|
# Important to default this in the context of the actual app
|
32
33
|
# If it's done at register time, ignores end up shared between apps.
|
33
|
-
set
|
34
|
+
set(:newrelic_ignores, Hash.new([])) if !respond_to?(:newrelic_ignores)
|
34
35
|
|
35
36
|
# If we call an ignore without a route, it applies to the whole app
|
36
37
|
routes = ["*"] if routes.empty?
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
# NewRelic instrumentation for Sinatra applications. Sinatra actions will
|
6
7
|
# appear in the UI similar to controller actions, and have breakdown charts
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic::Agent::Instrumentation
|
6
7
|
module Sinatra
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic
|
6
7
|
module Agent
|
@@ -12,7 +13,7 @@ module NewRelic
|
|
12
13
|
SINATRA_ROUTE = 'sinatra.route'
|
13
14
|
|
14
15
|
def transaction_name_for_route(env, request)
|
15
|
-
if env.key?
|
16
|
+
if env.key?(SINATRA_ROUTE)
|
16
17
|
env[SINATRA_ROUTE]
|
17
18
|
else
|
18
19
|
name = route_for_sinatra(env)
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require_relative 'sinatra/transaction_namer'
|
6
7
|
require_relative 'sinatra/ignorer'
|
@@ -17,7 +18,7 @@ DependencyDetection.defer do
|
|
17
18
|
depends_on { Sinatra::Base.private_method_defined?(:route_eval) }
|
18
19
|
|
19
20
|
executes do
|
20
|
-
::NewRelic::Agent.logger.info
|
21
|
+
::NewRelic::Agent.logger.info('Installing Sinatra instrumentation')
|
21
22
|
end
|
22
23
|
|
23
24
|
executes do
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
DependencyDetection.defer do
|
6
7
|
@name = :sunspot
|
@@ -10,7 +11,7 @@ DependencyDetection.defer do
|
|
10
11
|
end
|
11
12
|
|
12
13
|
executes do
|
13
|
-
::NewRelic::Agent.logger.info
|
14
|
+
::NewRelic::Agent.logger.info('Installing Rails Sunspot instrumentation')
|
14
15
|
deprecation_msg = 'The instrumentation for Sunspot is deprecated. ' \
|
15
16
|
'It will be removed in version 9.0.0.'
|
16
17
|
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require_relative 'instrumentation'
|
6
7
|
|
@@ -11,7 +12,7 @@ module NewRelic::Agent::Instrumentation
|
|
11
12
|
::Thread.class_eval do
|
12
13
|
include NewRelic::Agent::Instrumentation::MonitoredThread
|
13
14
|
|
14
|
-
alias_method
|
15
|
+
alias_method(:initialize_without_new_relic, :initialize)
|
15
16
|
|
16
17
|
def initialize(*args, &block)
|
17
18
|
traced_block = add_thread_tracing(*args, &block)
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require_relative 'thread/chain'
|
6
7
|
require_relative 'thread/prepend'
|
@@ -9,7 +10,7 @@ DependencyDetection.defer do
|
|
9
10
|
named :thread
|
10
11
|
|
11
12
|
executes do
|
12
|
-
::NewRelic::Agent.logger.info
|
13
|
+
::NewRelic::Agent.logger.info('Installing Thread Instrumentation')
|
13
14
|
|
14
15
|
if use_prepend?
|
15
16
|
prepend_instrument ::Thread, ::NewRelic::Agent::Instrumentation::MonitoredThread::Prepend
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic::Agent::Instrumentation
|
6
7
|
module Tilt::Prepend
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require_relative 'tilt/instrumentation'
|
6
7
|
require_relative 'tilt/chain'
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic::Agent::Instrumentation
|
6
7
|
module Typhoeus
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic
|
6
7
|
module Agent
|
@@ -31,8 +32,8 @@ module NewRelic
|
|
31
32
|
end
|
32
33
|
|
33
34
|
def with_tracing
|
34
|
-
segment = NewRelic::Agent::Tracer.start_segment
|
35
|
-
instance_variable_set
|
35
|
+
segment = NewRelic::Agent::Tracer.start_segment(name: HYDRA_SEGMENT_NAME)
|
36
|
+
instance_variable_set(:@__newrelic_hydra_segment, segment)
|
36
37
|
begin
|
37
38
|
yield
|
38
39
|
ensure
|
@@ -57,15 +58,15 @@ module NewRelic
|
|
57
58
|
parent: parent
|
58
59
|
)
|
59
60
|
|
60
|
-
segment.add_request_headers
|
61
|
+
segment.add_request_headers(wrapped_request)
|
61
62
|
|
62
63
|
callback = Proc.new do
|
63
64
|
wrapped_response = HTTPClients::TyphoeusHTTPResponse.new(request.response)
|
64
65
|
|
65
|
-
segment.process_response_headers
|
66
|
+
segment.process_response_headers(wrapped_response)
|
66
67
|
|
67
68
|
if request.response.code == 0
|
68
|
-
segment.notice_error
|
69
|
+
segment.notice_error(NoticibleError.new(NOTICIBLE_ERROR_CLASS, response_message(request.response)))
|
69
70
|
end
|
70
71
|
|
71
72
|
segment.finish if segment
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic::Agent::Instrumentation
|
6
7
|
module Typhoeus
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require_relative 'typhoeus/instrumentation'
|
6
7
|
require_relative 'typhoeus/chain'
|
@@ -18,7 +19,7 @@ DependencyDetection.defer do
|
|
18
19
|
end
|
19
20
|
|
20
21
|
executes do
|
21
|
-
::NewRelic::Agent.logger.info
|
22
|
+
::NewRelic::Agent.logger.info('Installing Typhoeus instrumentation')
|
22
23
|
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
23
24
|
require 'new_relic/agent/http_clients/typhoeus_wrappers'
|
24
25
|
end
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
# This is the base class for all errors that we want to record through the
|
6
7
|
# NewRelic::Agent::ErrorCollector#notice_agent_error API. It provides the
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'base64'
|
6
7
|
require 'json'
|
@@ -56,25 +57,25 @@ module NewRelic
|
|
56
57
|
true
|
57
58
|
end
|
58
59
|
rescue => e
|
59
|
-
::NewRelic::Agent.logger.debug
|
60
|
+
::NewRelic::Agent.logger.debug("Failure during 'js_enabled_and_ready?'", e)
|
60
61
|
false
|
61
62
|
end
|
62
63
|
|
63
64
|
def insert_js?(state)
|
64
65
|
if !state.current_transaction
|
65
|
-
::NewRelic::Agent.logger.debug
|
66
|
+
::NewRelic::Agent.logger.debug("Not in transaction. Skipping browser instrumentation.")
|
66
67
|
false
|
67
68
|
elsif !state.is_execution_traced?
|
68
|
-
::NewRelic::Agent.logger.debug
|
69
|
+
::NewRelic::Agent.logger.debug("Execution is not traced. Skipping browser instrumentation.")
|
69
70
|
false
|
70
71
|
elsif state.current_transaction.ignore_enduser?
|
71
|
-
::NewRelic::Agent.logger.debug
|
72
|
+
::NewRelic::Agent.logger.debug("Ignore end user for this transaction is set. Skipping browser instrumentation.")
|
72
73
|
false
|
73
74
|
else
|
74
75
|
true
|
75
76
|
end
|
76
77
|
rescue => e
|
77
|
-
::NewRelic::Agent.logger.debug
|
78
|
+
::NewRelic::Agent.logger.debug("Failure during insert_js", e)
|
78
79
|
false
|
79
80
|
end
|
80
81
|
|
@@ -95,7 +96,7 @@ module NewRelic
|
|
95
96
|
|
96
97
|
bt_config + browser_timing_loader(nonce)
|
97
98
|
rescue => e
|
98
|
-
::NewRelic::Agent.logger.debug
|
99
|
+
::NewRelic::Agent.logger.debug("Failure during RUM browser_timing_header construction", e)
|
99
100
|
''
|
100
101
|
end
|
101
102
|
|
@@ -11,7 +11,7 @@ module NewRelic
|
|
11
11
|
module LinkingMetadata
|
12
12
|
extend self
|
13
13
|
|
14
|
-
def append_service_linking_metadata
|
14
|
+
def append_service_linking_metadata(metadata)
|
15
15
|
raise ArgumentError, "Missing argument `metadata`" if metadata.nil?
|
16
16
|
|
17
17
|
config = ::NewRelic::Agent.config
|
@@ -27,7 +27,7 @@ module NewRelic
|
|
27
27
|
metadata
|
28
28
|
end
|
29
29
|
|
30
|
-
def append_trace_linking_metadata
|
30
|
+
def append_trace_linking_metadata(metadata)
|
31
31
|
raise ArgumentError, "Missing argument `metadata`" if metadata.nil?
|
32
32
|
|
33
33
|
if trace_id = Tracer.current_trace_id
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'new_relic/agent/event_aggregator'
|
6
7
|
require 'new_relic/agent/log_priority'
|
@@ -83,7 +84,7 @@ module NewRelic
|
|
83
84
|
nil
|
84
85
|
end
|
85
86
|
|
86
|
-
def record_batch
|
87
|
+
def record_batch(txn, logs)
|
87
88
|
# Ensure we have the same shared priority
|
88
89
|
priority = LogPriority.priority_for(txn)
|
89
90
|
logs.each do |log|
|
@@ -97,7 +98,7 @@ module NewRelic
|
|
97
98
|
end
|
98
99
|
end
|
99
100
|
|
100
|
-
def create_event
|
101
|
+
def create_event(priority, formatted_message, severity)
|
101
102
|
formatted_message = truncate_message(formatted_message)
|
102
103
|
|
103
104
|
event = LinkingMetadata.append_trace_linking_metadata({
|
@@ -181,7 +182,7 @@ module NewRelic
|
|
181
182
|
NewRelic::Agent.increment_metric(format % label)
|
182
183
|
end
|
183
184
|
|
184
|
-
def after_harvest
|
185
|
+
def after_harvest(metadata)
|
185
186
|
dropped_count = metadata[:seen] - metadata[:captured]
|
186
187
|
note_dropped_events(metadata[:seen], dropped_count)
|
187
188
|
record_supportability_metrics(metadata[:seen], metadata[:captured], dropped_count)
|
@@ -211,13 +212,13 @@ module NewRelic
|
|
211
212
|
@line_metrics[severity] ||= "Logging/lines/#{severity}".freeze
|
212
213
|
end
|
213
214
|
|
214
|
-
def note_dropped_events
|
215
|
+
def note_dropped_events(total_count, dropped_count)
|
215
216
|
if dropped_count > 0
|
216
217
|
NewRelic::Agent.logger.warn("Dropped #{dropped_count} log events out of #{total_count}.")
|
217
218
|
end
|
218
219
|
end
|
219
220
|
|
220
|
-
def record_supportability_metrics
|
221
|
+
def record_supportability_metrics(total_count, captured_count, dropped_count)
|
221
222
|
return unless total_count > 0
|
222
223
|
|
223
224
|
NewRelic::Agent.increment_metric(DROPPED_METRIC, dropped_count)
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'json'
|
6
7
|
require 'new_relic/agent/hostname'
|
@@ -35,42 +36,42 @@ module NewRelic
|
|
35
36
|
REPLACEMENT_CHAR = '�'
|
36
37
|
|
37
38
|
def initialize
|
38
|
-
Agent.config.register_callback
|
39
|
+
Agent.config.register_callback(:app_name) do
|
39
40
|
@app_name = nil
|
40
41
|
end
|
41
42
|
end
|
42
43
|
|
43
|
-
def call
|
44
|
-
message = '{'
|
44
|
+
def call(severity, time, progname, msg)
|
45
|
+
message = String.new('{')
|
45
46
|
if app_name
|
46
|
-
add_key_value
|
47
|
+
add_key_value(message, ENTITY_NAME_KEY, app_name)
|
47
48
|
message << COMMA
|
48
49
|
end
|
49
|
-
add_key_value
|
50
|
+
add_key_value(message, ENTITY_TYPE_KEY, ENTITY_TYPE)
|
50
51
|
message << COMMA
|
51
|
-
add_key_value
|
52
|
+
add_key_value(message, HOSTNAME_KEY, Hostname.get)
|
52
53
|
|
53
54
|
if entity_guid = Agent.config[:entity_guid]
|
54
55
|
message << COMMA
|
55
|
-
add_key_value
|
56
|
+
add_key_value(message, ENTITY_GUID_KEY, entity_guid)
|
56
57
|
end
|
57
58
|
|
58
59
|
if trace_id = Tracer.trace_id
|
59
60
|
message << COMMA
|
60
|
-
add_key_value
|
61
|
+
add_key_value(message, TRACE_ID_KEY, trace_id)
|
61
62
|
end
|
62
63
|
if span_id = Tracer.span_id
|
63
64
|
message << COMMA
|
64
|
-
add_key_value
|
65
|
+
add_key_value(message, SPAN_ID_KEY, span_id)
|
65
66
|
end
|
66
67
|
|
67
68
|
message << COMMA
|
68
69
|
message << QUOTE << MESSAGE_KEY << QUOTE << COLON << escape(msg)
|
69
70
|
message << COMMA
|
70
|
-
add_key_value
|
71
|
+
add_key_value(message, LOG_LEVEL_KEY, severity)
|
71
72
|
if progname
|
72
73
|
message << COMMA
|
73
|
-
add_key_value
|
74
|
+
add_key_value(message, LOG_NAME_KEY, progname)
|
74
75
|
end
|
75
76
|
|
76
77
|
message << COMMA
|
@@ -82,7 +83,7 @@ module NewRelic
|
|
82
83
|
@app_name ||= Agent.config[:app_name][0]
|
83
84
|
end
|
84
85
|
|
85
|
-
def add_key_value
|
86
|
+
def add_key_value(message, key, value)
|
86
87
|
message << QUOTE << key << QUOTE << COLON << QUOTE << value << QUOTE
|
87
88
|
end
|
88
89
|
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
# Base class for startup logging and testing in multiverse
|
6
7
|
|