newrelic_rpm 8.10.1 → 8.12.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -1
- data/.rubocop.yml +20 -190
- data/.rubocop_todo.yml +11 -202
- data/.simplecov +6 -4
- data/Brewfile +1 -0
- data/CHANGELOG.md +113 -41
- data/Gemfile +0 -1
- data/README.md +1 -1
- data/Rakefile +3 -20
- data/Thorfile +0 -1
- data/bin/nrdebug +65 -43
- data/config.dot +5 -5
- data/docker-compose.yml +22 -0
- data/init.rb +1 -2
- data/install.rb +1 -2
- data/lib/new_relic/agent/adaptive_sampler.rb +0 -1
- data/lib/new_relic/agent/agent/shutdown.rb +1 -1
- data/lib/new_relic/agent/agent/special_startup.rb +2 -1
- data/lib/new_relic/agent/agent/start_worker_thread.rb +0 -1
- data/lib/new_relic/agent/agent/startup.rb +1 -1
- data/lib/new_relic/agent/agent.rb +100 -73
- data/lib/new_relic/agent/agent_logger.rb +4 -5
- data/lib/new_relic/agent/attribute_filter.rb +39 -21
- data/lib/new_relic/agent/attribute_processing.rb +3 -4
- data/lib/new_relic/agent/attributes.rb +1 -1
- data/lib/new_relic/agent/audit_logger.rb +3 -3
- data/lib/new_relic/agent/autostart.rb +0 -1
- data/lib/new_relic/agent/chained_call.rb +0 -1
- data/lib/new_relic/agent/commands/agent_command.rb +0 -1
- data/lib/new_relic/agent/commands/agent_command_router.rb +3 -4
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +82 -31
- data/lib/new_relic/agent/configuration/dotted_hash.rb +2 -2
- data/lib/new_relic/agent/configuration/environment_source.rb +4 -4
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +0 -1
- data/lib/new_relic/agent/configuration/high_security_source.rb +1 -1
- data/lib/new_relic/agent/configuration/manager.rb +4 -2
- data/lib/new_relic/agent/configuration/manual_source.rb +0 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +2 -3
- data/lib/new_relic/agent/configuration/security_policy_source.rb +10 -1
- data/lib/new_relic/agent/configuration/server_source.rb +0 -1
- data/lib/new_relic/agent/configuration/yaml_source.rb +3 -3
- data/lib/new_relic/agent/configuration.rb +0 -1
- data/lib/new_relic/agent/connect/request_builder.rb +2 -2
- data/lib/new_relic/agent/connect/response_handler.rb +1 -2
- data/lib/new_relic/agent/custom_event_aggregator.rb +0 -1
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +0 -1
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +1 -1
- data/lib/new_relic/agent/database/obfuscator.rb +0 -1
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +0 -1
- data/lib/new_relic/agent/database.rb +20 -14
- data/lib/new_relic/agent/database_adapter.rb +2 -1
- data/lib/new_relic/agent/datastores/metric_helper.rb +0 -4
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +5 -5
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +2 -5
- data/lib/new_relic/agent/datastores/mongo.rb +0 -1
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +0 -1
- data/lib/new_relic/agent/datastores.rb +0 -1
- data/lib/new_relic/agent/deprecator.rb +0 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +0 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +3 -1
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +3 -1
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +1 -2
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +0 -1
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +0 -1
- data/lib/new_relic/agent/distributed_tracing.rb +0 -1
- data/lib/new_relic/agent/encoding_normalizer.rb +2 -1
- data/lib/new_relic/agent/error_collector.rb +3 -1
- data/lib/new_relic/agent/error_event_aggregator.rb +0 -1
- data/lib/new_relic/agent/error_filter.rb +5 -5
- data/lib/new_relic/agent/error_trace_aggregator.rb +2 -2
- data/lib/new_relic/agent/event_aggregator.rb +1 -1
- data/lib/new_relic/agent/event_buffer.rb +0 -1
- data/lib/new_relic/agent/event_listener.rb +0 -1
- data/lib/new_relic/agent/event_loop.rb +4 -3
- data/lib/new_relic/agent/external.rb +1 -2
- data/lib/new_relic/agent/guid_generator.rb +0 -1
- data/lib/new_relic/agent/harvester.rb +0 -1
- data/lib/new_relic/agent/heap.rb +2 -3
- data/lib/new_relic/agent/hostname.rb +0 -1
- data/lib/new_relic/agent/http_clients/abstract.rb +2 -1
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +0 -1
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +0 -1
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +1 -2
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +1 -2
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +0 -1
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +2 -2
- data/lib/new_relic/agent/http_clients/uri_util.rb +0 -1
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +0 -1
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +0 -1
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +1 -2
- data/lib/new_relic/agent/instrumentation/active_job.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +3 -2
- data/lib/new_relic/agent/instrumentation/active_record.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_storage.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +2 -1
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +0 -1
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +1 -1
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -1
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/bunny.rb +0 -1
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +3 -3
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +14 -11
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/curb.rb +0 -1
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +1 -2
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +0 -1
- data/lib/new_relic/agent/instrumentation/excon.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grape.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httpclient.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httprb.rb +0 -1
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +0 -1
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +4 -1
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/logger.rb +0 -1
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +1 -2
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +0 -1
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +1 -2
- data/lib/new_relic/agent/instrumentation/memcache.rb +4 -5
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +1 -2
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +0 -1
- data/lib/new_relic/agent/instrumentation/mongo.rb +0 -1
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +3 -2
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/net_http.rb +0 -1
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +4 -3
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/padrino.rb +0 -1
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/queue_time.rb +0 -2
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +3 -1
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rack.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +6 -1
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rake.rb +0 -1
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/redis.rb +0 -1
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +0 -1
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/resque.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sequel.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +2 -2
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sinatra.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -1
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/thread.rb +0 -1
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/tilt.rb +0 -1
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +0 -1
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +3 -4
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +0 -1
- data/lib/new_relic/agent/instrumentation.rb +0 -1
- data/lib/new_relic/agent/internal_agent_error.rb +0 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +2 -2
- data/lib/new_relic/agent/linking_metadata.rb +0 -1
- data/lib/new_relic/agent/local_log_decorator.rb +1 -1
- data/lib/new_relic/agent/log_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/log_once.rb +0 -1
- data/lib/new_relic/agent/log_priority.rb +0 -1
- data/lib/new_relic/agent/logging.rb +0 -1
- data/lib/new_relic/agent/memory_logger.rb +0 -1
- data/lib/new_relic/agent/messaging.rb +2 -2
- data/lib/new_relic/agent/method_tracer.rb +4 -1
- data/lib/new_relic/agent/method_tracer_helpers.rb +1 -2
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +0 -1
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +1 -1
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +0 -1
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +0 -1
- data/lib/new_relic/agent/monitors.rb +0 -1
- data/lib/new_relic/agent/new_relic_service/encoders.rb +0 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +0 -1
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +0 -1
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +0 -1
- data/lib/new_relic/agent/new_relic_service.rb +195 -142
- data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +1 -2
- data/lib/new_relic/agent/null_logger.rb +0 -1
- data/lib/new_relic/agent/obfuscator.rb +1 -2
- data/lib/new_relic/agent/parameter_filtering.rb +0 -1
- data/lib/new_relic/agent/payload_metric_mapping.rb +0 -1
- data/lib/new_relic/agent/pipe_channel_manager.rb +2 -1
- data/lib/new_relic/agent/pipe_service.rb +0 -1
- data/lib/new_relic/agent/prepend_supportability.rb +0 -1
- data/lib/new_relic/agent/priority_sampled_buffer.rb +2 -3
- data/lib/new_relic/agent/range_extensions.rb +0 -1
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +0 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +0 -1
- data/lib/new_relic/agent/rules_engine.rb +1 -1
- data/lib/new_relic/agent/sampler.rb +0 -1
- data/lib/new_relic/agent/sampler_collection.rb +0 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +0 -1
- data/lib/new_relic/agent/samplers/memory_sampler.rb +10 -6
- data/lib/new_relic/agent/samplers/object_sampler.rb +0 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +2 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +0 -1
- data/lib/new_relic/agent/span_event_primitive.rb +1 -2
- data/lib/new_relic/agent/sql_sampler.rb +0 -1
- data/lib/new_relic/agent/stats.rb +13 -3
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -2
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -2
- data/lib/new_relic/agent/stats_engine.rb +0 -1
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +0 -1
- data/lib/new_relic/agent/system_info.rb +4 -2
- data/lib/new_relic/agent/threading/agent_thread.rb +3 -3
- data/lib/new_relic/agent/threading/backtrace_node.rb +0 -1
- data/lib/new_relic/agent/threading/backtrace_service.rb +1 -1
- data/lib/new_relic/agent/threading/thread_profile.rb +4 -2
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +0 -1
- data/lib/new_relic/agent/tracer.rb +6 -3
- data/lib/new_relic/agent/transaction/abstract_segment.rb +5 -3
- data/lib/new_relic/agent/transaction/datastore_segment.rb +3 -1
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +4 -1
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +1 -1
- data/lib/new_relic/agent/transaction/external_request_segment.rb +2 -2
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/request_attributes.rb +0 -1
- data/lib/new_relic/agent/transaction/segment.rb +1 -1
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +0 -1
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +0 -1
- data/lib/new_relic/agent/transaction/trace.rb +4 -1
- data/lib/new_relic/agent/transaction/trace_builder.rb +0 -1
- data/lib/new_relic/agent/transaction/trace_context.rb +0 -1
- data/lib/new_relic/agent/transaction/trace_node.rb +3 -3
- data/lib/new_relic/agent/transaction/tracing.rb +0 -1
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +2 -2
- data/lib/new_relic/agent/transaction.rb +13 -5
- data/lib/new_relic/agent/transaction_error_primitive.rb +0 -1
- data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/transaction_event_primitive.rb +0 -1
- data/lib/new_relic/agent/transaction_event_recorder.rb +1 -2
- data/lib/new_relic/agent/transaction_metrics.rb +1 -2
- data/lib/new_relic/agent/transaction_sampler.rb +0 -1
- data/lib/new_relic/agent/transaction_time_aggregator.rb +2 -2
- data/lib/new_relic/agent/utilization/aws.rb +0 -1
- data/lib/new_relic/agent/utilization/azure.rb +1 -2
- data/lib/new_relic/agent/utilization/gcp.rb +1 -2
- data/lib/new_relic/agent/utilization/pcf.rb +2 -2
- data/lib/new_relic/agent/utilization/vendor.rb +3 -2
- data/lib/new_relic/agent/utilization_data.rb +3 -1
- data/lib/new_relic/agent/vm/jruby_vm.rb +0 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +0 -1
- data/lib/new_relic/agent/vm/mri_vm.rb +35 -23
- data/lib/new_relic/agent/vm/snapshot.rb +1 -2
- data/lib/new_relic/agent/vm.rb +0 -1
- data/lib/new_relic/agent/worker_loop.rb +0 -1
- data/lib/new_relic/agent.rb +17 -18
- data/lib/new_relic/cli/command.rb +1 -2
- data/lib/new_relic/cli/commands/deployments.rb +72 -21
- data/lib/new_relic/cli/commands/install.rb +1 -1
- data/lib/new_relic/coerce.rb +6 -1
- data/lib/new_relic/collection_helper.rb +2 -2
- data/lib/new_relic/constants.rb +0 -1
- data/lib/new_relic/control/class_methods.rb +0 -1
- data/lib/new_relic/control/frameworks/external.rb +0 -1
- data/lib/new_relic/control/frameworks/rails.rb +5 -1
- data/lib/new_relic/control/frameworks/rails3.rb +0 -1
- data/lib/new_relic/control/frameworks/rails4.rb +0 -1
- data/lib/new_relic/control/frameworks/rails_notifications.rb +0 -1
- data/lib/new_relic/control/frameworks/ruby.rb +0 -1
- data/lib/new_relic/control/frameworks/sinatra.rb +0 -1
- data/lib/new_relic/control/frameworks.rb +0 -1
- data/lib/new_relic/control/instance_methods.rb +17 -40
- data/lib/new_relic/control/instrumentation.rb +2 -1
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +0 -1
- data/lib/new_relic/control.rb +0 -1
- data/lib/new_relic/delayed_job_injection.rb +0 -1
- data/lib/new_relic/dependency_detection.rb +5 -4
- data/lib/new_relic/environment_report.rb +23 -14
- data/lib/new_relic/helper.rb +2 -2
- data/lib/new_relic/language_support.rb +3 -3
- data/lib/new_relic/latest_changes.rb +4 -4
- data/lib/new_relic/local_environment.rb +9 -4
- data/lib/new_relic/metric_data.rb +27 -22
- data/lib/new_relic/metric_spec.rb +2 -1
- data/lib/new_relic/noticed_error.rb +3 -6
- data/lib/new_relic/rack/agent_hooks.rb +0 -1
- data/lib/new_relic/rack/agent_middleware.rb +2 -1
- data/lib/new_relic/rack/browser_monitoring.rb +131 -123
- data/lib/new_relic/rack.rb +0 -1
- data/lib/new_relic/recipes/capistrano3.rb +2 -59
- data/lib/new_relic/recipes/capistrano_legacy.rb +1 -2
- data/lib/new_relic/recipes/helpers/send_deployment.rb +69 -0
- data/lib/new_relic/recipes.rb +0 -1
- data/lib/new_relic/supportability_helper.rb +1 -2
- data/lib/new_relic/traced_thread.rb +1 -1
- data/lib/new_relic/version.rb +2 -3
- data/lib/newrelic_rpm.rb +0 -1
- data/lib/sequel/extensions/newrelic_instrumentation.rb +2 -3
- data/lib/sequel/plugins/newrelic_instrumentation.rb +0 -1
- data/lib/tasks/all.rb +0 -1
- data/lib/tasks/config.rake +4 -113
- data/lib/tasks/coverage_report.rake +14 -19
- data/lib/tasks/{config.html.erb → helpers/config.html.erb} +0 -0
- data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
- data/lib/tasks/helpers/format.rb +123 -0
- data/lib/tasks/helpers/matches.rb +12 -0
- data/lib/tasks/helpers/prompt.rb +24 -0
- data/lib/tasks/helpers/removers.rb +33 -0
- data/lib/tasks/install.rake +0 -1
- data/lib/tasks/instrumentation_generator/README.md +1 -1
- data/lib/tasks/instrumentation_generator/instrumentation.thor +45 -17
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +0 -1
- data/lib/tasks/instrumentation_generator/templates/chain.tt +2 -2
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +3 -2
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +0 -1
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +2 -2
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +1 -1
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +1 -2
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +1 -1
- data/lib/tasks/instrumentation_generator/templates/test.tt +1 -2
- data/lib/tasks/multiverse.rake +0 -1
- data/lib/tasks/multiverse.rb +3 -29
- data/lib/tasks/newrelic.rb +0 -1
- data/lib/tasks/tests.rake +3 -8
- data/newrelic.yml +23 -4
- data/newrelic_rpm.gemspec +8 -9
- data/recipes/newrelic.rb +0 -1
- data/test/agent_helper.rb +23 -35
- metadata +20 -80
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -14,6 +13,7 @@ module NewRelic
|
|
14
13
|
|
15
14
|
def self.value
|
16
15
|
return unless defined? ActiveRecord::Base
|
16
|
+
|
17
17
|
new(::NewRelic::Control.instance.env, ActiveRecord::VERSION::STRING).value
|
18
18
|
end
|
19
19
|
|
@@ -27,6 +27,7 @@ module NewRelic
|
|
27
27
|
def value
|
28
28
|
match = VERSIONS.keys.find { |key| version >= Gem::Version.new(key) }
|
29
29
|
return unless match
|
30
|
+
|
30
31
|
VERSIONS[match].call(env)
|
31
32
|
end
|
32
33
|
end
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -8,9 +7,6 @@ module NewRelic
|
|
8
7
|
module Datastores
|
9
8
|
module MetricHelper
|
10
9
|
ROLLUP_METRIC = "Datastore/all".freeze
|
11
|
-
WEB_ROLLUP_METRIC = "Datastore/allWeb".freeze
|
12
|
-
OTHER_ROLLUP_METRIC = "Datastore/allOther".freeze
|
13
|
-
DEFAULT_PRODUCT_NAME = "ActiveRecord".freeze
|
14
10
|
OTHER = "Other".freeze
|
15
11
|
|
16
12
|
ALL = "all".freeze
|
@@ -1,9 +1,8 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
5
4
|
|
6
|
-
|
5
|
+
require_relative '../nosql_obfuscator'
|
7
6
|
|
8
7
|
module NewRelic
|
9
8
|
module Agent
|
@@ -11,10 +10,10 @@ module NewRelic
|
|
11
10
|
module Mongo
|
12
11
|
module EventFormatter
|
13
12
|
# Keys that will get their values replaced with '?'.
|
14
|
-
OBFUSCATE_KEYS = [
|
13
|
+
OBFUSCATE_KEYS = %w[filter query pipeline].freeze
|
15
14
|
|
16
15
|
# Keys that will get completely removed from the statement.
|
17
|
-
DENYLISTED_KEYS = [
|
16
|
+
DENYLISTED_KEYS = %w[deletes documents updates].freeze
|
18
17
|
|
19
18
|
def self.format(command_name, database_name, command)
|
20
19
|
return nil unless NewRelic::Agent.config[:'mongo.capture_queries']
|
@@ -27,6 +26,7 @@ module NewRelic
|
|
27
26
|
|
28
27
|
command.each do |key, value|
|
29
28
|
next if DENYLISTED_KEYS.include?(key)
|
29
|
+
|
30
30
|
if OBFUSCATE_KEYS.include?(key)
|
31
31
|
obfuscated = obfuscate(value)
|
32
32
|
result[key] = obfuscated if obfuscated
|
@@ -39,7 +39,7 @@ module NewRelic
|
|
39
39
|
|
40
40
|
def self.obfuscate(statement)
|
41
41
|
if NewRelic::Agent.config[:'mongo.obfuscate_queries']
|
42
|
-
statement =
|
42
|
+
statement = NewRelic::Agent::Datastores::NosqlObfuscator.obfuscate_statement(statement)
|
43
43
|
end
|
44
44
|
statement
|
45
45
|
end
|
@@ -1,9 +1,8 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
5
4
|
|
6
|
-
require 'new_relic/agent/datastores/
|
5
|
+
require 'new_relic/agent/datastores/nosql_obfuscator'
|
7
6
|
require 'new_relic/agent/datastores/metric_helper'
|
8
7
|
|
9
8
|
module NewRelic
|
@@ -58,8 +57,6 @@ module NewRelic
|
|
58
57
|
nil
|
59
58
|
end
|
60
59
|
|
61
|
-
MONGO_PRODUCT_NAME = "MongoDB".freeze
|
62
|
-
|
63
60
|
def self.collection_in_selector?(payload)
|
64
61
|
payload[:collection] == '$cmd' && payload[:selector]
|
65
62
|
end
|
@@ -122,7 +119,7 @@ module NewRelic
|
|
122
119
|
name == :findandmodify && payload[:selector] && payload[:selector][:remove]
|
123
120
|
end
|
124
121
|
|
125
|
-
def self.create_indexes?(name,
|
122
|
+
def self.create_indexes?(name, _payload)
|
126
123
|
name == :createIndexes
|
127
124
|
end
|
128
125
|
|
@@ -0,0 +1,41 @@
|
|
1
|
+
# This file is distributed under New Relic's license terms.
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
module Datastores
|
8
|
+
module NosqlObfuscator
|
9
|
+
ALLOWLIST = [:operation].freeze
|
10
|
+
|
11
|
+
def self.obfuscate_statement(source, allowlist = ALLOWLIST)
|
12
|
+
if source.is_a?(Hash)
|
13
|
+
obfuscated = {}
|
14
|
+
source.each do |key, value|
|
15
|
+
if allowlist.include?(key)
|
16
|
+
obfuscated[key] = value
|
17
|
+
else
|
18
|
+
obfuscated[key] = obfuscate_value(value, allowlist)
|
19
|
+
end
|
20
|
+
end
|
21
|
+
obfuscated
|
22
|
+
else
|
23
|
+
obfuscate_value(source, allowlist)
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
QUESTION_MARK = '?'.freeze
|
28
|
+
|
29
|
+
def self.obfuscate_value(value, allowlist = ALLOWLIST)
|
30
|
+
if value.is_a?(Hash)
|
31
|
+
obfuscate_statement(value, allowlist)
|
32
|
+
elsif value.is_a?(Array)
|
33
|
+
value.map { |v| obfuscate_value(v, allowlist) }
|
34
|
+
else
|
35
|
+
QUESTION_MARK
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
@@ -1,5 +1,4 @@
|
|
1
1
|
# -*- ruby -*-
|
2
|
-
# encoding: utf-8
|
3
2
|
# This file is distributed under New Relic's license terms.
|
4
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
5
4
|
# frozen_string_literal: true
|
@@ -65,6 +64,7 @@ module NewRelic
|
|
65
64
|
|
66
65
|
def add_message_cat_headers(headers)
|
67
66
|
return unless CrossAppTracing.cross_app_enabled?
|
67
|
+
|
68
68
|
@is_cross_app_caller = true
|
69
69
|
insert_message_headers(headers,
|
70
70
|
transaction.guid,
|
@@ -113,9 +113,11 @@ module NewRelic
|
|
113
113
|
end
|
114
114
|
|
115
115
|
return unless transaction.include_guid?
|
116
|
+
|
116
117
|
payload[:guid] = transaction.guid
|
117
118
|
|
118
119
|
return unless is_cross_app?
|
120
|
+
|
119
121
|
trip_id = cat_trip_id
|
120
122
|
path_hash = cat_path_hash
|
121
123
|
referring_path_hash = cat_referring_path_hash
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -26,6 +25,7 @@ module NewRelic
|
|
26
25
|
# inserts them into the specified destination.
|
27
26
|
def copy_to_hash(transaction_payload, destination)
|
28
27
|
return unless enabled?
|
28
|
+
|
29
29
|
INTRINSIC_KEYS.each do |key|
|
30
30
|
value = transaction_payload[key]
|
31
31
|
destination[key] = value unless value.nil?
|
@@ -36,8 +36,10 @@ module NewRelic
|
|
36
36
|
# inserts them as intrinsics in the specified transaction_attributes
|
37
37
|
def copy_to_attributes(transaction_payload, destination)
|
38
38
|
return unless enabled?
|
39
|
+
|
39
40
|
INTRINSIC_KEYS.each do |key|
|
40
41
|
next unless transaction_payload.key?(key)
|
42
|
+
|
41
43
|
destination.add_intrinsic_attribute(key, transaction_payload[key])
|
42
44
|
end
|
43
45
|
end
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -24,6 +23,7 @@ module NewRelic
|
|
24
23
|
|
25
24
|
def record_metrics_for_transaction(transaction)
|
26
25
|
return unless Agent.config[:'distributed_tracing.enabled']
|
26
|
+
|
27
27
|
dt = transaction.distributed_tracer
|
28
28
|
payload = dt.distributed_trace_payload || dt.trace_state_payload
|
29
29
|
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -19,7 +18,6 @@ module NewRelic
|
|
19
18
|
|
20
19
|
VERSION = [0, 1].freeze
|
21
20
|
PARENT_TYPE = "App"
|
22
|
-
POUND = '#'
|
23
21
|
|
24
22
|
# Key names for serialization
|
25
23
|
VERSION_KEY = 'v'
|
@@ -60,6 +58,7 @@ module NewRelic
|
|
60
58
|
def from_json(serialized_payload)
|
61
59
|
raw_payload = JSON.parse(serialized_payload)
|
62
60
|
return raw_payload if raw_payload.nil?
|
61
|
+
|
63
62
|
payload_data = raw_payload[DATA_KEY]
|
64
63
|
|
65
64
|
payload = new
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -97,6 +96,7 @@ module NewRelic
|
|
97
96
|
def extract_traceparent(format, carrier)
|
98
97
|
header_name = trace_parent_header_for_format(format)
|
99
98
|
return unless header = carrier[header_name]
|
99
|
+
|
100
100
|
if matchdata = header.match(TRACE_PARENT_REGEX)
|
101
101
|
TRACE_PARENT_REGEX.named_captures.inject({}) do |hash, (name, (index))|
|
102
102
|
hash[name] = matchdata[index]
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -20,9 +19,11 @@ module NewRelic
|
|
20
19
|
normalize_string(object.to_s)
|
21
20
|
when Array
|
22
21
|
return object if object.empty?
|
22
|
+
|
23
23
|
object.map { |x| normalize_object(x) }
|
24
24
|
when Hash
|
25
25
|
return object if object.empty?
|
26
|
+
|
26
27
|
hash = {}
|
27
28
|
object.each_pair do |k, v|
|
28
29
|
k = normalize_string(k) if k.is_a?(String)
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -124,11 +123,13 @@ module NewRelic
|
|
124
123
|
|
125
124
|
def exception_tagged_with?(ivar, exception)
|
126
125
|
return false if exception_is_java_object?(exception)
|
126
|
+
|
127
127
|
exception.instance_variable_defined?(ivar)
|
128
128
|
end
|
129
129
|
|
130
130
|
def tag_exception_using(ivar, exception)
|
131
131
|
return if exception_is_java_object?(exception) || exception.frozen?
|
132
|
+
|
132
133
|
begin
|
133
134
|
exception.instance_variable_set(ivar, true)
|
134
135
|
rescue => e
|
@@ -138,6 +139,7 @@ module NewRelic
|
|
138
139
|
|
139
140
|
def tag_exception(exception)
|
140
141
|
return if exception_is_java_object?(exception) || exception.frozen?
|
142
|
+
|
141
143
|
begin
|
142
144
|
exception.instance_variable_set(EXCEPTION_TAG_IVAR, true)
|
143
145
|
rescue => e
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -51,14 +50,14 @@ module NewRelic
|
|
51
50
|
|
52
51
|
def ignore?(ex, status_code = nil)
|
53
52
|
@ignore_classes.include?(ex.class.name) ||
|
54
|
-
(@ignore_messages.
|
53
|
+
(@ignore_messages.key?(ex.class.name) &&
|
55
54
|
@ignore_messages[ex.class.name].any? { |m| ex.message.include?(m) }) ||
|
56
55
|
@ignore_status_codes.include?(status_code.to_i)
|
57
56
|
end
|
58
57
|
|
59
58
|
def expected?(ex, status_code = nil)
|
60
59
|
@expected_classes.include?(ex.class.name) ||
|
61
|
-
(@expected_messages.
|
60
|
+
(@expected_messages.key?(ex.class.name) &&
|
62
61
|
@expected_messages[ex.class.name].any? { |m| ex.message.include?(m) }) ||
|
63
62
|
@expected_status_codes.include?(status_code.to_i)
|
64
63
|
end
|
@@ -81,7 +80,7 @@ module NewRelic
|
|
81
80
|
@ignore_messages.update(errors)
|
82
81
|
log_filter(:ignore_messages, errors)
|
83
82
|
when String
|
84
|
-
if errors
|
83
|
+
if errors =~ /^[\d\,\-]+$/
|
85
84
|
@ignore_status_codes |= parse_status_codes(errors)
|
86
85
|
log_filter(:ignore_status_codes, errors)
|
87
86
|
else
|
@@ -105,7 +104,7 @@ module NewRelic
|
|
105
104
|
@expected_messages.update(errors)
|
106
105
|
log_filter(:expected_messages, errors)
|
107
106
|
when String
|
108
|
-
if errors
|
107
|
+
if errors =~ /^[\d\,\-]+$/
|
109
108
|
@expected_status_codes |= parse_status_codes(errors)
|
110
109
|
log_filter(:expected_status_codes, errors)
|
111
110
|
else
|
@@ -156,6 +155,7 @@ module NewRelic
|
|
156
155
|
result = []
|
157
156
|
code_list.each do |code|
|
158
157
|
result << code && next if code.is_a?(Integer)
|
158
|
+
|
159
159
|
m = code.match(/(\d{3})(-\d{3})?/)
|
160
160
|
if m.nil? || m[1].nil?
|
161
161
|
::NewRelic::Agent.logger.warn("Invalid HTTP status code: '#{code}'; ignoring config")
|
@@ -1,5 +1,4 @@
|
|
1
1
|
# -*- ruby -*-
|
2
|
-
# encoding: utf-8
|
3
2
|
# This file is distributed under New Relic's license terms.
|
4
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
5
4
|
# frozen_string_literal: true
|
@@ -45,6 +44,7 @@ module NewRelic
|
|
45
44
|
# floor after logging a warning.
|
46
45
|
def add_to_error_queue(noticed_error)
|
47
46
|
return unless enabled?
|
47
|
+
|
48
48
|
@lock.synchronize do
|
49
49
|
if !over_queue_limit?(noticed_error.message) && !@errors.include?(noticed_error)
|
50
50
|
@errors << noticed_error
|
@@ -55,7 +55,7 @@ module NewRelic
|
|
55
55
|
# checks the size of the error queue to make sure we are under
|
56
56
|
# the maximum limit, and logs a warning if we are over the limit.
|
57
57
|
def over_queue_limit?(message)
|
58
|
-
over_limit = (@errors.
|
58
|
+
over_limit = (@errors.count { |err| !err.is_internal } >= @capacity)
|
59
59
|
if over_limit
|
60
60
|
::NewRelic::Agent.logger.warn("The error reporting queue has reached #{@capacity}. The error detail for this and subsequent errors will not be transmitted to New Relic until the queued errors have been sent: #{message}")
|
61
61
|
end
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -137,6 +136,7 @@ module NewRelic
|
|
137
136
|
|
138
137
|
def notify_if_full
|
139
138
|
return unless !@notified_full && @buffer.full?
|
139
|
+
|
140
140
|
NewRelic::Agent.logger.debug("#{self.class.named} capacity of #{@buffer.capacity} reached, beginning sampling")
|
141
141
|
@notified_full = true
|
142
142
|
end
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -35,6 +34,7 @@ module NewRelic
|
|
35
34
|
def calculate_next_fire_time
|
36
35
|
now = Process.clock_gettime(Process::CLOCK_REALTIME)
|
37
36
|
return now if @interval == 0
|
37
|
+
|
38
38
|
fire_time = @last_fired_at || now
|
39
39
|
while fire_time <= now
|
40
40
|
fire_time += @interval
|
@@ -62,8 +62,8 @@ module NewRelic
|
|
62
62
|
@timers = {}
|
63
63
|
|
64
64
|
@subscriptions = Hash.new { |h, k| h[k] = [] }
|
65
|
-
@subscriptions[:__add_timer] <<
|
66
|
-
@subscriptions[:__add_event] <<
|
65
|
+
@subscriptions[:__add_timer] << proc { |t| set_timer(t) }
|
66
|
+
@subscriptions[:__add_event] << proc { |e, blk| @subscriptions[e] << blk }
|
67
67
|
end
|
68
68
|
|
69
69
|
def set_timer(timer)
|
@@ -81,6 +81,7 @@ module NewRelic
|
|
81
81
|
|
82
82
|
def next_timeout
|
83
83
|
return nil if @timers.empty?
|
84
|
+
|
84
85
|
timeout = @timers.values.map(&:next_fire_time).min - Process.clock_gettime(Process::CLOCK_REALTIME)
|
85
86
|
timeout < 0 ? 0 : timeout
|
86
87
|
end
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -24,7 +23,7 @@ module NewRelic
|
|
24
23
|
NON_HTTP_CAT_SYNTHETICS_HEADER = 'NewRelicSynthetics'.freeze
|
25
24
|
NON_HTTP_CAT_CONTENT_LENGTH = -1
|
26
25
|
|
27
|
-
# Process obfuscated +String+
|
26
|
+
# Process obfuscated +String+ identifying a calling application and transaction that is also running a
|
28
27
|
# New Relic agent and save information in current transaction for inclusion in a trace. The +String+ is
|
29
28
|
# generated by +get_request_metadata+ on the calling application.
|
30
29
|
#
|
data/lib/new_relic/agent/heap.rb
CHANGED
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -7,7 +6,7 @@ module NewRelic
|
|
7
6
|
module Agent
|
8
7
|
# This class implements a min Heap. The first element is always the one with the
|
9
8
|
# lowest priority. It is a tree structure that is represented as an array. The
|
10
|
-
# relationship between
|
9
|
+
# relationship between nodes in the tree and indices in the array are as
|
11
10
|
# follows:
|
12
11
|
#
|
13
12
|
# parent_index = (child_index - 1) / 2
|
@@ -19,7 +18,7 @@ module NewRelic
|
|
19
18
|
#
|
20
19
|
|
21
20
|
class Heap
|
22
|
-
# @param [Array] items an optional array of items to
|
21
|
+
# @param [Array] items an optional array of items to initialize the heap
|
23
22
|
#
|
24
23
|
# @param [Callable] priority_fn an optional priority function used to
|
25
24
|
# to compute the priority for an item. If it's not supplied priority
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -48,6 +47,7 @@ module NewRelic
|
|
48
47
|
if wrapped_response.nil?
|
49
48
|
raise ArgumentError, WHINY_NIL_ERROR % self.class
|
50
49
|
end
|
50
|
+
|
51
51
|
@wrapped_response = wrapped_response
|
52
52
|
end
|
53
53
|
|
@@ -65,6 +65,7 @@ module NewRelic
|
|
65
65
|
|
66
66
|
def get_status_code_using(method_name)
|
67
67
|
return unless @wrapped_response.respond_to?(method_name)
|
68
|
+
|
68
69
|
code = @wrapped_response.send(method_name).to_i
|
69
70
|
code == 0 ? nil : code
|
70
71
|
end
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -10,7 +9,7 @@ module NewRelic
|
|
10
9
|
module HTTPClients
|
11
10
|
class HTTPResponse < AbstractResponse
|
12
11
|
def [](key)
|
13
|
-
_, value = @wrapped_response.headers.find { |k, _| key.
|
12
|
+
_, value = @wrapped_response.headers.find { |k, _| key.casecmp(k).zero? }
|
14
13
|
value unless value.nil?
|
15
14
|
end
|
16
15
|
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -11,7 +10,7 @@ module NewRelic
|
|
11
10
|
class HTTPClientResponse < AbstractResponse
|
12
11
|
def [](key)
|
13
12
|
@wrapped_response.headers.each do |k, v|
|
14
|
-
if key.
|
13
|
+
if key.casecmp(k).zero?
|
15
14
|
return v
|
16
15
|
end
|
17
16
|
end
|
@@ -1,4 +1,3 @@
|
|
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.
|
4
3
|
# frozen_string_literal: true
|
@@ -14,7 +13,7 @@ module NewRelic
|
|
14
13
|
result = headers[key]
|
15
14
|
|
16
15
|
# Typhoeus 0.5.3 has a bug where asking the headers hash for a
|
17
|
-
#
|
16
|
+
# nonexistent header will return the hash itself, not what we want.
|
18
17
|
result == headers ? nil : result
|
19
18
|
end
|
20
19
|
end
|
@@ -68,6 +67,7 @@ module NewRelic
|
|
68
67
|
|
69
68
|
def [](key)
|
70
69
|
return nil unless @request.options && @request.options[:headers]
|
70
|
+
|
71
71
|
@request.options[:headers][key]
|
72
72
|
end
|
73
73
|
|