newrelic_rpm 6.15.0 → 9.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.build_ignore +26 -0
- data/CHANGELOG.md +4176 -2789
- data/CONTRIBUTING.md +32 -13
- data/Gemfile +1 -2
- data/LICENSE +0 -6
- data/README.md +29 -22
- data/Rakefile +33 -35
- data/THIRD_PARTY_NOTICES.md +14 -199
- data/Thorfile +5 -0
- data/bin/newrelic +4 -9
- data/bin/newrelic_rpm +15 -0
- data/bin/nrdebug +85 -62
- data/init.rb +6 -8
- data/install.rb +2 -2
- data/lib/new_relic/agent/adaptive_sampler.rb +13 -9
- data/lib/new_relic/agent/agent.rb +99 -941
- 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 +27 -23
- data/lib/new_relic/agent/attribute_filter.rb +67 -50
- data/lib/new_relic/agent/attribute_pre_filtering.rb +109 -0
- data/lib/new_relic/agent/attribute_processing.rb +9 -9
- data/lib/new_relic/agent/attributes.rb +5 -4
- data/lib/new_relic/agent/audit_logger.rb +13 -8
- data/lib/new_relic/agent/autostart.rb +21 -20
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +4 -4
- data/lib/new_relic/agent/commands/agent_command_router.rb +15 -13
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +16 -14
- data/lib/new_relic/agent/configuration/default_source.rb +1608 -1182
- data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
- data/lib/new_relic/agent/configuration/environment_source.rb +13 -11
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +40 -17
- data/lib/new_relic/agent/configuration/high_security_source.rb +11 -12
- data/lib/new_relic/agent/configuration/manager.rb +103 -75
- 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 +92 -95
- data/lib/new_relic/agent/configuration/server_source.rb +43 -41
- data/lib/new_relic/agent/configuration/yaml_source.rb +47 -10
- 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 +42 -16
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +5 -6
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +16 -15
- data/lib/new_relic/agent/database/obfuscator.rb +4 -4
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
- data/lib/new_relic/agent/database.rb +45 -53
- data/lib/new_relic/agent/database_adapter.rb +3 -1
- data/lib/new_relic/agent/datastores/metric_helper.rb +21 -22
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +17 -21
- 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 +9 -15
- data/lib/new_relic/agent/datastores.rb +13 -15
- 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 +45 -40
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -22
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +23 -23
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +52 -54
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +10 -11
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +82 -83
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +42 -41
- data/lib/new_relic/agent/distributed_tracing.rb +33 -101
- data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
- data/lib/new_relic/agent/error_collector.rb +105 -58
- 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 +9 -7
- 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 +27 -25
- data/lib/new_relic/agent/external.rb +11 -44
- data/lib/new_relic/agent/guid_generator.rb +13 -11
- data/lib/new_relic/agent/harvester.rb +5 -8
- data/lib/new_relic/agent/heap.rb +8 -9
- data/lib/new_relic/agent/hostname.rb +21 -14
- data/lib/new_relic/agent/http_clients/abstract.rb +22 -31
- data/lib/new_relic/agent/http_clients/async_http_wrappers.rb +80 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +14 -17
- data/lib/new_relic/agent/http_clients/ethon_wrappers.rb +109 -0
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +15 -17
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +7 -6
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +8 -9
- data/lib/new_relic/agent/http_clients/httpx_wrappers.rb +91 -0
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +13 -8
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +12 -13
- data/lib/new_relic/agent/http_clients/uri_util.rb +3 -5
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +9 -22
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +42 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +41 -33
- 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 +20 -21
- data/lib/new_relic/agent/instrumentation/active_job.rb +33 -13
- data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
- data/lib/new_relic/agent/instrumentation/active_record.rb +41 -38
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +87 -75
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +54 -66
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +6 -6
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +30 -22
- data/lib/new_relic/agent/instrumentation/active_storage.rb +7 -3
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +8 -33
- data/lib/new_relic/agent/instrumentation/active_support.rb +27 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/instrumentation.rb +13 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/prepend.rb +37 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +24 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +26 -0
- data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/async_http/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/async_http/instrumentation.rb +37 -0
- data/lib/new_relic/agent/instrumentation/async_http/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/async_http.rb +28 -0
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +159 -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/concurrent_ruby/chain.rb +36 -0
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +20 -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 +74 -63
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +225 -0
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
- data/lib/new_relic/agent/instrumentation/curb.rb +14 -246
- 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 +51 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +30 -53
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +70 -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/ethon/chain.rb +39 -0
- data/lib/new_relic/agent/instrumentation/ethon/instrumentation.rb +105 -0
- data/lib/new_relic/agent/instrumentation/ethon/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/ethon.rb +39 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +11 -7
- data/lib/new_relic/agent/instrumentation/excon.rb +27 -29
- data/lib/new_relic/agent/instrumentation/fiber/chain.rb +27 -0
- data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +20 -0
- data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +25 -0
- data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +104 -0
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/grape.rb +16 -117
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +94 -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 +138 -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 +41 -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 +34 -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/httpx/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/httpx/instrumentation.rb +51 -0
- data/lib/new_relic/agent/instrumentation/httpx/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpx.rb +27 -0
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +5 -6
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +69 -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 +59 -128
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +99 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +103 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +58 -74
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +15 -14
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +6 -8
- data/lib/new_relic/agent/instrumentation/mongo.rb +6 -137
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +24 -23
- 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} +18 -14
- 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 +56 -10
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +32 -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 +6 -6
- 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 +81 -0
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +32 -142
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +25 -56
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +9 -8
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +18 -5
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +8 -5
- 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 +146 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +17 -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 +98 -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 +19 -108
- 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 +38 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +32 -43
- data/lib/new_relic/agent/instrumentation/roda/chain.rb +43 -0
- data/lib/new_relic/agent/instrumentation/roda/ignorer.rb +45 -0
- data/lib/new_relic/agent/instrumentation/roda/instrumentation.rb +68 -0
- data/lib/new_relic/agent/instrumentation/roda/prepend.rb +24 -0
- data/lib/new_relic/agent/instrumentation/roda/roda_transaction_namer.rb +29 -0
- data/lib/new_relic/agent/instrumentation/roda.rb +36 -0
- data/lib/new_relic/agent/instrumentation/sequel.rb +16 -19
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +12 -12
- data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +24 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +60 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +27 -65
- 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 +130 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +4 -6
- data/lib/new_relic/agent/instrumentation/sinatra.rb +34 -163
- data/lib/new_relic/agent/instrumentation/stripe.rb +28 -0
- data/lib/new_relic/agent/instrumentation/stripe_subscriber.rb +77 -0
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +24 -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 +46 -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 +84 -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/view_component/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/view_component/instrumentation.rb +39 -0
- data/lib/new_relic/agent/instrumentation/view_component/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/view_component.rb +26 -0
- 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 +58 -48
- 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 +282 -0
- data/lib/new_relic/agent/log_event_attributes.rb +115 -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 +95 -52
- data/lib/new_relic/agent/memory_logger.rb +2 -2
- data/lib/new_relic/agent/messaging.rb +72 -86
- data/lib/new_relic/agent/method_tracer.rb +159 -154
- data/lib/new_relic/agent/method_tracer_helpers.rb +109 -11
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +26 -19
- 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 +17 -9
- data/lib/new_relic/agent/monitors.rb +6 -7
- data/lib/new_relic/agent/new_relic_service/encoders.rb +9 -9
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +6 -6
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +4 -4
- data/lib/new_relic/agent/new_relic_service.rb +282 -213
- 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 +7 -11
- data/lib/new_relic/agent/parameter_filtering.rb +29 -15
- data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
- data/lib/new_relic/agent/pipe_channel_manager.rb +34 -23
- data/lib/new_relic/agent/pipe_service.rb +13 -8
- data/lib/new_relic/agent/prepend_supportability.rb +2 -2
- data/lib/new_relic/agent/priority_sampled_buffer.rb +9 -12
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +12 -14
- data/lib/new_relic/agent/rules_engine.rb +6 -5
- data/lib/new_relic/agent/sampler.rb +5 -5
- data/lib/new_relic/agent/sampler_collection.rb +4 -5
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +8 -7
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +20 -17
- data/lib/new_relic/agent/samplers/memory_sampler.rb +32 -21
- data/lib/new_relic/agent/samplers/object_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
- data/lib/new_relic/agent/span_event_aggregator.rb +15 -15
- data/lib/new_relic/agent/span_event_primitive.rb +77 -59
- data/lib/new_relic/agent/sql_sampler.rb +20 -21
- data/lib/new_relic/agent/stats.rb +79 -42
- 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 +8 -9
- data/lib/new_relic/agent/system_info.rb +113 -67
- 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 +17 -21
- data/lib/new_relic/agent/threading/thread_profile.rb +24 -24
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +2 -2
- data/lib/new_relic/agent/tracer.rb +101 -96
- data/lib/new_relic/agent/transaction/abstract_segment.rb +176 -52
- data/lib/new_relic/agent/transaction/datastore_segment.rb +22 -18
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +65 -57
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +46 -48
- data/lib/new_relic/agent/transaction/external_request_segment.rb +52 -39
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +31 -37
- data/lib/new_relic/agent/transaction/request_attributes.rb +78 -42
- data/lib/new_relic/agent/transaction/segment.rb +20 -10
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +2 -2
- data/lib/new_relic/agent/transaction/trace.rb +16 -12
- 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 +30 -28
- data/lib/new_relic/agent/transaction/tracing.rb +32 -13
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +6 -6
- data/lib/new_relic/agent/transaction.rb +229 -178
- data/lib/new_relic/agent/transaction_error_primitive.rb +43 -25
- data/lib/new_relic/agent/transaction_event_aggregator.rb +16 -16
- data/lib/new_relic/agent/transaction_event_primitive.rb +51 -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 +7 -8
- data/lib/new_relic/agent/transaction_time_aggregator.rb +32 -27
- data/lib/new_relic/agent/utilization/aws.rb +34 -4
- data/lib/new_relic/agent/utilization/azure.rb +6 -6
- data/lib/new_relic/agent/utilization/gcp.rb +11 -13
- data/lib/new_relic/agent/utilization/pcf.rb +6 -5
- data/lib/new_relic/agent/utilization/vendor.rb +45 -32
- data/lib/new_relic/agent/utilization_data.rb +7 -5
- data/lib/new_relic/agent/vm/c_ruby_vm.rb +99 -0
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +3 -3
- data/lib/new_relic/agent/vm/snapshot.rb +5 -5
- data/lib/new_relic/agent/vm.rb +3 -3
- data/lib/new_relic/agent/worker_loop.rb +10 -12
- data/lib/new_relic/agent.rb +204 -111
- data/lib/new_relic/base64.rb +25 -0
- data/lib/new_relic/cli/command.rb +26 -25
- data/lib/new_relic/cli/commands/deployments.rb +100 -49
- data/lib/new_relic/cli/commands/install.rb +31 -34
- data/lib/new_relic/coerce.rb +15 -13
- data/lib/new_relic/collection_helper.rb +50 -48
- data/lib/new_relic/constants.rb +13 -12
- data/lib/new_relic/control/class_methods.rb +6 -12
- data/lib/new_relic/control/frameworks/external.rb +2 -2
- data/lib/new_relic/control/frameworks/rails.rb +60 -30
- 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/roda.rb +20 -0
- 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 +27 -45
- data/lib/new_relic/control/instrumentation.rb +25 -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 +141 -32
- data/lib/new_relic/environment_report.rb +41 -33
- data/lib/new_relic/helper.rb +49 -7
- data/lib/new_relic/language_support.rb +39 -6
- data/lib/new_relic/latest_changes.rb +10 -9
- data/lib/new_relic/local_environment.rb +42 -37
- 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 +43 -46
- data/lib/new_relic/rack/agent_hooks.rb +2 -2
- data/lib/new_relic/rack/agent_middleware.rb +3 -17
- data/lib/new_relic/rack/browser_monitoring.rb +135 -121
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +4 -62
- data/lib/new_relic/recipes/capistrano_legacy.rb +24 -27
- data/lib/new_relic/recipes/helpers/send_deployment.rb +70 -0
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +14 -12
- data/lib/new_relic/traced_thread.rb +38 -0
- data/lib/new_relic/version.rb +6 -17
- data/lib/newrelic_rpm.rb +20 -33
- data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +18 -21
- data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +9 -15
- data/lib/tasks/all.rb +3 -3
- data/lib/tasks/bump_version.rake +21 -0
- data/lib/tasks/config.rake +25 -119
- data/lib/tasks/coverage_report.rake +28 -0
- data/lib/tasks/helpers/config.html.erb +114 -0
- data/lib/tasks/helpers/format.rb +127 -0
- data/lib/tasks/helpers/matches.rb +12 -0
- data/lib/tasks/helpers/newrelicyml.rb +144 -0
- data/lib/tasks/helpers/prompt.rb +24 -0
- data/lib/tasks/helpers/version_bump.rb +62 -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 +21 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +7 -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/newrelic.rb +2 -1
- data/lib/tasks/newrelicyml.rake +13 -0
- data/lib/tasks/tests.rake +83 -17
- data/newrelic.yml +790 -4
- data/newrelic_rpm.gemspec +52 -43
- data/recipes/newrelic.rb +2 -2
- data/test/agent_helper.rb +252 -198
- metadata +275 -95
- data/.gitignore +0 -37
- data/.project +0 -23
- data/.yardopts +0 -26
- data/Guardfile +0 -25
- data/ROADMAP.md +0 -24
- data/bin/mongrel_rpm +0 -33
- data/bin/newrelic_cmd +0 -5
- data/cert/cacert.pem +0 -1177
- data/config/database.yml +0 -5
- data/config.dot +0 -278
- 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/acts_as_solr.rb +0 -75
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -25
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -204
- 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/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/vm/mri_vm.rb +0 -81
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/tasks/config.html.erb +0 -32
- data/lib/tasks/multiverse.rake +0 -2
- data/lib/tasks/multiverse.rb +0 -104
- /data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
@@ -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 'new_relic/agent/configuration/dotted_hash'
|
6
6
|
|
@@ -26,9 +26,10 @@ module NewRelic
|
|
26
26
|
def change_setting(policies, option, new_value)
|
27
27
|
current_value = Agent.config[option]
|
28
28
|
unless current_value == new_value
|
29
|
-
NewRelic::Agent.logger.info \
|
29
|
+
NewRelic::Agent.logger.info( \
|
30
30
|
"Setting changed: {#{option}: from #{current_value} " \
|
31
31
|
"to #{new_value}}. Source: SecurityPolicySource"
|
32
|
+
)
|
32
33
|
end
|
33
34
|
policies[option] = new_value
|
34
35
|
end
|
@@ -50,152 +51,145 @@ module NewRelic
|
|
50
51
|
# permitted by the security policy and is also enabled by the config
|
51
52
|
|
52
53
|
SECURITY_SETTINGS_MAP = {
|
53
|
-
|
54
|
+
'record_sql' => [
|
54
55
|
{
|
55
|
-
option:
|
56
|
-
supported:
|
57
|
-
enabled_fn:
|
56
|
+
option: :'transaction_tracer.record_sql',
|
57
|
+
supported: true,
|
58
|
+
enabled_fn: method(:record_sql_enabled?),
|
58
59
|
disabled_value: 'off',
|
59
|
-
permitted_fn:
|
60
|
+
permitted_fn: proc { |policies|
|
60
61
|
change_setting(policies, :'transaction_tracer.record_sql', 'obfuscated')
|
61
62
|
}
|
62
63
|
},
|
63
64
|
{
|
64
|
-
option:
|
65
|
-
supported:
|
66
|
-
enabled_fn:
|
65
|
+
option: :'slow_sql.record_sql',
|
66
|
+
supported: true,
|
67
|
+
enabled_fn: method(:record_sql_enabled?),
|
67
68
|
disabled_value: 'off',
|
68
|
-
permitted_fn:
|
69
|
+
permitted_fn: proc { |policies|
|
69
70
|
change_setting(policies, :'slow_sql.record_sql', 'obfuscated')
|
70
71
|
}
|
71
72
|
},
|
72
73
|
{
|
73
|
-
option:
|
74
|
-
supported:
|
75
|
-
enabled_fn:
|
74
|
+
option: :'mongo.capture_queries',
|
75
|
+
supported: true,
|
76
|
+
enabled_fn: method(:enabled?),
|
76
77
|
disabled_value: false,
|
77
|
-
permitted_fn:
|
78
|
+
permitted_fn: proc { |policies|
|
78
79
|
change_setting(policies, :'mongo.obfuscate_queries', true)
|
79
80
|
}
|
80
81
|
},
|
81
82
|
{
|
82
|
-
option:
|
83
|
-
supported:
|
84
|
-
enabled_fn:
|
83
|
+
option: :'elasticsearch.capture_queries',
|
84
|
+
supported: true,
|
85
|
+
enabled_fn: method(:enabled?),
|
85
86
|
disabled_value: false,
|
86
|
-
permitted_fn:
|
87
|
+
permitted_fn: proc { |policies|
|
88
|
+
change_setting(policies, :'elasticsearch.obfuscate_queries', true)
|
89
|
+
}
|
90
|
+
},
|
91
|
+
{
|
92
|
+
option: :'transaction_tracer.record_redis_arguments',
|
93
|
+
supported: true,
|
94
|
+
enabled_fn: method(:enabled?),
|
95
|
+
disabled_value: false,
|
96
|
+
permitted_fn: nil
|
87
97
|
}
|
88
98
|
],
|
89
|
-
|
99
|
+
'attributes_include' => [
|
90
100
|
{
|
91
|
-
option:
|
92
|
-
supported:
|
93
|
-
enabled_fn:
|
101
|
+
option: :'attributes.include',
|
102
|
+
supported: true,
|
103
|
+
enabled_fn: method(:not_empty?),
|
94
104
|
disabled_value: [],
|
95
|
-
permitted_fn:
|
105
|
+
permitted_fn: nil
|
96
106
|
},
|
97
107
|
{
|
98
|
-
option:
|
99
|
-
supported:
|
100
|
-
enabled_fn:
|
108
|
+
option: :'transaction_tracer.attributes.include',
|
109
|
+
supported: true,
|
110
|
+
enabled_fn: method(:not_empty?),
|
101
111
|
disabled_value: [],
|
102
|
-
permitted_fn:
|
112
|
+
permitted_fn: nil
|
103
113
|
},
|
104
114
|
{
|
105
|
-
option:
|
106
|
-
supported:
|
107
|
-
enabled_fn:
|
115
|
+
option: :'transaction_events.attributes.include',
|
116
|
+
supported: true,
|
117
|
+
enabled_fn: method(:not_empty?),
|
108
118
|
disabled_value: [],
|
109
|
-
permitted_fn:
|
119
|
+
permitted_fn: nil
|
110
120
|
},
|
111
121
|
{
|
112
|
-
option:
|
113
|
-
supported:
|
114
|
-
enabled_fn:
|
122
|
+
option: :'error_collector.attributes.include',
|
123
|
+
supported: true,
|
124
|
+
enabled_fn: method(:not_empty?),
|
115
125
|
disabled_value: [],
|
116
|
-
permitted_fn:
|
126
|
+
permitted_fn: nil
|
117
127
|
},
|
118
128
|
{
|
119
|
-
option:
|
120
|
-
supported:
|
121
|
-
enabled_fn:
|
129
|
+
option: :'browser_monitoring.attributes.include',
|
130
|
+
supported: true,
|
131
|
+
enabled_fn: method(:not_empty?),
|
122
132
|
disabled_value: [],
|
123
|
-
permitted_fn:
|
133
|
+
permitted_fn: nil
|
124
134
|
},
|
125
135
|
{
|
126
|
-
option:
|
127
|
-
supported:
|
128
|
-
enabled_fn:
|
136
|
+
option: :'span_events.attributes.include',
|
137
|
+
supported: true,
|
138
|
+
enabled_fn: method(:not_empty?),
|
129
139
|
disabled_value: [],
|
130
|
-
permitted_fn:
|
140
|
+
permitted_fn: nil
|
131
141
|
},
|
132
142
|
{
|
133
|
-
option:
|
134
|
-
supported:
|
135
|
-
enabled_fn:
|
143
|
+
option: :'transaction_segments.attributes.include',
|
144
|
+
supported: true,
|
145
|
+
enabled_fn: method(:not_empty?),
|
136
146
|
disabled_value: [],
|
137
|
-
permitted_fn:
|
147
|
+
permitted_fn: nil
|
138
148
|
}
|
139
149
|
],
|
140
|
-
|
150
|
+
'allow_raw_exception_messages' => [
|
141
151
|
{
|
142
|
-
option:
|
143
|
-
supported:
|
144
|
-
enabled_fn:
|
152
|
+
option: :'strip_exception_messages.enabled',
|
153
|
+
supported: true,
|
154
|
+
enabled_fn: method(:enabled?),
|
145
155
|
disabled_value: false,
|
146
|
-
permitted_fn:
|
156
|
+
permitted_fn: nil
|
147
157
|
}
|
148
158
|
],
|
149
|
-
|
159
|
+
'custom_events' => [
|
150
160
|
{
|
151
|
-
option:
|
152
|
-
supported:
|
153
|
-
enabled_fn:
|
161
|
+
option: :'custom_insights_events.enabled',
|
162
|
+
supported: true,
|
163
|
+
enabled_fn: method(:enabled?),
|
154
164
|
disabled_value: false,
|
155
|
-
permitted_fn:
|
165
|
+
permitted_fn: nil
|
156
166
|
}
|
157
167
|
],
|
158
|
-
|
168
|
+
'custom_parameters' => [
|
159
169
|
{
|
160
|
-
option:
|
161
|
-
supported:
|
162
|
-
enabled_fn:
|
170
|
+
option: :'custom_attributes.enabled',
|
171
|
+
supported: true,
|
172
|
+
enabled_fn: method(:enabled?),
|
163
173
|
disabled_value: false,
|
164
|
-
permitted_fn:
|
174
|
+
permitted_fn: nil
|
165
175
|
}
|
166
176
|
],
|
167
|
-
|
177
|
+
'custom_instrumentation_editor' => [
|
168
178
|
{
|
169
|
-
option:
|
170
|
-
supported:
|
171
|
-
enabled_fn:
|
179
|
+
option: nil,
|
180
|
+
supported: false,
|
181
|
+
enabled_fn: nil,
|
172
182
|
disabled_value: nil,
|
173
|
-
permitted_fn:
|
174
|
-
}
|
175
|
-
],
|
176
|
-
"message_parameters" => [
|
177
|
-
{
|
178
|
-
option: :'message_tracer.segment_parameters.enabled',
|
179
|
-
supported: true,
|
180
|
-
enabled_fn: method(:enabled?),
|
181
|
-
disabled_value: false,
|
182
|
-
permitted_fn: nil
|
183
|
+
permitted_fn: nil
|
183
184
|
}
|
184
185
|
],
|
185
|
-
|
186
|
-
{
|
187
|
-
option: :'resque.capture_params',
|
188
|
-
supported: true,
|
189
|
-
enabled_fn: method(:enabled?),
|
190
|
-
disabled_value: false,
|
191
|
-
permitted_fn: nil
|
192
|
-
},
|
186
|
+
'message_parameters' => [
|
193
187
|
{
|
194
|
-
option:
|
195
|
-
supported:
|
196
|
-
enabled_fn:
|
188
|
+
option: :'message_tracer.segment_parameters.enabled',
|
189
|
+
supported: true,
|
190
|
+
enabled_fn: method(:enabled?),
|
197
191
|
disabled_value: false,
|
198
|
-
permitted_fn:
|
192
|
+
permitted_fn: nil
|
199
193
|
}
|
200
194
|
]
|
201
195
|
}
|
@@ -204,13 +198,14 @@ module NewRelic
|
|
204
198
|
super(build_overrides(security_policies))
|
205
199
|
end
|
206
200
|
|
207
|
-
ENABLED =
|
208
|
-
COLON_COLON =
|
201
|
+
ENABLED = 'enabled'.freeze
|
202
|
+
COLON_COLON = '::'.freeze
|
209
203
|
|
210
204
|
def build_overrides(security_policies)
|
211
205
|
security_policies.inject({}) do |settings, (policy_name, policy_settings)|
|
212
206
|
SECURITY_SETTINGS_MAP[policy_name].each do |policy|
|
213
207
|
next unless policy[:supported]
|
208
|
+
|
214
209
|
if policy_settings[ENABLED]
|
215
210
|
if policy[:enabled_fn].call(policy[:option])
|
216
211
|
if permitted_fn = policy[:permitted_fn]
|
@@ -218,15 +213,17 @@ module NewRelic
|
|
218
213
|
end
|
219
214
|
else
|
220
215
|
config_source = Agent.config.source(policy[:option]).class.name.split(COLON_COLON).last
|
221
|
-
NewRelic::Agent.logger.info \
|
216
|
+
NewRelic::Agent.logger.info( \
|
222
217
|
"Setting applied: {#{policy[:option]}: #{policy[:disabled_value]}}. " \
|
223
218
|
"Source: #{config_source}"
|
219
|
+
)
|
224
220
|
end
|
225
221
|
else
|
226
|
-
settings[policy[:option]] =
|
227
|
-
NewRelic::Agent.logger.info \
|
222
|
+
settings[policy[:option]] = policy[:disabled_value]
|
223
|
+
NewRelic::Agent.logger.info( \
|
228
224
|
"Setting applied: {#{policy[:option]}: #{policy[:disabled_value]}}. " \
|
229
|
-
|
225
|
+
'Source: SecurityPolicySource'
|
226
|
+
)
|
230
227
|
end
|
231
228
|
end
|
232
229
|
settings
|
@@ -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
|
module NewRelic
|
6
6
|
module Agent
|
@@ -10,30 +10,30 @@ module NewRelic
|
|
10
10
|
# response, but should still be merged in as config settings to the
|
11
11
|
# main agent configuration.
|
12
12
|
TOP_LEVEL_KEYS = [
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
13
|
+
'account_id',
|
14
|
+
'apdex_t',
|
15
|
+
'application_id',
|
16
|
+
'beacon',
|
17
|
+
'browser_key',
|
18
|
+
'browser_monitoring.debug',
|
19
|
+
'browser_monitoring.loader',
|
20
|
+
'browser_monitoring.loader_version',
|
21
|
+
'cross_process_id',
|
22
|
+
'data_report_period',
|
23
|
+
'encoding_key',
|
24
|
+
'entity_guid',
|
25
|
+
'error_beacon',
|
26
|
+
'js_agent_file',
|
27
|
+
'js_agent_loader',
|
28
|
+
'max_payload_size_in_bytes',
|
29
|
+
'primary_application_id',
|
30
|
+
'sampling_target',
|
31
|
+
'sampling_target_period_in_seconds',
|
32
|
+
'trusted_account_ids',
|
33
|
+
'trusted_account_key'
|
34
34
|
]
|
35
35
|
|
36
|
-
def initialize(connect_reply, existing_config={})
|
36
|
+
def initialize(connect_reply, existing_config = {})
|
37
37
|
merged_settings = {}
|
38
38
|
|
39
39
|
merge_top_level_keys(merged_settings, connect_reply)
|
@@ -70,38 +70,40 @@ module NewRelic
|
|
70
70
|
|
71
71
|
def fix_transaction_threshold(merged_settings)
|
72
72
|
# when value is "apdex_f" remove the config and defer to default
|
73
|
-
if merged_settings['transaction_tracer.transaction_threshold'].to_s
|
73
|
+
if /apdex_f/i.match?(merged_settings['transaction_tracer.transaction_threshold'].to_s)
|
74
74
|
merged_settings.delete('transaction_tracer.transaction_threshold')
|
75
75
|
end
|
76
76
|
end
|
77
77
|
|
78
78
|
EVENT_HARVEST_CONFIG_SUPPORTABILITY_METRIC_NAMES = {
|
79
|
-
:'
|
79
|
+
:'transaction_events.max_samples_stored' => 'Supportability/EventHarvest/AnalyticEventData/HarvestLimit',
|
80
80
|
:'custom_insights_events.max_samples_stored' => 'Supportability/EventHarvest/CustomEventData/HarvestLimit',
|
81
|
-
:'error_collector.max_event_samples_stored'=> 'Supportability/EventHarvest/ErrorEventData/HarvestLimit',
|
82
|
-
:'
|
83
|
-
:
|
81
|
+
:'error_collector.max_event_samples_stored' => 'Supportability/EventHarvest/ErrorEventData/HarvestLimit',
|
82
|
+
:'application_logging.forwarding.max_samples_stored' => 'Supportability/EventHarvest/LogEventData/HarvestLimit',
|
83
|
+
:'span_events.max_samples_stored' => 'Supportability/SpanEvent/Limit',
|
84
|
+
:event_report_period => 'Supportability/EventHarvest/ReportPeriod',
|
85
|
+
:'event_report_period.span_event_data' => 'Supportability/SpanEvent/ReportPeriod'
|
84
86
|
}
|
85
87
|
|
86
88
|
def add_event_harvest_config(merged_settings, connect_reply)
|
87
|
-
return unless event_harvest_config_is_valid
|
89
|
+
return unless event_harvest_config_is_valid(connect_reply)
|
88
90
|
|
89
91
|
event_harvest_config = EventHarvestConfig.to_config_hash(connect_reply)
|
90
92
|
EVENT_HARVEST_CONFIG_SUPPORTABILITY_METRIC_NAMES.each do |config_key, metric_name|
|
91
|
-
NewRelic::Agent.record_metric
|
93
|
+
NewRelic::Agent.record_metric(metric_name, event_harvest_config[config_key])
|
92
94
|
end
|
93
95
|
|
94
|
-
merged_settings.merge!
|
96
|
+
merged_settings.merge!(event_harvest_config)
|
95
97
|
end
|
96
98
|
|
97
|
-
def event_harvest_config_is_valid
|
99
|
+
def event_harvest_config_is_valid(connect_reply)
|
98
100
|
event_harvest_config = connect_reply['event_harvest_config']
|
99
101
|
|
100
102
|
if event_harvest_config.nil? \
|
101
103
|
|| event_harvest_config['harvest_limits'].values.min < 0 \
|
102
104
|
|| (event_harvest_config['report_period_ms'] / 1000) <= 0
|
103
|
-
NewRelic::Agent.logger.warn
|
104
|
-
|
105
|
+
NewRelic::Agent.logger.warn('Invalid event harvest config found ' \
|
106
|
+
'in connect response; using default event report period.')
|
105
107
|
false
|
106
108
|
else
|
107
109
|
true
|
@@ -132,19 +134,19 @@ module NewRelic
|
|
132
134
|
# do the real enforcement there.
|
133
135
|
def apply_feature_gates(merged_settings, connect_reply, existing_config)
|
134
136
|
gated_features = {
|
135
|
-
'transaction_tracer.enabled'
|
136
|
-
'slow_sql.enabled'
|
137
|
-
'error_collector.enabled'
|
138
|
-
'
|
137
|
+
'transaction_tracer.enabled' => 'collect_traces',
|
138
|
+
'slow_sql.enabled' => 'collect_traces',
|
139
|
+
'error_collector.enabled' => 'collect_errors',
|
140
|
+
'transaction_events.enabled' => 'collect_analytics_events',
|
139
141
|
'custom_insights_events.enabled' => 'collect_custom_events',
|
140
142
|
'error_collector.capture_events' => 'collect_error_events',
|
141
|
-
'span_events.enabled'
|
143
|
+
'span_events.enabled' => 'collect_span_events'
|
142
144
|
}
|
143
145
|
gated_features.each do |config_key, gate_key|
|
144
146
|
if connect_reply.has_key?(gate_key)
|
145
147
|
allowed_by_server = connect_reply[gate_key]
|
146
|
-
requested_value
|
147
|
-
effective_value
|
148
|
+
requested_value = ungated_value(config_key, merged_settings, existing_config)
|
149
|
+
effective_value = (allowed_by_server && requested_value)
|
148
150
|
merged_settings[config_key] = effective_value
|
149
151
|
end
|
150
152
|
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 'new_relic/agent/configuration/dotted_hash'
|
6
6
|
|
@@ -11,9 +11,13 @@ module NewRelic
|
|
11
11
|
attr_accessor :file_path, :failures
|
12
12
|
attr_reader :generated_for_user, :license_key
|
13
13
|
|
14
|
+
# These are configuration options that have a value of a Hash
|
15
|
+
# This is used in YamlSource#dot_flattened prevent flattening these values
|
16
|
+
CONFIG_WITH_HASH_VALUE = %w[expected_messages ignore_messages]
|
17
|
+
|
14
18
|
def initialize(path, env)
|
15
19
|
@path = path
|
16
|
-
config
|
20
|
+
config = {}
|
17
21
|
@failures = []
|
18
22
|
|
19
23
|
# These are needed in process_erb for populating the newrelic.yml via
|
@@ -30,13 +34,14 @@ module NewRelic
|
|
30
34
|
::NewRelic::Agent.logger.info("Reading configuration from #{path} (#{Dir.pwd})")
|
31
35
|
raw_file = File.read(@file_path)
|
32
36
|
erb_file = process_erb(raw_file)
|
33
|
-
config
|
37
|
+
config = process_yaml(erb_file, env, config, @file_path)
|
34
38
|
rescue ScriptError, StandardError => e
|
35
39
|
log_failure("Failed to read or parse configuration file at #{path}", e)
|
36
40
|
end
|
37
41
|
|
38
42
|
substitute_transaction_threshold(config)
|
39
43
|
booleanify_values(config, 'agent_enabled', 'enabled')
|
44
|
+
apply_aliases(config)
|
40
45
|
|
41
46
|
super(config, true)
|
42
47
|
end
|
@@ -59,8 +64,8 @@ module NewRelic
|
|
59
64
|
end
|
60
65
|
|
61
66
|
def warn_missing_config_file(path)
|
62
|
-
based_on
|
63
|
-
source
|
67
|
+
based_on = 'unknown'
|
68
|
+
source = ::NewRelic::Agent.config.source(:config_path)
|
64
69
|
candidate_paths = [path]
|
65
70
|
|
66
71
|
case source
|
@@ -80,7 +85,7 @@ module NewRelic
|
|
80
85
|
# so warn about it since it's very likely to be unintended.
|
81
86
|
NewRelic::Agent.logger.warn(
|
82
87
|
"No configuration file found. Working directory = #{Dir.pwd}",
|
83
|
-
"Looked in these locations (based on #{based_on}): #{candidate_paths.join(
|
88
|
+
"Looked in these locations (based on #{based_on}): #{candidate_paths.join(', ')}"
|
84
89
|
)
|
85
90
|
end
|
86
91
|
|
@@ -92,14 +97,19 @@ module NewRelic
|
|
92
97
|
file.gsub!(/^\s*#.*$/, '#')
|
93
98
|
ERB.new(file).result(binding)
|
94
99
|
rescue ScriptError, StandardError => e
|
95
|
-
log_failure(
|
100
|
+
log_failure('Failed ERB processing configuration file. This is typically caused by a Ruby error in <% %> templating blocks in your newrelic.yml file.', e)
|
96
101
|
nil
|
97
102
|
end
|
98
103
|
end
|
99
104
|
|
100
105
|
def process_yaml(file, env, config, path)
|
101
106
|
if file
|
102
|
-
confighash = YAML.
|
107
|
+
confighash = if YAML.respond_to?(:unsafe_load)
|
108
|
+
YAML.unsafe_load(file)
|
109
|
+
else
|
110
|
+
YAML.load(file)
|
111
|
+
end
|
112
|
+
|
103
113
|
unless confighash.key?(env)
|
104
114
|
log_failure("Config file at #{path} doesn't include a '#{env}' section!")
|
105
115
|
end
|
@@ -115,6 +125,8 @@ module NewRelic
|
|
115
125
|
config['transaction_tracer']['transaction_threshold'].to_s =~ /apdex_f/i
|
116
126
|
# when value is "apdex_f" remove the config and defer to default
|
117
127
|
config['transaction_tracer'].delete('transaction_threshold')
|
128
|
+
elsif /apdex_f/i.match?(config['transaction_tracer.transaction_threshold'].to_s)
|
129
|
+
config.delete('transaction_tracer.transaction_threshold')
|
118
130
|
end
|
119
131
|
end
|
120
132
|
|
@@ -124,9 +136,9 @@ module NewRelic
|
|
124
136
|
if 'auto' == config[option]
|
125
137
|
config.delete(option)
|
126
138
|
elsif !config[option].nil? && !is_boolean?(config[option])
|
127
|
-
coerced_value =
|
139
|
+
coerced_value = config[option].to_s.match?(/yes|on|true/i)
|
128
140
|
if !coerced_value
|
129
|
-
log_failure
|
141
|
+
log_failure("Unexpected value (#{config[option]}) for '#{option}' in #{@path}")
|
130
142
|
end
|
131
143
|
config[option] = coerced_value
|
132
144
|
end
|
@@ -141,6 +153,31 @@ module NewRelic
|
|
141
153
|
::NewRelic::Agent.logger.error(*messages)
|
142
154
|
messages.each { |message| @failures << message }
|
143
155
|
end
|
156
|
+
|
157
|
+
def dot_flattened(nested_hash, names = [], result = {})
|
158
|
+
nested_hash.each do |key, val|
|
159
|
+
next if val.nil?
|
160
|
+
|
161
|
+
if val.respond_to?(:has_key?) && !CONFIG_WITH_HASH_VALUE.include?(key)
|
162
|
+
dot_flattened(val, names + [key], result)
|
163
|
+
else
|
164
|
+
result[(names + [key]).join('.')] = val
|
165
|
+
end
|
166
|
+
end
|
167
|
+
result
|
168
|
+
end
|
169
|
+
|
170
|
+
def apply_aliases(config)
|
171
|
+
DEFAULTS.each do |config_setting, value|
|
172
|
+
next unless value[:aliases]
|
173
|
+
|
174
|
+
value[:aliases].each do |config_alias|
|
175
|
+
next unless config[config_setting].nil? && !config[config_alias.to_s].nil?
|
176
|
+
|
177
|
+
config[config_setting] = config[config_alias.to_s]
|
178
|
+
end
|
179
|
+
end
|
180
|
+
end
|
144
181
|
end
|
145
182
|
end
|
146
183
|
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 'new_relic/agent/configuration/manager'
|
6
6
|
require 'new_relic/agent/configuration/dotted_hash'
|
@@ -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 'new_relic/environment_report'
|
6
6
|
require 'new_relic/agent/configuration/event_harvest_config'
|
@@ -8,9 +8,7 @@ require 'new_relic/agent/configuration/event_harvest_config'
|
|
8
8
|
module NewRelic
|
9
9
|
module Agent
|
10
10
|
module Connect
|
11
|
-
|
12
11
|
class RequestBuilder
|
13
|
-
|
14
12
|
def initialize(new_relic_service, config, event_harvest_config, environment_report)
|
15
13
|
@service = new_relic_service
|
16
14
|
@config = config
|
@@ -18,38 +16,40 @@ module NewRelic
|
|
18
16
|
@environment_report = sanitize_environment_report(environment_report)
|
19
17
|
end
|
20
18
|
|
21
|
-
|
22
19
|
# Initializes the hash of settings that we send to the
|
23
20
|
# server. Returns a literal hash containing the options
|
24
21
|
def connect_payload
|
25
22
|
{
|
26
|
-
:pid
|
27
|
-
:host
|
28
|
-
:display_host
|
29
|
-
:app_name
|
30
|
-
:language
|
31
|
-
:labels
|
23
|
+
:pid => $$,
|
24
|
+
:host => local_host,
|
25
|
+
:display_host => Agent.config[:'process_host.display_name'],
|
26
|
+
:app_name => Agent.config[:app_name],
|
27
|
+
:language => 'ruby',
|
28
|
+
:labels => Agent.config.parsed_labels,
|
32
29
|
:agent_version => NewRelic::VERSION::STRING,
|
33
|
-
:environment
|
34
|
-
:metadata
|
35
|
-
:settings
|
30
|
+
:environment => @environment_report,
|
31
|
+
:metadata => environment_metadata,
|
32
|
+
:settings => Agent.config.to_collector_hash,
|
36
33
|
:high_security => Agent.config[:high_security],
|
37
|
-
:utilization
|
38
|
-
:identifier
|
34
|
+
:utilization => UtilizationData.new.to_collector_hash,
|
35
|
+
:identifier => "ruby:#{local_host}:#{Agent.config[:app_name].sort.join(',')}",
|
39
36
|
:event_harvest_config => @event_harvest_config
|
40
37
|
}
|
41
38
|
end
|
42
39
|
|
43
40
|
# We've seen objects in the environment report (Rails.env in
|
44
|
-
# particular) that can't
|
41
|
+
# particular) that can't serialize to JSON. Cope with that here and
|
45
42
|
# clear out so downstream code doesn't have to check again.
|
46
43
|
def sanitize_environment_report(environment_report)
|
47
|
-
return
|
44
|
+
return NewRelic::EMPTY_ARRAY unless @service.valid_to_marshal?(environment_report)
|
45
|
+
|
48
46
|
environment_report
|
49
47
|
end
|
50
48
|
|
51
49
|
def environment_metadata
|
52
|
-
|
50
|
+
env_copy = {}
|
51
|
+
ENV.keys.each { |k| env_copy[k] = ENV[k] if /^NEW_RELIC_METADATA_/.match?(k) }
|
52
|
+
env_copy
|
53
53
|
end
|
54
54
|
|
55
55
|
def local_host
|