newrelic_rpm 6.15.0 → 8.13.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +7 -1
- data/.rubocop.yml +1817 -0
- data/.rubocop_todo.yml +59 -0
- data/.simplecov +15 -0
- data/.snyk +11 -0
- data/.yardopts +1 -0
- data/Brewfile +12 -0
- data/CHANGELOG.md +754 -40
- data/CONTRIBUTING.md +32 -5
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Gemfile +0 -1
- data/Guardfile +9 -8
- data/LICENSE +0 -6
- data/README.md +21 -20
- data/Rakefile +27 -29
- data/THIRD_PARTY_NOTICES.md +14 -199
- data/Thorfile +5 -0
- data/bin/newrelic +3 -2
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +76 -53
- data/config.dot +5 -5
- data/docker-compose.yml +107 -0
- data/init.rb +4 -6
- data/install.rb +2 -2
- data/lefthook.yml +9 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +13 -9
- data/lib/new_relic/agent/agent/shutdown.rb +35 -0
- data/lib/new_relic/agent/agent/special_startup.rb +72 -0
- data/lib/new_relic/agent/agent/start_worker_thread.rb +163 -0
- data/lib/new_relic/agent/agent/startup.rb +197 -0
- data/lib/new_relic/agent/agent.rb +178 -555
- data/lib/new_relic/agent/agent_logger.rb +23 -19
- data/lib/new_relic/agent/attribute_filter.rb +66 -47
- data/lib/new_relic/agent/attribute_processing.rb +7 -7
- data/lib/new_relic/agent/attributes.rb +5 -4
- data/lib/new_relic/agent/audit_logger.rb +8 -3
- data/lib/new_relic/agent/autostart.rb +20 -19
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +3 -3
- data/lib/new_relic/agent/commands/agent_command_router.rb +12 -11
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +9 -7
- data/lib/new_relic/agent/configuration/default_source.rb +1728 -1194
- data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
- data/lib/new_relic/agent/configuration/environment_source.rb +11 -9
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +40 -17
- data/lib/new_relic/agent/configuration/high_security_source.rb +9 -8
- data/lib/new_relic/agent/configuration/manager.rb +82 -69
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
- data/lib/new_relic/agent/configuration/security_policy_source.rb +90 -77
- data/lib/new_relic/agent/configuration/server_source.rb +21 -19
- data/lib/new_relic/agent/configuration/yaml_source.rb +31 -7
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +18 -18
- data/lib/new_relic/agent/connect/response_handler.rb +5 -8
- data/lib/new_relic/agent/custom_event_aggregator.rb +14 -14
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +4 -5
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +14 -13
- data/lib/new_relic/agent/database/obfuscator.rb +2 -2
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
- data/lib/new_relic/agent/database.rb +53 -47
- data/lib/new_relic/agent/database_adapter.rb +3 -1
- data/lib/new_relic/agent/datastores/metric_helper.rb +17 -18
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +6 -10
- data/lib/new_relic/agent/datastores/mongo.rb +6 -11
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +5 -11
- data/lib/new_relic/agent/datastores.rb +11 -13
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +10 -10
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +39 -32
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -22
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +19 -19
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +50 -52
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +5 -6
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +76 -77
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +39 -38
- data/lib/new_relic/agent/distributed_tracing.rb +32 -100
- data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
- data/lib/new_relic/agent/error_collector.rb +73 -54
- data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +4 -3
- data/lib/new_relic/agent/event_aggregator.rb +22 -21
- data/lib/new_relic/agent/event_buffer.rb +7 -8
- data/lib/new_relic/agent/event_listener.rb +1 -2
- data/lib/new_relic/agent/event_loop.rb +25 -23
- data/lib/new_relic/agent/external.rb +11 -44
- data/lib/new_relic/agent/guid_generator.rb +4 -11
- data/lib/new_relic/agent/harvester.rb +4 -5
- data/lib/new_relic/agent/heap.rb +6 -8
- data/lib/new_relic/agent/hostname.rb +20 -13
- data/lib/new_relic/agent/http_clients/abstract.rb +10 -11
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +6 -11
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +8 -9
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -5
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +2 -4
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +8 -4
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +4 -5
- data/lib/new_relic/agent/http_clients/uri_util.rb +1 -3
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +8 -8
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +38 -31
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +12 -13
- data/lib/new_relic/agent/instrumentation/active_job.rb +14 -7
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
- data/lib/new_relic/agent/instrumentation/active_record.rb +29 -27
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +71 -61
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +31 -44
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +4 -4
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +27 -20
- data/lib/new_relic/agent/instrumentation/active_storage.rb +2 -2
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +18 -15
- 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/acts_as_solr.rb +18 -10
- data/lib/new_relic/agent/instrumentation/authlogic.rb +10 -2
- 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 +11 -154
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +68 -58
- 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 +11 -243
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +65 -54
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +35 -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 +29 -53
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -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 +5 -5
- data/lib/new_relic/agent/instrumentation/excon.rb +22 -24
- 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 +11 -112
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -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 +10 -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 +4 -5
- 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 +57 -128
- 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 +101 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +56 -72
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +13 -12
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +5 -7
- data/lib/new_relic/agent/instrumentation/mongo.rb +5 -136
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +21 -18
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/{net_prepend.rb → net_http/instrumentation.rb} +13 -13
- 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 +10 -9
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +20 -58
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +3 -3
- data/lib/new_relic/agent/instrumentation/queue_time.rb +8 -9
- 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 +30 -140
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +16 -52
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +5 -4
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +3 -3
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +3 -2
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +13 -3
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +149 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +16 -157
- 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 +72 -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 +18 -107
- 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 +28 -39
- data/lib/new_relic/agent/instrumentation/sequel.rb +14 -16
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +2 -2
- 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 +23 -64
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -36
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +125 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -2
- data/lib/new_relic/agent/instrumentation/sinatra.rb +34 -163
- data/lib/new_relic/agent/instrumentation/sunspot.rb +11 -3
- 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 +41 -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 +12 -91
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +2 -2
- data/lib/new_relic/agent/javascript_instrumentor.rb +47 -41
- 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 +1 -1
- data/lib/new_relic/agent/log_priority.rb +20 -0
- data/lib/new_relic/agent/logging.rb +24 -21
- data/lib/new_relic/agent/memory_logger.rb +2 -2
- data/lib/new_relic/agent/messaging.rb +65 -81
- data/lib/new_relic/agent/method_tracer.rb +154 -149
- data/lib/new_relic/agent/method_tracer_helpers.rb +85 -3
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +25 -17
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +5 -4
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -2
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +6 -9
- data/lib/new_relic/agent/monitors.rb +6 -7
- data/lib/new_relic/agent/new_relic_service/encoders.rb +6 -6
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +5 -5
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -4
- data/lib/new_relic/agent/new_relic_service.rb +248 -196
- data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -5
- data/lib/new_relic/agent/null_logger.rb +7 -3
- data/lib/new_relic/agent/obfuscator.rb +8 -10
- data/lib/new_relic/agent/parameter_filtering.rb +24 -10
- data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
- data/lib/new_relic/agent/pipe_channel_manager.rb +27 -17
- data/lib/new_relic/agent/pipe_service.rb +8 -5
- data/lib/new_relic/agent/prepend_supportability.rb +2 -2
- data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -11
- data/lib/new_relic/agent/range_extensions.rb +8 -28
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -13
- data/lib/new_relic/agent/rules_engine.rb +5 -4
- data/lib/new_relic/agent/sampler.rb +3 -4
- data/lib/new_relic/agent/sampler_collection.rb +3 -4
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +3 -2
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +12 -9
- data/lib/new_relic/agent/samplers/memory_sampler.rb +24 -13
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
- data/lib/new_relic/agent/span_event_aggregator.rb +12 -12
- data/lib/new_relic/agent/span_event_primitive.rb +62 -56
- data/lib/new_relic/agent/sql_sampler.rb +18 -18
- data/lib/new_relic/agent/stats.rb +78 -41
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +9 -11
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +12 -13
- data/lib/new_relic/agent/stats_engine.rb +8 -8
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +7 -8
- data/lib/new_relic/agent/system_info.rb +85 -65
- data/lib/new_relic/agent/threading/agent_thread.rb +18 -14
- data/lib/new_relic/agent/threading/backtrace_node.rb +12 -13
- data/lib/new_relic/agent/threading/backtrace_service.rb +14 -14
- data/lib/new_relic/agent/threading/thread_profile.rb +23 -23
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +76 -85
- data/lib/new_relic/agent/transaction/abstract_segment.rb +103 -40
- data/lib/new_relic/agent/transaction/datastore_segment.rb +21 -17
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +63 -56
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +43 -44
- data/lib/new_relic/agent/transaction/external_request_segment.rb +44 -34
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +31 -36
- data/lib/new_relic/agent/transaction/request_attributes.rb +35 -35
- data/lib/new_relic/agent/transaction/segment.rb +14 -10
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/trace.rb +15 -11
- data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
- data/lib/new_relic/agent/transaction/trace_context.rb +35 -35
- data/lib/new_relic/agent/transaction/trace_node.rb +25 -24
- data/lib/new_relic/agent/transaction/tracing.rb +14 -11
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +4 -4
- data/lib/new_relic/agent/transaction.rb +164 -145
- data/lib/new_relic/agent/transaction_error_primitive.rb +27 -25
- data/lib/new_relic/agent/transaction_event_aggregator.rb +12 -12
- data/lib/new_relic/agent/transaction_event_primitive.rb +32 -33
- data/lib/new_relic/agent/transaction_event_recorder.rb +16 -15
- data/lib/new_relic/agent/transaction_metrics.rb +10 -9
- data/lib/new_relic/agent/transaction_sampler.rb +5 -6
- data/lib/new_relic/agent/transaction_time_aggregator.rb +26 -25
- data/lib/new_relic/agent/utilization/aws.rb +33 -3
- data/lib/new_relic/agent/utilization/azure.rb +3 -3
- data/lib/new_relic/agent/utilization/gcp.rb +7 -7
- data/lib/new_relic/agent/utilization/pcf.rb +5 -4
- data/lib/new_relic/agent/utilization/vendor.rb +43 -28
- data/lib/new_relic/agent/utilization_data.rb +7 -5
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +2 -2
- data/lib/new_relic/agent/vm/mri_vm.rb +40 -15
- data/lib/new_relic/agent/vm/snapshot.rb +5 -5
- data/lib/new_relic/agent/vm.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +10 -12
- data/lib/new_relic/agent.rb +64 -75
- data/lib/new_relic/cli/command.rb +20 -22
- data/lib/new_relic/cli/commands/deployments.rb +92 -42
- data/lib/new_relic/cli/commands/install.rb +12 -15
- data/lib/new_relic/coerce.rb +15 -13
- data/lib/new_relic/collection_helper.rb +50 -48
- data/lib/new_relic/constants.rb +1 -4
- data/lib/new_relic/control/class_methods.rb +3 -3
- data/lib/new_relic/control/frameworks/external.rb +2 -2
- data/lib/new_relic/control/frameworks/rails.rb +23 -17
- data/lib/new_relic/control/frameworks/rails3.rb +3 -4
- data/lib/new_relic/control/frameworks/rails4.rb +1 -1
- data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
- data/lib/new_relic/control/frameworks/ruby.rb +3 -3
- data/lib/new_relic/control/frameworks/sinatra.rb +7 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/instance_methods.rb +23 -45
- data/lib/new_relic/control/instrumentation.rb +39 -11
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +3 -4
- data/lib/new_relic/control.rb +1 -2
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +126 -19
- data/lib/new_relic/environment_report.rb +40 -32
- data/lib/new_relic/helper.rb +48 -7
- data/lib/new_relic/language_support.rb +29 -5
- data/lib/new_relic/latest_changes.rb +7 -6
- data/lib/new_relic/local_environment.rb +24 -18
- data/lib/new_relic/metric_data.rb +31 -26
- data/lib/new_relic/metric_spec.rb +8 -6
- data/lib/new_relic/noticed_error.rb +22 -30
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +5 -3
- data/lib/new_relic/rack/browser_monitoring.rb +133 -123
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +3 -61
- data/lib/new_relic/recipes/capistrano_legacy.rb +23 -26
- data/lib/new_relic/recipes/helpers/send_deployment.rb +69 -0
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +9 -10
- data/lib/new_relic/traced_thread.rb +35 -0
- data/lib/new_relic/version.rb +6 -17
- data/lib/newrelic_rpm.rb +11 -35
- data/lib/sequel/extensions/newrelic_instrumentation.rb +12 -15
- data/lib/sequel/plugins/newrelic_instrumentation.rb +4 -10
- data/lib/tasks/all.rb +3 -3
- data/lib/tasks/config.rake +22 -117
- data/lib/tasks/coverage_report.rake +28 -0
- data/lib/tasks/helpers/config.html.erb +21 -0
- data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -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 +4 -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 +124 -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 +5 -32
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +10 -15
- data/newrelic.yml +648 -3
- data/newrelic_rpm.gemspec +25 -25
- data/recipes/newrelic.rb +2 -2
- data/test/agent_helper.rb +219 -178
- metadata +164 -122
- data/ROADMAP.md +0 -24
- data/bin/mongrel_rpm +0 -33
- data/cert/cacert.pem +0 -1177
- 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/instrumentation/excon/connection.rb +0 -49
- data/lib/new_relic/agent/instrumentation/http.rb +0 -49
- 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 -70
- 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/supported_versions.rb +0 -275
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/tasks/config.html.erb +0 -32
@@ -1,6 +1,10 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
require_relative 'typhoeus/instrumentation'
|
6
|
+
require_relative 'typhoeus/chain'
|
7
|
+
require_relative 'typhoeus/prepend'
|
4
8
|
|
5
9
|
DependencyDetection.defer do
|
6
10
|
named :typhoeus
|
@@ -10,11 +14,11 @@ DependencyDetection.defer do
|
|
10
14
|
end
|
11
15
|
|
12
16
|
depends_on do
|
13
|
-
NewRelic::Agent::Instrumentation::
|
17
|
+
NewRelic::Agent::Instrumentation::Typhoeus.is_supported_version?
|
14
18
|
end
|
15
19
|
|
16
20
|
executes do
|
17
|
-
::NewRelic::Agent.logger.info
|
21
|
+
::NewRelic::Agent.logger.info('Installing Typhoeus instrumentation')
|
18
22
|
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
19
23
|
require 'new_relic/agent/http_clients/typhoeus_wrappers'
|
20
24
|
end
|
@@ -22,7 +26,7 @@ DependencyDetection.defer do
|
|
22
26
|
# Basic request tracing
|
23
27
|
executes do
|
24
28
|
Typhoeus.before do |request|
|
25
|
-
NewRelic::Agent::Instrumentation::
|
29
|
+
NewRelic::Agent::Instrumentation::Typhoeus.trace(request)
|
26
30
|
|
27
31
|
# Ensure that we always return a truthy value from the before block,
|
28
32
|
# otherwise Typhoeus will bail out of the instrumentation.
|
@@ -32,93 +36,10 @@ DependencyDetection.defer do
|
|
32
36
|
|
33
37
|
# Apply single TT node for Hydra requests until async support
|
34
38
|
executes do
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
name: NewRelic::Agent::Instrumentation::TyphoeusTracing::HYDRA_SEGMENT_NAME
|
40
|
-
)
|
41
|
-
|
42
|
-
instance_variable_set :@__newrelic_hydra_segment, segment
|
43
|
-
|
44
|
-
begin
|
45
|
-
run_without_newrelic(*args)
|
46
|
-
ensure
|
47
|
-
segment.finish if segment
|
48
|
-
end
|
49
|
-
end
|
50
|
-
|
51
|
-
alias run_without_newrelic run
|
52
|
-
alias run run_with_newrelic
|
53
|
-
end
|
54
|
-
end
|
55
|
-
end
|
56
|
-
|
57
|
-
|
58
|
-
module NewRelic
|
59
|
-
module Agent
|
60
|
-
module Instrumentation
|
61
|
-
module TyphoeusTracing
|
62
|
-
|
63
|
-
HYDRA_SEGMENT_NAME = "External/Multiple/Typhoeus::Hydra/run"
|
64
|
-
NOTICIBLE_ERROR_CLASS = "Typhoeus::Errors::TyphoeusError"
|
65
|
-
|
66
|
-
EARLIEST_VERSION = Gem::Version.new("0.5.3")
|
67
|
-
def self.is_supported_version?
|
68
|
-
Gem::Version.new(Typhoeus::VERSION) >= NewRelic::Agent::Instrumentation::TyphoeusTracing::EARLIEST_VERSION
|
69
|
-
end
|
70
|
-
|
71
|
-
def self.request_is_hydra_enabled?(request)
|
72
|
-
request.respond_to?(:hydra) && request.hydra
|
73
|
-
end
|
74
|
-
|
75
|
-
def self.response_message(response)
|
76
|
-
if response.respond_to?(:response_message)
|
77
|
-
response.response_message
|
78
|
-
elsif response.respond_to?(:return_message)
|
79
|
-
response.return_message
|
80
|
-
else
|
81
|
-
# 0.5.4 seems to have lost xxxx_message methods altogether.
|
82
|
-
"timeout"
|
83
|
-
end
|
84
|
-
end
|
85
|
-
|
86
|
-
def self.trace(request)
|
87
|
-
state = NewRelic::Agent::Tracer.state
|
88
|
-
return unless state.is_execution_traced?
|
89
|
-
|
90
|
-
wrapped_request = ::NewRelic::Agent::HTTPClients::TyphoeusHTTPRequest.new(request)
|
91
|
-
|
92
|
-
parent = if request_is_hydra_enabled?(request)
|
93
|
-
request.hydra.instance_variable_get(:@__newrelic_hydra_segment)
|
94
|
-
end
|
95
|
-
|
96
|
-
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
97
|
-
library: wrapped_request.type,
|
98
|
-
uri: wrapped_request.uri,
|
99
|
-
procedure: wrapped_request.method,
|
100
|
-
parent: parent
|
101
|
-
)
|
102
|
-
|
103
|
-
segment.add_request_headers wrapped_request
|
104
|
-
|
105
|
-
callback = Proc.new do
|
106
|
-
wrapped_response = HTTPClients::TyphoeusHTTPResponse.new(request.response)
|
107
|
-
|
108
|
-
segment.process_response_headers wrapped_response
|
109
|
-
|
110
|
-
if request.response.code == 0
|
111
|
-
segment.notice_error NoticibleError.new NOTICIBLE_ERROR_CLASS, response_message(request.response)
|
112
|
-
end
|
113
|
-
|
114
|
-
segment.finish if segment
|
115
|
-
end
|
116
|
-
request.on_complete.unshift(callback)
|
117
|
-
|
118
|
-
rescue => e
|
119
|
-
NewRelic::Agent.logger.error("Exception during trace setup for Typhoeus request", e)
|
120
|
-
end
|
121
|
-
end
|
39
|
+
if use_prepend?
|
40
|
+
prepend_instrument Typhoeus::Hydra, NewRelic::Agent::Instrumentation::Typhoeus::Prepend
|
41
|
+
else
|
42
|
+
chain_instrument NewRelic::Agent::Instrumentation::Typhoeus::Chain
|
122
43
|
end
|
123
44
|
end
|
124
45
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
# This is the base class for all errors that we want to record through the
|
6
6
|
# NewRelic::Agent::ErrorCollector#notice_agent_error API. It provides the
|
@@ -10,7 +10,7 @@
|
|
10
10
|
module NewRelic
|
11
11
|
module Agent
|
12
12
|
class InternalAgentError < StandardError
|
13
|
-
def initialize(msg=nil)
|
13
|
+
def initialize(msg = nil)
|
14
14
|
super("Ruby agent internal error. Please contact support referencing this error.\n #{msg}")
|
15
15
|
end
|
16
16
|
end
|
@@ -1,6 +1,6 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
4
|
|
5
5
|
require 'base64'
|
6
6
|
require 'json'
|
@@ -8,7 +8,7 @@ require 'new_relic/agent/obfuscator'
|
|
8
8
|
|
9
9
|
module NewRelic
|
10
10
|
module Agent
|
11
|
-
class
|
11
|
+
class JavaScriptInstrumentor
|
12
12
|
include NewRelic::Coerce
|
13
13
|
|
14
14
|
RUM_KEY_LENGTH = 13
|
@@ -19,8 +19,8 @@ module NewRelic
|
|
19
19
|
|
20
20
|
def log_configuration
|
21
21
|
NewRelic::Agent.logger.debug("JS agent loader requested: #{NewRelic::Agent.config[:'browser_monitoring.loader']}",
|
22
|
-
|
23
|
-
|
22
|
+
"JS agent loader debug: #{NewRelic::Agent.config[:'browser_monitoring.debug']}",
|
23
|
+
"JS agent loader version: #{NewRelic::Agent.config[:'browser_monitoring.loader_version']}")
|
24
24
|
|
25
25
|
if !NewRelic::Agent.config[:'rum.enabled']
|
26
26
|
NewRelic::Agent.logger.debug("Real User Monitoring is disabled for this agent. Edit your configuration to change this.")
|
@@ -38,43 +38,43 @@ module NewRelic
|
|
38
38
|
def js_enabled_and_ready?
|
39
39
|
if !enabled?
|
40
40
|
::NewRelic::Agent.logger.log_once(:debug, :js_agent_disabled,
|
41
|
-
|
41
|
+
"JS agent instrumentation is disabled.")
|
42
42
|
false
|
43
43
|
elsif missing_config?(:js_agent_loader)
|
44
44
|
::NewRelic::Agent.logger.log_once(:debug, :missing_js_agent_loader,
|
45
|
-
|
45
|
+
"Missing :js_agent_loader. Skipping browser instrumentation.")
|
46
46
|
false
|
47
47
|
elsif missing_config?(:beacon)
|
48
48
|
::NewRelic::Agent.logger.log_once(:debug, :missing_beacon,
|
49
|
-
|
49
|
+
"Beacon configuration not received (yet?). Skipping browser instrumentation.")
|
50
50
|
false
|
51
51
|
elsif missing_config?(:browser_key)
|
52
52
|
::NewRelic::Agent.logger.log_once(:debug, :missing_browser_key,
|
53
|
-
|
53
|
+
"Browser key is not set. Skipping browser instrumentation.")
|
54
54
|
false
|
55
55
|
else
|
56
56
|
true
|
57
57
|
end
|
58
58
|
rescue => e
|
59
|
-
::NewRelic::Agent.logger.debug
|
59
|
+
::NewRelic::Agent.logger.debug("Failure during 'js_enabled_and_ready?'", e)
|
60
60
|
false
|
61
61
|
end
|
62
62
|
|
63
63
|
def insert_js?(state)
|
64
64
|
if !state.current_transaction
|
65
|
-
::NewRelic::Agent.logger.debug
|
65
|
+
::NewRelic::Agent.logger.debug("Not in transaction. Skipping browser instrumentation.")
|
66
66
|
false
|
67
67
|
elsif !state.is_execution_traced?
|
68
|
-
::NewRelic::Agent.logger.debug
|
68
|
+
::NewRelic::Agent.logger.debug("Execution is not traced. Skipping browser instrumentation.")
|
69
69
|
false
|
70
70
|
elsif state.current_transaction.ignore_enduser?
|
71
|
-
::NewRelic::Agent.logger.debug
|
71
|
+
::NewRelic::Agent.logger.debug("Ignore end user for this transaction is set. Skipping browser instrumentation.")
|
72
72
|
false
|
73
73
|
else
|
74
74
|
true
|
75
75
|
end
|
76
76
|
rescue => e
|
77
|
-
::NewRelic::Agent.logger.debug
|
77
|
+
::NewRelic::Agent.logger.debug("Failure during insert_js", e)
|
78
78
|
false
|
79
79
|
end
|
80
80
|
|
@@ -83,72 +83,78 @@ module NewRelic
|
|
83
83
|
value.nil? || value.empty?
|
84
84
|
end
|
85
85
|
|
86
|
-
def browser_timing_header #THREAD_LOCAL_ACCESS
|
86
|
+
def browser_timing_header(nonce = nil) # THREAD_LOCAL_ACCESS
|
87
87
|
return '' unless js_enabled_and_ready? # fast exit
|
88
88
|
|
89
89
|
state = NewRelic::Agent::Tracer.state
|
90
90
|
|
91
91
|
return '' unless insert_js?(state) # slower exit
|
92
92
|
|
93
|
-
bt_config = browser_timing_config(state)
|
93
|
+
bt_config = browser_timing_config(state, nonce)
|
94
94
|
return '' if bt_config.empty?
|
95
95
|
|
96
|
-
bt_config + browser_timing_loader
|
96
|
+
bt_config + browser_timing_loader(nonce)
|
97
97
|
rescue => e
|
98
|
-
::NewRelic::Agent.logger.debug
|
98
|
+
::NewRelic::Agent.logger.debug("Failure during RUM browser_timing_header construction", e)
|
99
99
|
''
|
100
100
|
end
|
101
101
|
|
102
|
-
def browser_timing_loader
|
103
|
-
html_safe_if_needed("\n<script>#{Agent.config[:js_agent_loader]}</script>")
|
102
|
+
def browser_timing_loader(nonce = nil)
|
103
|
+
html_safe_if_needed("\n<script type=\"text/javascript\"#{create_nonce(nonce)}>#{Agent.config[:js_agent_loader]}</script>")
|
104
104
|
end
|
105
105
|
|
106
|
-
def browser_timing_config(state)
|
106
|
+
def browser_timing_config(state, nonce = nil)
|
107
107
|
txn = state.current_transaction
|
108
108
|
return '' if txn.nil?
|
109
109
|
|
110
110
|
txn.freeze_name_and_execute_if_not_ignored do
|
111
111
|
data = data_for_js_agent(txn)
|
112
112
|
json = ::JSON.dump(data)
|
113
|
-
return html_safe_if_needed("\n<script>window.NREUM||(NREUM={});NREUM.info=#{json}</script>")
|
113
|
+
return html_safe_if_needed("\n<script type=\"text/javascript\"#{create_nonce(nonce)}>window.NREUM||(NREUM={});NREUM.info=#{json}</script>")
|
114
114
|
end
|
115
115
|
|
116
116
|
''
|
117
117
|
end
|
118
118
|
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
119
|
+
def create_nonce(nonce = nil)
|
120
|
+
return '' unless nonce
|
121
|
+
|
122
|
+
" nonce=\"#{nonce.to_s}\""
|
123
|
+
end
|
124
|
+
|
125
|
+
BEACON_KEY = "beacon".freeze
|
126
|
+
ERROR_BEACON_KEY = "errorBeacon".freeze
|
127
|
+
LICENSE_KEY_KEY = "licenseKey".freeze
|
128
|
+
APPLICATIONID_KEY = "applicationID".freeze
|
123
129
|
TRANSACTION_NAME_KEY = "transactionName".freeze
|
124
|
-
QUEUE_TIME_KEY
|
130
|
+
QUEUE_TIME_KEY = "queueTime".freeze
|
125
131
|
APPLICATION_TIME_KEY = "applicationTime".freeze
|
126
|
-
AGENT_KEY
|
127
|
-
SSL_FOR_HTTP_KEY
|
128
|
-
ATTS_KEY
|
129
|
-
ATTS_USER_SUBKEY
|
130
|
-
ATTS_AGENT_SUBKEY
|
132
|
+
AGENT_KEY = "agent".freeze
|
133
|
+
SSL_FOR_HTTP_KEY = "sslForHttp".freeze
|
134
|
+
ATTS_KEY = "atts".freeze
|
135
|
+
ATTS_USER_SUBKEY = "u".freeze
|
136
|
+
ATTS_AGENT_SUBKEY = "a".freeze
|
131
137
|
|
132
138
|
# NOTE: Internal prototyping may override this, so leave name stable!
|
133
139
|
def data_for_js_agent(transaction)
|
134
|
-
queue_time_in_seconds = [transaction.queue_time
|
135
|
-
start_time_in_seconds = [transaction.start_time
|
136
|
-
app_time_in_seconds
|
140
|
+
queue_time_in_seconds = [transaction.queue_time, 0.0].max
|
141
|
+
start_time_in_seconds = [transaction.start_time, 0.0].max
|
142
|
+
app_time_in_seconds = Process.clock_gettime(Process::CLOCK_REALTIME) - start_time_in_seconds
|
137
143
|
|
138
144
|
queue_time_in_millis = (1000.0 * queue_time_in_seconds).round
|
139
|
-
app_time_in_millis
|
145
|
+
app_time_in_millis = (1000.0 * app_time_in_seconds).round
|
140
146
|
|
141
147
|
transaction_name = transaction.best_name || ::NewRelic::Agent::UNKNOWN_METRIC
|
142
148
|
|
143
149
|
data = {
|
144
|
-
BEACON_KEY
|
145
|
-
ERROR_BEACON_KEY
|
146
|
-
LICENSE_KEY_KEY
|
147
|
-
APPLICATIONID_KEY
|
150
|
+
BEACON_KEY => NewRelic::Agent.config[:beacon],
|
151
|
+
ERROR_BEACON_KEY => NewRelic::Agent.config[:error_beacon],
|
152
|
+
LICENSE_KEY_KEY => NewRelic::Agent.config[:browser_key],
|
153
|
+
APPLICATIONID_KEY => NewRelic::Agent.config[:application_id],
|
148
154
|
TRANSACTION_NAME_KEY => obfuscator.obfuscate(transaction_name),
|
149
|
-
QUEUE_TIME_KEY
|
155
|
+
QUEUE_TIME_KEY => queue_time_in_millis,
|
150
156
|
APPLICATION_TIME_KEY => app_time_in_millis,
|
151
|
-
AGENT_KEY
|
157
|
+
AGENT_KEY => NewRelic::Agent.config[:js_agent_file]
|
152
158
|
}
|
153
159
|
|
154
160
|
add_ssl_for_http(data)
|
@@ -0,0 +1,44 @@
|
|
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
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
#
|
8
|
+
# This module contains helper methods related to gathering linking
|
9
|
+
# metadata for use with logs in context.
|
10
|
+
module LinkingMetadata
|
11
|
+
extend self
|
12
|
+
|
13
|
+
def append_service_linking_metadata(metadata)
|
14
|
+
raise ArgumentError, "Missing argument `metadata`" if metadata.nil?
|
15
|
+
|
16
|
+
config = ::NewRelic::Agent.config
|
17
|
+
|
18
|
+
metadata[ENTITY_NAME_KEY] = config[:app_name][0]
|
19
|
+
metadata[ENTITY_TYPE_KEY] = ENTITY_TYPE
|
20
|
+
metadata[HOSTNAME_KEY] = Hostname.get
|
21
|
+
|
22
|
+
if entity_guid = config[:entity_guid]
|
23
|
+
metadata[ENTITY_GUID_KEY] = entity_guid
|
24
|
+
end
|
25
|
+
|
26
|
+
metadata
|
27
|
+
end
|
28
|
+
|
29
|
+
def append_trace_linking_metadata(metadata)
|
30
|
+
raise ArgumentError, "Missing argument `metadata`" if metadata.nil?
|
31
|
+
|
32
|
+
if trace_id = Tracer.current_trace_id
|
33
|
+
metadata[TRACE_ID_KEY] = trace_id
|
34
|
+
end
|
35
|
+
|
36
|
+
if span_id = Tracer.current_span_id
|
37
|
+
metadata[SPAN_ID_KEY] = span_id
|
38
|
+
end
|
39
|
+
|
40
|
+
metadata
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
@@ -0,0 +1,37 @@
|
|
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
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
# This module contains helper methods related to decorating log messages
|
8
|
+
module LocalLogDecorator
|
9
|
+
extend self
|
10
|
+
|
11
|
+
def decorate(message)
|
12
|
+
return message unless decorating_enabled?
|
13
|
+
|
14
|
+
metadata = NewRelic::Agent.linking_metadata
|
15
|
+
formatted_metadata = " NR-LINKING|#{metadata[ENTITY_GUID_KEY]}|#{metadata[HOSTNAME_KEY]}|" \
|
16
|
+
"#{metadata[TRACE_ID_KEY]}|#{metadata[SPAN_ID_KEY]}|" \
|
17
|
+
"#{escape_entity_name(metadata[ENTITY_NAME_KEY])}|"
|
18
|
+
|
19
|
+
message.partition("\n").insert(1, formatted_metadata).join
|
20
|
+
end
|
21
|
+
|
22
|
+
private
|
23
|
+
|
24
|
+
def decorating_enabled?
|
25
|
+
NewRelic::Agent.config[:'application_logging.enabled'] &&
|
26
|
+
NewRelic::Agent::Instrumentation::Logger.enabled? &&
|
27
|
+
NewRelic::Agent.config[:'application_logging.local_decorating.enabled']
|
28
|
+
end
|
29
|
+
|
30
|
+
def escape_entity_name(entity_name)
|
31
|
+
return unless entity_name
|
32
|
+
|
33
|
+
URI::DEFAULT_PARSER.escape(entity_name)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
@@ -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
|