newrelic_rpm 5.7.0.350 → 7.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +9 -0
- data/.yardopts +1 -0
- data/CHANGELOG.md +788 -0
- data/CONTRIBUTING.md +106 -19
- data/Gemfile +6 -2
- data/Guardfile +18 -1
- data/LICENSE +208 -38
- data/README.md +80 -84
- data/ROADMAP.md +24 -0
- data/Rakefile +2 -0
- data/THIRD_PARTY_NOTICES.md +213 -0
- data/bin/nrdebug +1 -1
- data/init.rb +1 -1
- data/install.rb +1 -1
- data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
- data/lib/new_relic/agent/agent.rb +176 -191
- data/lib/new_relic/agent/agent_logger.rb +5 -1
- data/lib/new_relic/agent/attribute_filter.rb +8 -8
- data/lib/new_relic/agent/attribute_processing.rb +1 -1
- data/lib/new_relic/agent/attributes.rb +152 -0
- data/lib/new_relic/agent/audit_logger.rb +11 -1
- data/lib/new_relic/agent/autostart.rb +19 -15
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command_router.rb +3 -22
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +447 -89
- data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
- data/lib/new_relic/agent/configuration/environment_source.rb +5 -3
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +45 -0
- data/lib/new_relic/agent/configuration/high_security_source.rb +2 -1
- data/lib/new_relic/agent/configuration/manager.rb +16 -12
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
- data/lib/new_relic/agent/configuration/security_policy_source.rb +1 -1
- data/lib/new_relic/agent/configuration/server_source.rb +39 -4
- data/lib/new_relic/agent/configuration/yaml_source.rb +12 -7
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +61 -0
- data/lib/new_relic/agent/connect/response_handler.rb +61 -0
- data/lib/new_relic/agent/custom_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
- data/lib/new_relic/agent/database/obfuscator.rb +1 -1
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
- data/lib/new_relic/agent/database.rb +2 -3
- data/lib/new_relic/agent/database_adapter.rb +33 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +2 -3
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +3 -3
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +9 -9
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo.rb +2 -2
- data/lib/new_relic/agent/datastores/redis.rb +1 -5
- data/lib/new_relic/agent/datastores.rb +7 -9
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +3 -2
- data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +61 -46
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
- data/lib/new_relic/agent/{distributed_trace_payload.rb → distributed_tracing/distributed_trace_payload.rb} +32 -113
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +39 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +246 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +126 -0
- data/lib/new_relic/agent/distributed_tracing.rb +115 -32
- data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
- data/lib/new_relic/agent/error_collector.rb +37 -20
- data/lib/new_relic/agent/error_event_aggregator.rb +10 -7
- data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
- data/lib/new_relic/agent/event_aggregator.rb +27 -33
- data/lib/new_relic/agent/event_buffer.rb +1 -1
- data/lib/new_relic/agent/event_listener.rb +1 -1
- data/lib/new_relic/agent/event_loop.rb +1 -1
- data/lib/new_relic/agent/external.rb +13 -11
- data/lib/new_relic/agent/guid_generator.rb +28 -0
- data/lib/new_relic/agent/harvester.rb +1 -1
- data/lib/new_relic/agent/heap.rb +1 -1
- data/lib/new_relic/agent/hostname.rb +16 -2
- data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +25 -20
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +29 -14
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -22
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +11 -12
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +17 -5
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -7
- data/lib/new_relic/agent/http_clients/uri_util.rb +12 -11
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +26 -43
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +53 -73
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +81 -56
- data/lib/new_relic/agent/instrumentation/active_job.rb +7 -8
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_record.rb +85 -38
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +17 -6
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +152 -0
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +35 -11
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +47 -49
- data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +13 -9
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +10 -9
- data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +152 -0
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/bunny.rb +13 -132
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +10 -4
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +93 -0
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +222 -0
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +63 -0
- data/lib/new_relic/agent/instrumentation/curb.rb +11 -183
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +5 -3
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +53 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +34 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +9 -49
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +8 -5
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
- data/lib/new_relic/agent/instrumentation/excon.rb +4 -3
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +25 -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 +14 -118
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +38 -0
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +10 -30
- 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 +1 -1
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +16 -0
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +39 -118
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +56 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +88 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +88 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +55 -68
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +1 -1
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +4 -2
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +20 -11
- data/lib/new_relic/agent/instrumentation/mongo.rb +17 -4
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +36 -3
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
- data/lib/new_relic/agent/instrumentation/net_http.rb +39 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +100 -0
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +34 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +27 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +19 -52
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +57 -0
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +32 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +73 -0
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +36 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +30 -138
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
- data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_cable.rb +6 -7
- data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_controller.rb +4 -4
- data/lib/new_relic/agent/instrumentation/{rails4 → rails_notifications}/action_view.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +144 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +14 -155
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +34 -0
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +65 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +24 -0
- data/lib/new_relic/agent/instrumentation/redis.rb +11 -104
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +33 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +16 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +9 -26
- data/lib/new_relic/agent/instrumentation/sequel.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +48 -24
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -35
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +118 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra.rb +21 -160
- data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +82 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +12 -74
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +1 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +3 -3
- data/lib/new_relic/agent/log_once.rb +1 -1
- data/lib/new_relic/agent/logging.rb +139 -0
- data/lib/new_relic/agent/memory_logger.rb +1 -1
- data/lib/new_relic/agent/messaging.rb +15 -82
- data/lib/new_relic/agent/method_tracer.rb +10 -8
- data/lib/new_relic/agent/method_tracer_helpers.rb +5 -5
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +110 -0
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +27 -0
- data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +4 -4
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +4 -7
- data/lib/new_relic/agent/monitors.rb +27 -0
- data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +1 -2
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +6 -27
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -1
- data/lib/new_relic/agent/new_relic_service.rb +95 -40
- data/lib/new_relic/agent/noticible_error.rb +22 -0
- data/lib/new_relic/agent/null_logger.rb +1 -1
- data/lib/new_relic/agent/obfuscator.rb +1 -1
- data/lib/new_relic/agent/parameter_filtering.rb +19 -6
- data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
- data/lib/new_relic/agent/pipe_channel_manager.rb +1 -1
- data/lib/new_relic/agent/pipe_service.rb +1 -1
- data/lib/new_relic/agent/prepend_supportability.rb +1 -1
- data/lib/new_relic/agent/priority_sampled_buffer.rb +9 -4
- data/lib/new_relic/agent/range_extensions.rb +1 -1
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine.rb +1 -1
- data/lib/new_relic/agent/sampler.rb +1 -1
- data/lib/new_relic/agent/sampler_collection.rb +1 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/memory_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +3 -5
- data/lib/new_relic/agent/span_event_primitive.rb +108 -54
- data/lib/new_relic/agent/sql_sampler.rb +10 -10
- data/lib/new_relic/agent/stats.rb +1 -1
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +2 -2
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
- data/lib/new_relic/agent/stats_engine.rb +3 -3
- data/lib/new_relic/agent/supported_versions.rb +3 -3
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/system_info.rb +18 -4
- data/lib/new_relic/agent/threading/agent_thread.rb +2 -2
- data/lib/new_relic/agent/threading/backtrace_node.rb +1 -1
- data/lib/new_relic/agent/threading/backtrace_service.rb +4 -4
- data/lib/new_relic/agent/threading/thread_profile.rb +10 -24
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +509 -0
- data/lib/new_relic/agent/transaction/abstract_segment.rb +33 -6
- data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +177 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +59 -149
- data/lib/new_relic/agent/transaction/external_request_segment.rb +32 -39
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +5 -12
- data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
- data/lib/new_relic/agent/transaction/segment.rb +28 -2
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/trace.rb +6 -13
- data/lib/new_relic/agent/transaction/trace_builder.rb +1 -2
- data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
- data/lib/new_relic/agent/transaction/trace_node.rb +11 -9
- data/lib/new_relic/agent/transaction/tracing.rb +1 -100
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction.rb +140 -170
- data/lib/new_relic/agent/transaction_error_primitive.rb +11 -16
- data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/transaction_event_primitive.rb +29 -40
- data/lib/new_relic/agent/transaction_event_recorder.rb +4 -4
- data/lib/new_relic/agent/transaction_metrics.rb +1 -1
- data/lib/new_relic/agent/transaction_sampler.rb +2 -6
- data/lib/new_relic/agent/transaction_time_aggregator.rb +20 -6
- data/lib/new_relic/agent/utilization/aws.rb +1 -1
- data/lib/new_relic/agent/utilization/azure.rb +1 -1
- data/lib/new_relic/agent/utilization/gcp.rb +1 -1
- data/lib/new_relic/agent/utilization/pcf.rb +1 -1
- data/lib/new_relic/agent/utilization/vendor.rb +1 -1
- data/lib/new_relic/agent/utilization_data.rb +37 -2
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
- data/lib/new_relic/agent/vm/mri_vm.rb +7 -5
- data/lib/new_relic/agent/vm/snapshot.rb +1 -1
- data/lib/new_relic/agent/vm.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +1 -1
- data/lib/new_relic/agent.rb +106 -18
- data/lib/new_relic/cli/command.rb +1 -1
- data/lib/new_relic/cli/commands/deployments.rb +2 -3
- data/lib/new_relic/cli/commands/install.rb +4 -3
- data/lib/new_relic/coerce.rb +32 -7
- data/lib/new_relic/collection_helper.rb +1 -1
- data/lib/new_relic/constants.rb +42 -0
- data/lib/new_relic/control/class_methods.rb +8 -2
- data/lib/new_relic/control/frameworks/external.rb +1 -1
- data/lib/new_relic/control/frameworks/merb.rb +1 -1
- data/lib/new_relic/control/frameworks/rails.rb +12 -10
- data/lib/new_relic/control/frameworks/rails3.rb +1 -1
- data/lib/new_relic/control/frameworks/rails4.rb +1 -1
- data/lib/new_relic/control/frameworks/{rails5.rb → rails_notifications.rb} +2 -2
- data/lib/new_relic/control/frameworks/ruby.rb +1 -1
- data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/instance_methods.rb +12 -2
- data/lib/new_relic/control/instrumentation.rb +1 -1
- data/lib/new_relic/control/server_methods.rb +1 -1
- data/lib/new_relic/control.rb +1 -1
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +124 -14
- data/lib/new_relic/environment_report.rb +2 -4
- data/lib/new_relic/helper.rb +1 -1
- data/lib/new_relic/language_support.rb +1 -1
- data/lib/new_relic/latest_changes.rb +2 -2
- data/lib/new_relic/local_environment.rb +1 -1
- data/lib/new_relic/metric_data.rb +1 -1
- data/lib/new_relic/metric_spec.rb +1 -1
- data/lib/new_relic/noticed_error.rb +35 -18
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +2 -2
- data/lib/new_relic/rack/browser_monitoring.rb +16 -9
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +1 -1
- data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +16 -1
- data/lib/new_relic/version.rb +3 -3
- data/lib/newrelic_rpm.rb +1 -1
- data/lib/sequel/extensions/newrelic_instrumentation.rb +1 -1
- data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -1
- data/lib/tasks/all.rb +1 -1
- data/lib/tasks/config.rake +1 -2
- data/lib/tasks/multiverse.rb +35 -1
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +6 -1
- data/newrelic_rpm.gemspec +22 -17
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +358 -78
- metadata +147 -66
- data/.travis.yml +0 -228
- data/cert/cacert.pem +0 -1177
- data/lib/new_relic/agent/commands/xray_session.rb +0 -55
- data/lib/new_relic/agent/commands/xray_session_collection.rb +0 -161
- data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -41
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/agent/instrumentation/active_record_4.rb +0 -42
- data/lib/new_relic/agent/instrumentation/active_record_5.rb +0 -41
- data/lib/new_relic/agent/instrumentation/evented_subscriber.rb +0 -104
- data/lib/new_relic/agent/instrumentation/http.rb +0 -46
- data/lib/new_relic/agent/instrumentation/net.rb +0 -50
- data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb +0 -32
- data/lib/new_relic/agent/instrumentation/rails5/action_view.rb +0 -27
- data/lib/new_relic/agent/transaction/attributes.rb +0 -154
- data/lib/new_relic/agent/transaction/xray_sample_buffer.rb +0 -64
- data/lib/new_relic/agent/transaction_state.rb +0 -186
- data/lib/new_relic/build.rb +0 -2
- data/lib/new_relic/metrics.rb +0 -13
- data/lib/tasks/versions.html.erb +0 -28
- data/lib/tasks/versions.postface.html +0 -8
- data/lib/tasks/versions.preface.html +0 -9
- data/lib/tasks/versions.rake +0 -65
- data/lib/tasks/versions.txt.erb +0 -14
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -9,7 +9,8 @@ module NewRelic
|
|
9
9
|
SUPPORTED_PREFIXES = /^new_relic_|^newrelic_/i
|
10
10
|
SPECIAL_CASE_KEYS = [
|
11
11
|
'NEW_RELIC_ENV', # read by NewRelic::Control::Frameworks::Ruby
|
12
|
-
'NEW_RELIC_LOG' # read by set_log_file
|
12
|
+
'NEW_RELIC_LOG', # read by set_log_file
|
13
|
+
/^NEW_RELIC_METADATA_/ # read by NewRelic::Agent::Connect::RequestBuilder
|
13
14
|
]
|
14
15
|
|
15
16
|
attr_accessor :alias_map, :type_map
|
@@ -66,7 +67,8 @@ module NewRelic
|
|
66
67
|
nr_env_var_keys = collect_new_relic_environment_variable_keys
|
67
68
|
|
68
69
|
nr_env_var_keys.each do |key|
|
69
|
-
next if SPECIAL_CASE_KEYS.
|
70
|
+
next if SPECIAL_CASE_KEYS.any? { |pattern| pattern === key.upcase }
|
71
|
+
|
70
72
|
set_value_from_environment_variable(key)
|
71
73
|
end
|
72
74
|
end
|
@@ -0,0 +1,45 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
module Configuration
|
8
|
+
module EventHarvestConfig
|
9
|
+
|
10
|
+
extend self
|
11
|
+
|
12
|
+
EVENT_HARVEST_CONFIG_KEY_MAPPING = {
|
13
|
+
:analytic_event_data => :'analytics_events.max_samples_stored',
|
14
|
+
:custom_event_data => :'custom_insights_events.max_samples_stored',
|
15
|
+
:error_event_data => :'error_collector.max_event_samples_stored',
|
16
|
+
:span_event_data => :'span_events.max_samples_stored'
|
17
|
+
}
|
18
|
+
|
19
|
+
def from_config(config)
|
20
|
+
{:harvest_limits => EVENT_HARVEST_CONFIG_KEY_MAPPING.inject({}) do
|
21
|
+
|connect_payload, (connect_payload_key, config_key)|
|
22
|
+
connect_payload[connect_payload_key] = config[config_key]
|
23
|
+
connect_payload
|
24
|
+
end
|
25
|
+
}
|
26
|
+
end
|
27
|
+
|
28
|
+
def to_config_hash(connect_reply)
|
29
|
+
event_harvest_interval = connect_reply['event_harvest_config']['report_period_ms'] / 1000
|
30
|
+
config_hash = EVENT_HARVEST_CONFIG_KEY_MAPPING.inject({}) do
|
31
|
+
|event_harvest_config, (connect_payload_key, config_key)|
|
32
|
+
if harvest_limit = connect_reply['event_harvest_config']['harvest_limits'][connect_payload_key.to_s]
|
33
|
+
event_harvest_config[config_key] = harvest_limit
|
34
|
+
report_period_key = :"event_report_period.#{connect_payload_key}"
|
35
|
+
event_harvest_config[report_period_key] = event_harvest_interval
|
36
|
+
end
|
37
|
+
event_harvest_config
|
38
|
+
end
|
39
|
+
config_hash[:event_report_period] = event_harvest_interval
|
40
|
+
config_hash
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/configuration/dotted_hash'
|
6
6
|
|
@@ -13,6 +13,7 @@ module NewRelic
|
|
13
13
|
:capture_params => false,
|
14
14
|
:'resque.capture_params' => false,
|
15
15
|
:'sidekiq.capture_params' => false,
|
16
|
+
:'attributes.include' => [],
|
16
17
|
|
17
18
|
:'transaction_tracer.record_sql' => record_sql_setting(local_settings, :'transaction_tracer.record_sql'),
|
18
19
|
:'slow_sql.record_sql' => record_sql_setting(local_settings, :'slow_sql.record_sql'),
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'forwardable'
|
6
6
|
require 'new_relic/agent/configuration/mask_defaults'
|
@@ -23,7 +23,7 @@ module NewRelic
|
|
23
23
|
end
|
24
24
|
|
25
25
|
def has_key?(key)
|
26
|
-
@cache.has_key?
|
26
|
+
@cache.has_key? key
|
27
27
|
end
|
28
28
|
|
29
29
|
def keys
|
@@ -95,6 +95,7 @@ module NewRelic
|
|
95
95
|
reset_cache
|
96
96
|
log_config(:add, source)
|
97
97
|
|
98
|
+
notify_server_source_added if ServerSource === source
|
98
99
|
notify_finished_configuring if !was_finished && finished_configuring?
|
99
100
|
end
|
100
101
|
|
@@ -171,8 +172,19 @@ module NewRelic
|
|
171
172
|
end
|
172
173
|
end
|
173
174
|
|
175
|
+
# This event is intended to be fired every time the server source is
|
176
|
+
# applied. This happens after the agent's initial connect, and again
|
177
|
+
# on every forced reconnect.
|
178
|
+
def notify_server_source_added
|
179
|
+
NewRelic::Agent.instance.events.notify(:server_source_configuration_added)
|
180
|
+
end
|
181
|
+
|
182
|
+
# This event is intended to be fired once during the entire lifespan of
|
183
|
+
# an agent run, after the server source has been applied for the first
|
184
|
+
# time. This should indicate that all configuration has been applied,
|
185
|
+
# and the main functions of the agent are safe to start.
|
174
186
|
def notify_finished_configuring
|
175
|
-
NewRelic::Agent.instance.events.notify(:
|
187
|
+
NewRelic::Agent.instance.events.notify(:initial_configuration_complete)
|
176
188
|
end
|
177
189
|
|
178
190
|
def finished_configuring?
|
@@ -216,14 +228,6 @@ module NewRelic
|
|
216
228
|
end
|
217
229
|
end
|
218
230
|
|
219
|
-
def app_names
|
220
|
-
case NewRelic::Agent.config[:app_name]
|
221
|
-
when Array then NewRelic::Agent.config[:app_name]
|
222
|
-
when String then NewRelic::Agent.config[:app_name].split(';')
|
223
|
-
else []
|
224
|
-
end
|
225
|
-
end
|
226
|
-
|
227
231
|
MALFORMED_LABELS_WARNING = "Skipping malformed labels configuration"
|
228
232
|
PARSING_LABELS_FAILURE = "Failure during parsing labels. Ignoring and carrying on with connect."
|
229
233
|
|
@@ -341,7 +345,7 @@ module NewRelic
|
|
341
345
|
end
|
342
346
|
|
343
347
|
def reset_cache
|
344
|
-
@cache = Hash.new {|hash,key| hash[key] = self.fetch(key) }
|
348
|
+
@cache = Hash.new { |hash,key| hash[key] = self.fetch(key) }
|
345
349
|
end
|
346
350
|
|
347
351
|
def log_config(direction, source)
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/configuration/dotted_hash'
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/configuration/dotted_hash'
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -20,8 +20,8 @@ module NewRelic
|
|
20
20
|
"browser_monitoring.loader_version",
|
21
21
|
"cross_process_id",
|
22
22
|
"data_report_period",
|
23
|
-
"data_report_periods.analytic_event_data",
|
24
23
|
"encoding_key",
|
24
|
+
"entity_guid",
|
25
25
|
"error_beacon",
|
26
26
|
"js_agent_file",
|
27
27
|
"js_agent_loader",
|
@@ -39,6 +39,7 @@ module NewRelic
|
|
39
39
|
merge_top_level_keys(merged_settings, connect_reply)
|
40
40
|
merge_agent_config_hash(merged_settings, connect_reply)
|
41
41
|
fix_transaction_threshold(merged_settings)
|
42
|
+
add_event_harvest_config(merged_settings, connect_reply)
|
42
43
|
filter_keys(merged_settings)
|
43
44
|
|
44
45
|
apply_feature_gates(merged_settings, connect_reply, existing_config)
|
@@ -69,11 +70,44 @@ module NewRelic
|
|
69
70
|
|
70
71
|
def fix_transaction_threshold(merged_settings)
|
71
72
|
# when value is "apdex_f" remove the config and defer to default
|
72
|
-
if merged_settings['transaction_tracer.transaction_threshold'] =~ /apdex_f/i
|
73
|
+
if merged_settings['transaction_tracer.transaction_threshold'].to_s =~ /apdex_f/i
|
73
74
|
merged_settings.delete('transaction_tracer.transaction_threshold')
|
74
75
|
end
|
75
76
|
end
|
76
77
|
|
78
|
+
EVENT_HARVEST_CONFIG_SUPPORTABILITY_METRIC_NAMES = {
|
79
|
+
:'analytics_events.max_samples_stored' => 'Supportability/EventHarvest/AnalyticEventData/HarvestLimit',
|
80
|
+
:'custom_insights_events.max_samples_stored' => 'Supportability/EventHarvest/CustomEventData/HarvestLimit',
|
81
|
+
:'error_collector.max_event_samples_stored'=> 'Supportability/EventHarvest/ErrorEventData/HarvestLimit',
|
82
|
+
:'span_events.max_samples_stored'=> 'Supportability/EventHarvest/SpanEventData/HarvestLimit',
|
83
|
+
:event_report_period => 'Supportability/EventHarvest/ReportPeriod'
|
84
|
+
}
|
85
|
+
|
86
|
+
def add_event_harvest_config(merged_settings, connect_reply)
|
87
|
+
return unless event_harvest_config_is_valid connect_reply
|
88
|
+
|
89
|
+
event_harvest_config = EventHarvestConfig.to_config_hash(connect_reply)
|
90
|
+
EVENT_HARVEST_CONFIG_SUPPORTABILITY_METRIC_NAMES.each do |config_key, metric_name|
|
91
|
+
NewRelic::Agent.record_metric metric_name, event_harvest_config[config_key]
|
92
|
+
end
|
93
|
+
|
94
|
+
merged_settings.merge! event_harvest_config
|
95
|
+
end
|
96
|
+
|
97
|
+
def event_harvest_config_is_valid connect_reply
|
98
|
+
event_harvest_config = connect_reply['event_harvest_config']
|
99
|
+
|
100
|
+
if event_harvest_config.nil? \
|
101
|
+
|| event_harvest_config['harvest_limits'].values.min < 0 \
|
102
|
+
|| (event_harvest_config['report_period_ms'] / 1000) <= 0
|
103
|
+
NewRelic::Agent.logger.warn "Invalid event harvest config found " \
|
104
|
+
"in connect response; using default event report period."
|
105
|
+
false
|
106
|
+
else
|
107
|
+
true
|
108
|
+
end
|
109
|
+
end
|
110
|
+
|
77
111
|
def filter_keys(merged_settings)
|
78
112
|
merged_settings.delete_if do |key, _|
|
79
113
|
setting_spec = DEFAULTS[key.to_sym]
|
@@ -103,7 +137,8 @@ module NewRelic
|
|
103
137
|
'error_collector.enabled' => 'collect_errors',
|
104
138
|
'analytics_events.enabled' => 'collect_analytics_events',
|
105
139
|
'custom_insights_events.enabled' => 'collect_custom_events',
|
106
|
-
'error_collector.capture_events' => 'collect_error_events'
|
140
|
+
'error_collector.capture_events' => 'collect_error_events',
|
141
|
+
'span_events.enabled' => 'collect_span_events'
|
107
142
|
}
|
108
143
|
gated_features.each do |config_key, gate_key|
|
109
144
|
if connect_reply.has_key?(gate_key)
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/configuration/dotted_hash'
|
6
6
|
|
@@ -12,6 +12,7 @@ module NewRelic
|
|
12
12
|
attr_reader :generated_for_user, :license_key
|
13
13
|
|
14
14
|
def initialize(path, env)
|
15
|
+
@path = path
|
15
16
|
config = {}
|
16
17
|
@failures = []
|
17
18
|
|
@@ -111,30 +112,34 @@ module NewRelic
|
|
111
112
|
|
112
113
|
def substitute_transaction_threshold(config)
|
113
114
|
if config['transaction_tracer'] &&
|
114
|
-
config['transaction_tracer']['transaction_threshold'] =~ /apdex_f/i
|
115
|
+
config['transaction_tracer']['transaction_threshold'].to_s =~ /apdex_f/i
|
115
116
|
# when value is "apdex_f" remove the config and defer to default
|
116
117
|
config['transaction_tracer'].delete('transaction_threshold')
|
117
118
|
end
|
118
119
|
end
|
119
120
|
|
120
121
|
def booleanify_values(config, *keys)
|
121
|
-
# auto means defer
|
122
|
+
# auto means defer to default
|
122
123
|
keys.each do |option|
|
123
|
-
if config[option]
|
124
|
+
if 'auto' == config[option]
|
124
125
|
config.delete(option)
|
125
126
|
elsif !config[option].nil? && !is_boolean?(config[option])
|
126
|
-
|
127
|
+
coerced_value = !!(config[option].to_s =~ /yes|on|true/i)
|
128
|
+
if !coerced_value
|
129
|
+
log_failure "Unexpected value (#{config[option]}) for '#{option}' in #{@path}"
|
130
|
+
end
|
131
|
+
config[option] = coerced_value
|
127
132
|
end
|
128
133
|
end
|
129
134
|
end
|
130
135
|
|
131
136
|
def is_boolean?(value)
|
132
|
-
value ==
|
137
|
+
!!value == value
|
133
138
|
end
|
134
139
|
|
135
140
|
def log_failure(*messages)
|
136
141
|
::NewRelic::Agent.logger.error(*messages)
|
137
|
-
@failures <<
|
142
|
+
messages.each { |message| @failures << message }
|
138
143
|
end
|
139
144
|
end
|
140
145
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/configuration/manager'
|
6
6
|
require 'new_relic/agent/configuration/dotted_hash'
|
@@ -0,0 +1,61 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
require 'new_relic/environment_report'
|
6
|
+
require 'new_relic/agent/configuration/event_harvest_config'
|
7
|
+
|
8
|
+
module NewRelic
|
9
|
+
module Agent
|
10
|
+
module Connect
|
11
|
+
|
12
|
+
class RequestBuilder
|
13
|
+
|
14
|
+
def initialize(new_relic_service, config, event_harvest_config, environment_report)
|
15
|
+
@service = new_relic_service
|
16
|
+
@config = config
|
17
|
+
@event_harvest_config = event_harvest_config
|
18
|
+
@environment_report = sanitize_environment_report(environment_report)
|
19
|
+
end
|
20
|
+
|
21
|
+
|
22
|
+
# Initializes the hash of settings that we send to the
|
23
|
+
# server. Returns a literal hash containing the options
|
24
|
+
def connect_payload
|
25
|
+
{
|
26
|
+
:pid => $$,
|
27
|
+
:host => local_host,
|
28
|
+
:display_host => Agent.config[:'process_host.display_name'],
|
29
|
+
:app_name => Agent.config[:app_name],
|
30
|
+
:language => 'ruby',
|
31
|
+
:labels => Agent.config.parsed_labels,
|
32
|
+
:agent_version => NewRelic::VERSION::STRING,
|
33
|
+
:environment => @environment_report,
|
34
|
+
:metadata => environment_metadata,
|
35
|
+
:settings => Agent.config.to_collector_hash,
|
36
|
+
:high_security => Agent.config[:high_security],
|
37
|
+
:utilization => UtilizationData.new.to_collector_hash,
|
38
|
+
:identifier => "ruby:#{local_host}:#{Agent.config[:app_name].sort.join(',')}",
|
39
|
+
:event_harvest_config => @event_harvest_config
|
40
|
+
}
|
41
|
+
end
|
42
|
+
|
43
|
+
# We've seen objects in the environment report (Rails.env in
|
44
|
+
# particular) that can't seralize to JSON. Cope with that here and
|
45
|
+
# clear out so downstream code doesn't have to check again.
|
46
|
+
def sanitize_environment_report(environment_report)
|
47
|
+
return [] unless @service.valid_to_marshal?(environment_report)
|
48
|
+
environment_report
|
49
|
+
end
|
50
|
+
|
51
|
+
def environment_metadata
|
52
|
+
ENV.select {|k, v| k =~ /^NEW_RELIC_METADATA_/}
|
53
|
+
end
|
54
|
+
|
55
|
+
def local_host
|
56
|
+
NewRelic::Agent::Hostname.get
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|
61
|
+
end
|
@@ -0,0 +1,61 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
|
6
|
+
module NewRelic
|
7
|
+
module Agent
|
8
|
+
module Connect
|
9
|
+
|
10
|
+
class ResponseHandler
|
11
|
+
|
12
|
+
def initialize(agent, config)
|
13
|
+
@agent = agent
|
14
|
+
@config = config
|
15
|
+
end
|
16
|
+
|
17
|
+
# Takes a hash of configuration data returned from the
|
18
|
+
# server and uses it to set local variables and to
|
19
|
+
# initialize various parts of the agent that are configured
|
20
|
+
# separately.
|
21
|
+
#
|
22
|
+
# Can accommodate most arbitrary data - anything extra is
|
23
|
+
# ignored unless we say to do something with it here.
|
24
|
+
def configure_agent(config_data)
|
25
|
+
return if config_data == nil
|
26
|
+
|
27
|
+
@agent.agent_id = config_data['agent_run_id']
|
28
|
+
|
29
|
+
security_policies = config_data.delete('security_policies')
|
30
|
+
|
31
|
+
add_server_side_config(config_data)
|
32
|
+
add_security_policy_config(security_policies) if security_policies
|
33
|
+
|
34
|
+
@agent.transaction_rules = RulesEngine.create_transaction_rules(config_data)
|
35
|
+
@agent.stats_engine.metric_rules = RulesEngine.create_metric_rules(config_data)
|
36
|
+
|
37
|
+
# If you're adding something else here to respond to the server-side config,
|
38
|
+
# use Agent.instance.events.subscribe(:initial_configuration_complete) callback instead!
|
39
|
+
end
|
40
|
+
|
41
|
+
def add_server_side_config(config_data)
|
42
|
+
if config_data['agent_config']
|
43
|
+
::NewRelic::Agent.logger.debug "Using config from server"
|
44
|
+
end
|
45
|
+
|
46
|
+
::NewRelic::Agent.logger.debug "Server provided config: #{config_data.inspect}"
|
47
|
+
server_config = NewRelic::Agent::Configuration::ServerSource.new(config_data, @config)
|
48
|
+
@config.replace_or_add_config(server_config)
|
49
|
+
end
|
50
|
+
|
51
|
+
def add_security_policy_config(security_policies)
|
52
|
+
::NewRelic::Agent.logger.info 'Installing security policies'
|
53
|
+
security_policy_source = NewRelic::Agent::Configuration::SecurityPolicySource.new(security_policies)
|
54
|
+
@config.replace_or_add_config(security_policy_source)
|
55
|
+
# drop data collected before applying security policies
|
56
|
+
@agent.drop_buffered_data
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|
61
|
+
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/event_aggregator'
|
6
6
|
require 'new_relic/agent/attribute_processing'
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/database/obfuscator'
|
6
6
|
require 'new_relic/agent/database/postgres_explain_obfuscator'
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -11,7 +11,7 @@ module NewRelic
|
|
11
11
|
:double_quotes => /"(?:[^"]|"")*?(?:\\".*|"(?!"))/,
|
12
12
|
:dollar_quotes => /(\$(?!\d)[^$]*?\$).*?(?:\1|$)/,
|
13
13
|
:uuids => /\{?(?:[0-9a-fA-F]\-*){32}\}?/,
|
14
|
-
:numeric_literals =>
|
14
|
+
:numeric_literals => /-?\b(?:[0-9]+\.)?[0-9]+([eE][+-]?[0-9]+)?\b/,
|
15
15
|
:boolean_literals => /\b(?:true|false|null)\b/i,
|
16
16
|
:hexadecimal_literals => /0x[0-9a-fA-F]+/,
|
17
17
|
:comments => /(?:#|--).*?(?=\r|\n|$)/i,
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/database/obfuscation_helpers'
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'singleton'
|
6
6
|
require 'new_relic/agent/database/explain_plan_helpers'
|
@@ -133,10 +133,9 @@ module NewRelic
|
|
133
133
|
]
|
134
134
|
|
135
135
|
SQL_COMMENT_REGEX = Regexp.new('/\*.*?\*/', Regexp::MULTILINE).freeze
|
136
|
-
EMPTY_STRING = ''.freeze
|
137
136
|
|
138
137
|
def parse_operation_from_query(sql)
|
139
|
-
sql = Helper.correctly_encoded(sql).gsub(SQL_COMMENT_REGEX,
|
138
|
+
sql = Helper.correctly_encoded(sql).gsub(SQL_COMMENT_REGEX, NewRelic::EMPTY_STR)
|
140
139
|
if sql =~ /(\w+)/
|
141
140
|
op = $1.downcase
|
142
141
|
return op if KNOWN_OPERATIONS.include?(op)
|
@@ -0,0 +1,33 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
class DatabaseAdapter
|
8
|
+
VERSIONS = {
|
9
|
+
'6.1.0' => proc { ActiveRecord::Base.connection_db_config.configuration_hash[:adapter] },
|
10
|
+
'4.0.0' => proc { ActiveRecord::Base.connection_config[:adapter] },
|
11
|
+
'3.0.0' => proc { |env| ActiveRecord::Base.configurations[env]['adapter'] }
|
12
|
+
}
|
13
|
+
|
14
|
+
def self.value
|
15
|
+
return unless defined? ActiveRecord::Base
|
16
|
+
new(::NewRelic::Control.instance.env, ActiveRecord::VERSION::STRING).value
|
17
|
+
end
|
18
|
+
|
19
|
+
attr_reader :env, :version
|
20
|
+
|
21
|
+
def initialize(env, version)
|
22
|
+
@env = env
|
23
|
+
@version = Gem::Version.new(version)
|
24
|
+
end
|
25
|
+
|
26
|
+
def value
|
27
|
+
match = VERSIONS.keys.find { |key| version >= Gem::Version.new(key) }
|
28
|
+
return unless match
|
29
|
+
VERSIONS[match].call(env)
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -107,8 +107,7 @@ module NewRelic
|
|
107
107
|
# Allow Transaction#with_database_metric_name to override our
|
108
108
|
# collection and operation
|
109
109
|
def self.overridden_operation_and_collection #THREAD_LOCAL_ACCESS
|
110
|
-
|
111
|
-
txn = state.current_transaction
|
110
|
+
txn = Tracer.current_transaction
|
112
111
|
txn ? txn.instrumentation_state[:datastore_override] : nil
|
113
112
|
end
|
114
113
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
require 'new_relic/agent/datastores/mongo/obfuscator'
|
5
5
|
|
6
6
|
module NewRelic
|
@@ -13,7 +13,7 @@ module NewRelic
|
|
13
13
|
OBFUSCATE_KEYS = [ 'filter', 'query', 'pipeline' ].freeze
|
14
14
|
|
15
15
|
# Keys that will get completely removed from the statement.
|
16
|
-
|
16
|
+
DENYLISTED_KEYS = [ 'deletes', 'documents', 'updates' ].freeze
|
17
17
|
|
18
18
|
def self.format(command_name, database_name, command)
|
19
19
|
return nil unless NewRelic::Agent.config[:'mongo.capture_queries']
|
@@ -25,7 +25,7 @@ module NewRelic
|
|
25
25
|
}
|
26
26
|
|
27
27
|
command.each do |key, value|
|
28
|
-
next if
|
28
|
+
next if DENYLISTED_KEYS.include?(key)
|
29
29
|
if OBFUSCATE_KEYS.include?(key)
|
30
30
|
obfuscated = obfuscate(value)
|
31
31
|
result[key] = obfuscated if obfuscated
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/datastores/mongo/obfuscator'
|
6
6
|
require 'new_relic/agent/datastores/metric_helper'
|