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
@@ -0,0 +1,235 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require 'new_relic/agent/event_aggregator'
|
6
|
+
require 'new_relic/agent/log_priority'
|
7
|
+
|
8
|
+
module NewRelic
|
9
|
+
module Agent
|
10
|
+
class LogEventAggregator < EventAggregator
|
11
|
+
# Per-message keys
|
12
|
+
LEVEL_KEY = 'level'.freeze
|
13
|
+
MESSAGE_KEY = 'message'.freeze
|
14
|
+
TIMESTAMP_KEY = 'timestamp'.freeze
|
15
|
+
PRIORITY_KEY = 'priority'.freeze
|
16
|
+
|
17
|
+
# Metric keys
|
18
|
+
LINES = 'Logging/lines'.freeze
|
19
|
+
DROPPED_METRIC = 'Logging/Forwarding/Dropped'.freeze
|
20
|
+
SEEN_METRIC = 'Supportability/Logging/Forwarding/Seen'.freeze
|
21
|
+
SENT_METRIC = 'Supportability/Logging/Forwarding/Sent'.freeze
|
22
|
+
OVERALL_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Ruby/Logger/%s'.freeze
|
23
|
+
METRICS_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Metrics/Ruby/%s'.freeze
|
24
|
+
FORWARDING_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Forwarding/Ruby/%s'.freeze
|
25
|
+
DECORATING_SUPPORTABILITY_FORMAT = 'Supportability/Logging/LocalDecorating/Ruby/%s'.freeze
|
26
|
+
MAX_BYTES = 32768 # 32 * 1024 bytes (32 kibibytes)
|
27
|
+
|
28
|
+
named :LogEventAggregator
|
29
|
+
buffer_class PrioritySampledBuffer
|
30
|
+
|
31
|
+
capacity_key :'application_logging.forwarding.max_samples_stored'
|
32
|
+
enabled_key :'application_logging.enabled'
|
33
|
+
|
34
|
+
# Config keys
|
35
|
+
OVERALL_ENABLED_KEY = :'application_logging.enabled'
|
36
|
+
METRICS_ENABLED_KEY = :'application_logging.metrics.enabled'
|
37
|
+
FORWARDING_ENABLED_KEY = :'application_logging.forwarding.enabled'
|
38
|
+
DECORATING_ENABLED_KEY = :'application_logging.local_decorating.enabled'
|
39
|
+
|
40
|
+
def initialize(events)
|
41
|
+
super(events)
|
42
|
+
@counter_lock = Mutex.new
|
43
|
+
@seen = 0
|
44
|
+
@seen_by_severity = Hash.new(0)
|
45
|
+
@high_security = NewRelic::Agent.config[:high_security]
|
46
|
+
@instrumentation_logger_enabled = NewRelic::Agent::Instrumentation::Logger.enabled?
|
47
|
+
register_for_done_configuring(events)
|
48
|
+
end
|
49
|
+
|
50
|
+
def capacity
|
51
|
+
@buffer.capacity
|
52
|
+
end
|
53
|
+
|
54
|
+
def record(formatted_message, severity)
|
55
|
+
return unless enabled?
|
56
|
+
|
57
|
+
severity = 'UNKNOWN' if severity.nil? || severity.empty?
|
58
|
+
|
59
|
+
if NewRelic::Agent.config[METRICS_ENABLED_KEY]
|
60
|
+
@counter_lock.synchronize do
|
61
|
+
@seen += 1
|
62
|
+
@seen_by_severity[severity] += 1
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
return if formatted_message.nil? || formatted_message.empty?
|
67
|
+
return unless NewRelic::Agent.config[:'application_logging.forwarding.enabled']
|
68
|
+
return if @high_security
|
69
|
+
|
70
|
+
txn = NewRelic::Agent::Transaction.tl_current
|
71
|
+
priority = LogPriority.priority_for(txn)
|
72
|
+
|
73
|
+
if txn
|
74
|
+
return txn.add_log_event(create_event(priority, formatted_message, severity))
|
75
|
+
else
|
76
|
+
return @lock.synchronize do
|
77
|
+
@buffer.append(priority: priority) do
|
78
|
+
create_event(priority, formatted_message, severity)
|
79
|
+
end
|
80
|
+
end
|
81
|
+
end
|
82
|
+
rescue
|
83
|
+
nil
|
84
|
+
end
|
85
|
+
|
86
|
+
def record_batch(txn, logs)
|
87
|
+
# Ensure we have the same shared priority
|
88
|
+
priority = LogPriority.priority_for(txn)
|
89
|
+
logs.each do |log|
|
90
|
+
log.first[PRIORITY_KEY] = priority
|
91
|
+
end
|
92
|
+
|
93
|
+
@lock.synchronize do
|
94
|
+
logs.each do |log|
|
95
|
+
@buffer.append(event: log)
|
96
|
+
end
|
97
|
+
end
|
98
|
+
end
|
99
|
+
|
100
|
+
def create_event(priority, formatted_message, severity)
|
101
|
+
formatted_message = truncate_message(formatted_message)
|
102
|
+
|
103
|
+
event = LinkingMetadata.append_trace_linking_metadata({
|
104
|
+
LEVEL_KEY => severity,
|
105
|
+
MESSAGE_KEY => formatted_message,
|
106
|
+
TIMESTAMP_KEY => Process.clock_gettime(Process::CLOCK_REALTIME) * 1000
|
107
|
+
})
|
108
|
+
|
109
|
+
[
|
110
|
+
{
|
111
|
+
PrioritySampledBuffer::PRIORITY_KEY => priority
|
112
|
+
},
|
113
|
+
event
|
114
|
+
]
|
115
|
+
end
|
116
|
+
|
117
|
+
# Because our transmission format (MELT) is different than historical
|
118
|
+
# agent payloads, extract the munging here to keep the service focused
|
119
|
+
# on the general harvest + transmit instead of the format.
|
120
|
+
#
|
121
|
+
# Payload shape matches the publicly documented MELT format.
|
122
|
+
# https://docs.newrelic.com/docs/logs/log-api/introduction-log-api
|
123
|
+
#
|
124
|
+
# We have to keep the aggregated payloads in a separate shape, though, to
|
125
|
+
# work with the priority sampling buffers
|
126
|
+
def self.payload_to_melt_format(data)
|
127
|
+
common_attributes = LinkingMetadata.append_service_linking_metadata({})
|
128
|
+
|
129
|
+
# To save on unnecessary data transmission, trim the entity.type
|
130
|
+
# sent by classic logs-in-context
|
131
|
+
common_attributes.delete(ENTITY_TYPE_KEY)
|
132
|
+
|
133
|
+
_, items = data
|
134
|
+
payload = [{
|
135
|
+
common: {attributes: common_attributes},
|
136
|
+
logs: items.map(&:last)
|
137
|
+
}]
|
138
|
+
|
139
|
+
return [payload, items.size]
|
140
|
+
end
|
141
|
+
|
142
|
+
def harvest!
|
143
|
+
record_customer_metrics()
|
144
|
+
super
|
145
|
+
end
|
146
|
+
|
147
|
+
def reset!
|
148
|
+
@counter_lock.synchronize do
|
149
|
+
@seen = 0
|
150
|
+
@seen_by_severity.clear
|
151
|
+
end
|
152
|
+
super
|
153
|
+
end
|
154
|
+
|
155
|
+
def enabled?
|
156
|
+
@enabled && @instrumentation_logger_enabled
|
157
|
+
end
|
158
|
+
|
159
|
+
private
|
160
|
+
|
161
|
+
# We record once-per-connect metrics for enabled/disabled state at the
|
162
|
+
# point we consider the configuration stable (i.e. once we've gotten SSC)
|
163
|
+
def register_for_done_configuring(events)
|
164
|
+
events.subscribe(:server_source_configuration_added) do
|
165
|
+
@high_security = NewRelic::Agent.config[:high_security]
|
166
|
+
|
167
|
+
record_configuration_metric(OVERALL_SUPPORTABILITY_FORMAT, OVERALL_ENABLED_KEY)
|
168
|
+
record_configuration_metric(METRICS_SUPPORTABILITY_FORMAT, METRICS_ENABLED_KEY)
|
169
|
+
record_configuration_metric(FORWARDING_SUPPORTABILITY_FORMAT, FORWARDING_ENABLED_KEY)
|
170
|
+
record_configuration_metric(DECORATING_SUPPORTABILITY_FORMAT, DECORATING_ENABLED_KEY)
|
171
|
+
end
|
172
|
+
end
|
173
|
+
|
174
|
+
def record_configuration_metric(format, key)
|
175
|
+
state = NewRelic::Agent.config[key]
|
176
|
+
label = if !enabled?
|
177
|
+
'disabled'
|
178
|
+
else
|
179
|
+
state ? 'enabled' : 'disabled'
|
180
|
+
end
|
181
|
+
NewRelic::Agent.increment_metric(format % label)
|
182
|
+
end
|
183
|
+
|
184
|
+
def after_harvest(metadata)
|
185
|
+
dropped_count = metadata[:seen] - metadata[:captured]
|
186
|
+
note_dropped_events(metadata[:seen], dropped_count)
|
187
|
+
record_supportability_metrics(metadata[:seen], metadata[:captured], dropped_count)
|
188
|
+
end
|
189
|
+
|
190
|
+
# To avoid paying the cost of metric recording on every line, we hold
|
191
|
+
# these until harvest before recording them
|
192
|
+
def record_customer_metrics
|
193
|
+
return unless enabled?
|
194
|
+
return unless NewRelic::Agent.config[:'application_logging.metrics.enabled']
|
195
|
+
|
196
|
+
@counter_lock.synchronize do
|
197
|
+
return unless @seen > 0
|
198
|
+
|
199
|
+
NewRelic::Agent.increment_metric(LINES, @seen)
|
200
|
+
@seen_by_severity.each do |(severity, count)|
|
201
|
+
NewRelic::Agent.increment_metric(line_metric_name_by_severity(severity), count)
|
202
|
+
end
|
203
|
+
|
204
|
+
@seen = 0
|
205
|
+
@seen_by_severity.clear
|
206
|
+
end
|
207
|
+
end
|
208
|
+
|
209
|
+
def line_metric_name_by_severity(severity)
|
210
|
+
@line_metrics ||= {}
|
211
|
+
@line_metrics[severity] ||= "Logging/lines/#{severity}".freeze
|
212
|
+
end
|
213
|
+
|
214
|
+
def note_dropped_events(total_count, dropped_count)
|
215
|
+
if dropped_count > 0
|
216
|
+
NewRelic::Agent.logger.warn("Dropped #{dropped_count} log events out of #{total_count}.")
|
217
|
+
end
|
218
|
+
end
|
219
|
+
|
220
|
+
def record_supportability_metrics(total_count, captured_count, dropped_count)
|
221
|
+
return unless total_count > 0
|
222
|
+
|
223
|
+
NewRelic::Agent.increment_metric(DROPPED_METRIC, dropped_count)
|
224
|
+
NewRelic::Agent.increment_metric(SEEN_METRIC, total_count)
|
225
|
+
NewRelic::Agent.increment_metric(SENT_METRIC, captured_count)
|
226
|
+
end
|
227
|
+
|
228
|
+
def truncate_message(message)
|
229
|
+
return message if message.bytesize <= MAX_BYTES
|
230
|
+
|
231
|
+
message.byteslice(0...MAX_BYTES)
|
232
|
+
end
|
233
|
+
end
|
234
|
+
end
|
235
|
+
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -0,0 +1,20 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require 'new_relic/agent/event_aggregator'
|
6
|
+
|
7
|
+
# Stateless calculation of priority for a given log event
|
8
|
+
module NewRelic
|
9
|
+
module Agent
|
10
|
+
module LogPriority
|
11
|
+
extend self
|
12
|
+
|
13
|
+
def priority_for(txn)
|
14
|
+
return txn.priority if txn
|
15
|
+
|
16
|
+
rand.round(NewRelic::PRIORITY_PRECISION)
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
@@ -0,0 +1,182 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require 'json'
|
6
|
+
require 'new_relic/agent/hostname'
|
7
|
+
|
8
|
+
module NewRelic
|
9
|
+
module Agent
|
10
|
+
module Logging
|
11
|
+
# This class can be used as the formatter for an existing logger. It
|
12
|
+
# decorates log messages with trace and entity metadata, and formats each
|
13
|
+
# log messages as a JSON object.
|
14
|
+
#
|
15
|
+
# It can be added to a Rails application like this:
|
16
|
+
#
|
17
|
+
# require 'newrelic_rpm'
|
18
|
+
#
|
19
|
+
# Rails.application.configure do
|
20
|
+
# config.log_formatter = ::NewRelic::Agent::Logging::DecoratingFormatter.new
|
21
|
+
# end
|
22
|
+
#
|
23
|
+
# @api public
|
24
|
+
class DecoratingFormatter < ::Logger::Formatter
|
25
|
+
MESSAGE_ELEMENT = 'message'
|
26
|
+
LOG_LEVEL_ELEMENT = 'log_level'
|
27
|
+
PROG_NAME_ELEMENT = 'prog_name'
|
28
|
+
ELEMENTS = ['app_name', 'entity_type', 'hostname', 'entity_guid', 'trace_id', 'span_id', MESSAGE_ELEMENT,
|
29
|
+
LOG_LEVEL_ELEMENT, PROG_NAME_ELEMENT].freeze
|
30
|
+
TIMESTAMP_KEY = 'timestamp'
|
31
|
+
MESSAGE_KEY = 'message'
|
32
|
+
LOG_LEVEL_KEY = 'log.level'
|
33
|
+
LOG_NAME_KEY = 'logger.name'
|
34
|
+
NEWLINE = "\n"
|
35
|
+
|
36
|
+
QUOTE = '"'
|
37
|
+
COLON = ':'
|
38
|
+
COMMA = ','
|
39
|
+
CLOSING_BRACE = '}'
|
40
|
+
REPLACEMENT_CHAR = '�'
|
41
|
+
|
42
|
+
def initialize
|
43
|
+
Agent.config.register_callback(:app_name) do
|
44
|
+
@app_name = nil
|
45
|
+
end
|
46
|
+
end
|
47
|
+
|
48
|
+
def call(severity, time, progname, msg)
|
49
|
+
message = +'{'
|
50
|
+
ELEMENTS.each do |element|
|
51
|
+
args = case element
|
52
|
+
when MESSAGE_ELEMENT then [message, msg]
|
53
|
+
when LOG_LEVEL_ELEMENT then [message, severity]
|
54
|
+
when PROG_NAME_ELEMENT then [message, progname]
|
55
|
+
else [message]
|
56
|
+
end
|
57
|
+
|
58
|
+
send("add_#{element}", *args)
|
59
|
+
end
|
60
|
+
message << COMMA
|
61
|
+
message << QUOTE << TIMESTAMP_KEY << QUOTE << COLON << (time.to_f * 1000).round.to_s
|
62
|
+
message << CLOSING_BRACE << NEWLINE
|
63
|
+
end
|
64
|
+
|
65
|
+
private
|
66
|
+
|
67
|
+
def add_app_name(message)
|
68
|
+
return unless app_name
|
69
|
+
|
70
|
+
add_key_value(message, ENTITY_NAME_KEY, app_name)
|
71
|
+
message << COMMA
|
72
|
+
end
|
73
|
+
|
74
|
+
def add_entity_type(message)
|
75
|
+
add_key_value(message, ENTITY_TYPE_KEY, ENTITY_TYPE)
|
76
|
+
message << COMMA
|
77
|
+
end
|
78
|
+
|
79
|
+
def add_hostname(message)
|
80
|
+
add_key_value(message, HOSTNAME_KEY, Hostname.get)
|
81
|
+
end
|
82
|
+
|
83
|
+
def add_entity_guid(message)
|
84
|
+
return unless entity_guid = Agent.config[:entity_guid]
|
85
|
+
|
86
|
+
message << COMMA
|
87
|
+
add_key_value(message, ENTITY_GUID_KEY, entity_guid)
|
88
|
+
end
|
89
|
+
|
90
|
+
def add_trace_id(message)
|
91
|
+
return unless trace_id = Tracer.trace_id
|
92
|
+
|
93
|
+
message << COMMA
|
94
|
+
add_key_value(message, TRACE_ID_KEY, trace_id)
|
95
|
+
end
|
96
|
+
|
97
|
+
def add_span_id(message)
|
98
|
+
return unless span_id = Tracer.span_id
|
99
|
+
|
100
|
+
message << COMMA
|
101
|
+
add_key_value(message, SPAN_ID_KEY, span_id)
|
102
|
+
end
|
103
|
+
|
104
|
+
def add_message(message, msg)
|
105
|
+
message << COMMA
|
106
|
+
message << QUOTE << MESSAGE_KEY << QUOTE << COLON << escape(msg)
|
107
|
+
message << COMMA
|
108
|
+
end
|
109
|
+
|
110
|
+
def add_log_level(message, severity)
|
111
|
+
add_key_value(message, LOG_LEVEL_KEY, severity)
|
112
|
+
end
|
113
|
+
|
114
|
+
def add_prog_name(message, progname)
|
115
|
+
return unless progname
|
116
|
+
|
117
|
+
message << COMMA
|
118
|
+
add_key_value(message, LOG_NAME_KEY, progname)
|
119
|
+
end
|
120
|
+
|
121
|
+
def app_name
|
122
|
+
@app_name ||= Agent.config[:app_name][0]
|
123
|
+
end
|
124
|
+
|
125
|
+
def add_key_value(message, key, value)
|
126
|
+
message << QUOTE << key << QUOTE << COLON << QUOTE << value << QUOTE
|
127
|
+
end
|
128
|
+
|
129
|
+
def escape(message)
|
130
|
+
message = message.to_s unless message.is_a?(String)
|
131
|
+
unless message.encoding == Encoding::UTF_8 && message.valid_encoding?
|
132
|
+
message = message.encode(
|
133
|
+
Encoding::UTF_8,
|
134
|
+
invalid: :replace,
|
135
|
+
undef: :replace,
|
136
|
+
replace: REPLACEMENT_CHAR
|
137
|
+
)
|
138
|
+
end
|
139
|
+
message.to_json
|
140
|
+
end
|
141
|
+
|
142
|
+
def clear_tags!
|
143
|
+
# No-op; just avoiding issues with act-fluent-logger-rails
|
144
|
+
end
|
145
|
+
end
|
146
|
+
|
147
|
+
# This logger decorates logs with trace and entity metadata, and emits log
|
148
|
+
# messages formatted as JSON objects. It extends the Logger class from
|
149
|
+
# the Ruby standard library, and accepts the same constructor parameters.
|
150
|
+
#
|
151
|
+
# It aliases the `:info` message to overwrite the `:write` method, so it
|
152
|
+
# can be used in Rack applications that expect the logger to be a file-like
|
153
|
+
# object.
|
154
|
+
#
|
155
|
+
# It can be added to an application like this:
|
156
|
+
#
|
157
|
+
# require 'newrelic_rpm'
|
158
|
+
#
|
159
|
+
# config.logger = NewRelic::Agent::Logging::DecoratingLogger.new "log/application.log"
|
160
|
+
#
|
161
|
+
# @api public
|
162
|
+
class DecoratingLogger < (defined?(::ActiveSupport) && defined?(::ActiveSupport::Logger) ? ::ActiveSupport::Logger : ::Logger)
|
163
|
+
alias :write :info
|
164
|
+
|
165
|
+
# Positional and Keyword arguments are separated beginning with Ruby 2.7
|
166
|
+
# Signature of ::Logger constructor changes in Ruby 2.4 to have both positional and keyword args
|
167
|
+
# We pivot on Ruby 2.7 for widest supportability with least amount of hassle.
|
168
|
+
if RUBY_VERSION < '2.7.0'
|
169
|
+
def initialize(*args)
|
170
|
+
super(*args)
|
171
|
+
self.formatter = DecoratingFormatter.new
|
172
|
+
end
|
173
|
+
else
|
174
|
+
def initialize(*args, **kwargs)
|
175
|
+
super(*args, **kwargs)
|
176
|
+
self.formatter = DecoratingFormatter.new
|
177
|
+
end
|
178
|
+
end
|
179
|
+
end
|
180
|
+
end
|
181
|
+
end
|
182
|
+
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
# Base class for startup logging and testing in multiverse
|
6
6
|
|
@@ -44,7 +44,7 @@ module NewRelic
|
|
44
44
|
messages << [:debug, msgs, blk]
|
45
45
|
end
|
46
46
|
|
47
|
-
def log_exception(level, e, backtrace_level=level)
|
47
|
+
def log_exception(level, e, backtrace_level = level)
|
48
48
|
messages << [:log_exception, [level, e, backtrace_level]]
|
49
49
|
end
|
50
50
|
|