newrelic_rpm 8.9.0 → 8.10.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +12 -6
- data/.simplecov +1 -0
- data/.snyk +11 -0
- data/Brewfile +1 -0
- data/CHANGELOG.md +56 -0
- data/Guardfile +1 -0
- data/Rakefile +5 -0
- data/bin/mongrel_rpm +7 -6
- data/bin/newrelic +2 -1
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +3 -2
- data/init.rb +3 -2
- data/install.rb +1 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +4 -3
- data/lib/new_relic/agent/agent/shutdown.rb +3 -2
- data/lib/new_relic/agent/agent/special_startup.rb +3 -2
- data/lib/new_relic/agent/agent/start_worker_thread.rb +15 -14
- data/lib/new_relic/agent/agent/startup.rb +11 -10
- data/lib/new_relic/agent/agent.rb +35 -33
- data/lib/new_relic/agent/agent_logger.rb +2 -1
- data/lib/new_relic/agent/attribute_filter.rb +1 -0
- data/lib/new_relic/agent/attribute_processing.rb +4 -3
- data/lib/new_relic/agent/attributes.rb +2 -1
- data/lib/new_relic/agent/audit_logger.rb +1 -0
- data/lib/new_relic/agent/autostart.rb +1 -0
- data/lib/new_relic/agent/chained_call.rb +1 -0
- data/lib/new_relic/agent/commands/agent_command.rb +1 -0
- data/lib/new_relic/agent/commands/agent_command_router.rb +4 -3
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -0
- data/lib/new_relic/agent/configuration/default_source.rb +35 -7
- data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -0
- data/lib/new_relic/agent/configuration/environment_source.rb +2 -1
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -0
- data/lib/new_relic/agent/configuration/high_security_source.rb +1 -0
- data/lib/new_relic/agent/configuration/manager.rb +2 -1
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -0
- data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -0
- data/lib/new_relic/agent/configuration/security_policy_source.rb +7 -3
- data/lib/new_relic/agent/configuration/server_source.rb +7 -6
- data/lib/new_relic/agent/configuration/yaml_source.rb +4 -1
- data/lib/new_relic/agent/configuration.rb +1 -0
- data/lib/new_relic/agent/connect/request_builder.rb +1 -0
- data/lib/new_relic/agent/connect/response_handler.rb +4 -3
- data/lib/new_relic/agent/custom_event_aggregator.rb +5 -4
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -0
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +1 -0
- data/lib/new_relic/agent/database/obfuscator.rb +2 -1
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -0
- data/lib/new_relic/agent/database.rb +3 -2
- data/lib/new_relic/agent/database_adapter.rb +1 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +9 -8
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +2 -0
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -0
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +2 -1
- data/lib/new_relic/agent/datastores/mongo.rb +1 -0
- data/lib/new_relic/agent/datastores/redis.rb +3 -2
- data/lib/new_relic/agent/datastores.rb +4 -3
- data/lib/new_relic/agent/deprecator.rb +1 -0
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +1 -0
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +16 -16
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +9 -9
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +18 -18
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +8 -8
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +2 -2
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +40 -39
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +16 -14
- data/lib/new_relic/agent/distributed_tracing.rb +17 -17
- data/lib/new_relic/agent/encoding_normalizer.rb +1 -0
- data/lib/new_relic/agent/error_collector.rb +6 -4
- data/lib/new_relic/agent/error_event_aggregator.rb +3 -3
- data/lib/new_relic/agent/error_filter.rb +1 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
- data/lib/new_relic/agent/event_aggregator.rb +20 -19
- data/lib/new_relic/agent/event_buffer.rb +1 -0
- data/lib/new_relic/agent/event_listener.rb +1 -0
- data/lib/new_relic/agent/event_loop.rb +7 -6
- data/lib/new_relic/agent/external.rb +9 -8
- data/lib/new_relic/agent/guid_generator.rb +2 -1
- data/lib/new_relic/agent/harvester.rb +1 -0
- data/lib/new_relic/agent/heap.rb +3 -2
- data/lib/new_relic/agent/hostname.rb +4 -2
- data/lib/new_relic/agent/http_clients/abstract.rb +1 -1
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +5 -5
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +4 -4
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +1 -1
- data/lib/new_relic/agent/http_clients/uri_util.rb +1 -1
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +6 -4
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +2 -0
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +6 -4
- data/lib/new_relic/agent/instrumentation/active_job.rb +2 -1
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +2 -1
- data/lib/new_relic/agent/instrumentation/active_record.rb +9 -8
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +15 -14
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +3 -2
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +5 -3
- data/lib/new_relic/agent/instrumentation/active_storage.rb +2 -1
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +16 -14
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +2 -1
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +2 -1
- data/lib/new_relic/agent/instrumentation/authlogic.rb +2 -1
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +10 -9
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +10 -10
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +4 -3
- data/lib/new_relic/agent/instrumentation/bunny.rb +1 -1
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +13 -9
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +21 -21
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +8 -8
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +2 -2
- data/lib/new_relic/agent/instrumentation/curb.rb +2 -1
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +43 -42
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +2 -2
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +3 -2
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
- data/lib/new_relic/agent/instrumentation/excon.rb +2 -1
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +6 -5
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +5 -4
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +4 -3
- data/lib/new_relic/agent/instrumentation/grape.rb +1 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +106 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +88 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +117 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +31 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +31 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +70 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +135 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +36 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +27 -0
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +24 -0
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +26 -0
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +6 -5
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +2 -1
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +4 -3
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +2 -1
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +2 -1
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +2 -1
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +5 -0
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +2 -1
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +2 -2
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +19 -19
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +8 -8
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +17 -14
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +14 -14
- data/lib/new_relic/agent/instrumentation/memcache.rb +1 -1
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +1 -0
- data/lib/new_relic/agent/instrumentation/mongo.rb +2 -1
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +14 -12
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +5 -4
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/net_http.rb +2 -1
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +5 -4
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +2 -1
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +3 -2
- data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +12 -11
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +7 -6
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +4 -3
- data/lib/new_relic/agent/instrumentation/rack.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +6 -5
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +3 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +3 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +3 -1
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +3 -2
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +2 -1
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +3 -2
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +3 -3
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +5 -5
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +3 -3
- data/lib/new_relic/agent/instrumentation/redis.rb +2 -1
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +2 -1
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +3 -2
- data/lib/new_relic/agent/instrumentation/sequel.rb +8 -7
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +6 -4
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +2 -1
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -1
- data/lib/new_relic/agent/instrumentation/sinatra.rb +2 -1
- data/lib/new_relic/agent/instrumentation/sunspot.rb +2 -1
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +2 -1
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/thread.rb +2 -1
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +1 -0
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/tilt.rb +1 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +6 -5
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +2 -1
- data/lib/new_relic/agent/instrumentation.rb +1 -0
- data/lib/new_relic/agent/internal_agent_error.rb +1 -0
- data/lib/new_relic/agent/javascript_instrumentor.rb +7 -6
- data/lib/new_relic/agent/linking_metadata.rb +2 -2
- data/lib/new_relic/agent/log_event_aggregator.rb +6 -5
- data/lib/new_relic/agent/log_once.rb +1 -0
- data/lib/new_relic/agent/log_priority.rb +1 -0
- data/lib/new_relic/agent/logging.rb +13 -12
- data/lib/new_relic/agent/memory_logger.rb +1 -0
- data/lib/new_relic/agent/messaging.rb +18 -18
- data/lib/new_relic/agent/method_tracer.rb +6 -5
- data/lib/new_relic/agent/method_tracer_helpers.rb +8 -5
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +3 -2
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +3 -2
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -0
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +2 -1
- data/lib/new_relic/agent/monitors.rb +5 -4
- data/lib/new_relic/agent/new_relic_service/encoders.rb +2 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +4 -3
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -0
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -0
- data/lib/new_relic/agent/new_relic_service.rb +11 -11
- data/lib/new_relic/agent/noticible_error.rb +1 -1
- data/lib/new_relic/agent/null_logger.rb +1 -0
- data/lib/new_relic/agent/obfuscator.rb +2 -1
- data/lib/new_relic/agent/parameter_filtering.rb +1 -0
- data/lib/new_relic/agent/payload_metric_mapping.rb +1 -0
- data/lib/new_relic/agent/pipe_channel_manager.rb +6 -5
- data/lib/new_relic/agent/pipe_service.rb +1 -0
- data/lib/new_relic/agent/prepend_supportability.rb +2 -1
- data/lib/new_relic/agent/priority_sampled_buffer.rb +2 -1
- data/lib/new_relic/agent/range_extensions.rb +8 -27
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +2 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -0
- data/lib/new_relic/agent/rules_engine.rb +2 -1
- data/lib/new_relic/agent/sampler.rb +1 -0
- data/lib/new_relic/agent/sampler_collection.rb +1 -0
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -0
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -0
- data/lib/new_relic/agent/samplers/memory_sampler.rb +5 -4
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -0
- data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -0
- data/lib/new_relic/agent/span_event_aggregator.rb +2 -1
- data/lib/new_relic/agent/span_event_primitive.rb +15 -11
- data/lib/new_relic/agent/sql_sampler.rb +7 -6
- data/lib/new_relic/agent/stats.rb +3 -1
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -0
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +3 -2
- data/lib/new_relic/agent/stats_engine.rb +1 -0
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +6 -5
- data/lib/new_relic/agent/system_info.rb +8 -7
- data/lib/new_relic/agent/threading/agent_thread.rb +1 -0
- data/lib/new_relic/agent/threading/backtrace_node.rb +6 -3
- data/lib/new_relic/agent/threading/backtrace_service.rb +1 -0
- data/lib/new_relic/agent/threading/thread_profile.rb +1 -0
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -0
- data/lib/new_relic/agent/tracer.rb +12 -11
- data/lib/new_relic/agent/transaction/abstract_segment.rb +64 -31
- data/lib/new_relic/agent/transaction/datastore_segment.rb +12 -11
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +52 -47
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +21 -21
- data/lib/new_relic/agent/transaction/external_request_segment.rb +36 -27
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +6 -5
- data/lib/new_relic/agent/transaction/request_attributes.rb +29 -28
- data/lib/new_relic/agent/transaction/segment.rb +8 -7
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -0
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -0
- data/lib/new_relic/agent/transaction/trace.rb +3 -2
- data/lib/new_relic/agent/transaction/trace_builder.rb +10 -9
- data/lib/new_relic/agent/transaction/trace_context.rb +22 -19
- data/lib/new_relic/agent/transaction/trace_node.rb +9 -8
- data/lib/new_relic/agent/transaction/tracing.rb +7 -6
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -0
- data/lib/new_relic/agent/transaction.rb +22 -21
- data/lib/new_relic/agent/transaction_error_primitive.rb +9 -8
- data/lib/new_relic/agent/transaction_event_aggregator.rb +5 -4
- data/lib/new_relic/agent/transaction_event_primitive.rb +3 -3
- data/lib/new_relic/agent/transaction_event_recorder.rb +14 -12
- data/lib/new_relic/agent/transaction_metrics.rb +3 -2
- data/lib/new_relic/agent/transaction_sampler.rb +4 -3
- data/lib/new_relic/agent/transaction_time_aggregator.rb +13 -12
- data/lib/new_relic/agent/utilization/aws.rb +4 -3
- data/lib/new_relic/agent/utilization/azure.rb +1 -0
- data/lib/new_relic/agent/utilization/gcp.rb +6 -5
- data/lib/new_relic/agent/utilization/pcf.rb +3 -2
- data/lib/new_relic/agent/utilization/vendor.rb +27 -26
- data/lib/new_relic/agent/utilization_data.rb +1 -0
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -0
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -0
- data/lib/new_relic/agent/vm/mri_vm.rb +1 -0
- data/lib/new_relic/agent/vm/snapshot.rb +1 -0
- data/lib/new_relic/agent/vm.rb +1 -0
- data/lib/new_relic/agent/worker_loop.rb +2 -1
- data/lib/new_relic/agent.rb +11 -10
- data/lib/new_relic/cli/command.rb +5 -4
- data/lib/new_relic/cli/commands/deployments.rb +9 -8
- data/lib/new_relic/cli/commands/install.rb +6 -5
- data/lib/new_relic/coerce.rb +4 -4
- data/lib/new_relic/collection_helper.rb +2 -1
- data/lib/new_relic/control/class_methods.rb +1 -0
- data/lib/new_relic/control/frameworks/external.rb +1 -0
- data/lib/new_relic/control/frameworks/rails.rb +3 -2
- data/lib/new_relic/control/frameworks/rails3.rb +1 -0
- data/lib/new_relic/control/frameworks/rails4.rb +1 -0
- data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -0
- data/lib/new_relic/control/frameworks/ruby.rb +1 -0
- data/lib/new_relic/control/frameworks/sinatra.rb +1 -0
- data/lib/new_relic/control/frameworks.rb +1 -0
- data/lib/new_relic/control/instance_methods.rb +5 -4
- data/lib/new_relic/control/instrumentation.rb +7 -6
- data/lib/new_relic/control/server_methods.rb +2 -1
- data/lib/new_relic/control.rb +1 -0
- data/lib/new_relic/delayed_job_injection.rb +1 -0
- data/lib/new_relic/dependency_detection.rb +18 -16
- data/lib/new_relic/environment_report.rb +1 -0
- data/lib/new_relic/helper.rb +4 -3
- data/lib/new_relic/language_support.rb +1 -0
- data/lib/new_relic/latest_changes.rb +1 -0
- data/lib/new_relic/local_environment.rb +5 -6
- data/lib/new_relic/metric_data.rb +3 -2
- data/lib/new_relic/metric_spec.rb +2 -1
- data/lib/new_relic/noticed_error.rb +1 -1
- data/lib/new_relic/rack/agent_hooks.rb +1 -0
- data/lib/new_relic/rack/agent_middleware.rb +1 -0
- data/lib/new_relic/rack/browser_monitoring.rb +3 -2
- data/lib/new_relic/rack.rb +1 -0
- data/lib/new_relic/recipes/capistrano3.rb +7 -6
- data/lib/new_relic/recipes/capistrano_legacy.rb +12 -11
- data/lib/new_relic/recipes.rb +1 -0
- data/lib/new_relic/supportability_helper.rb +5 -4
- data/lib/new_relic/version.rb +2 -1
- data/lib/newrelic_rpm.rb +1 -0
- data/lib/sequel/extensions/newrelic_instrumentation.rb +6 -5
- data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -0
- data/lib/tasks/all.rb +1 -0
- data/lib/tasks/config.rake +2 -1
- data/lib/tasks/coverage_report.rake +2 -1
- data/lib/tasks/install.rake +1 -0
- data/lib/tasks/multiverse.rake +1 -0
- data/lib/tasks/multiverse.rb +8 -7
- data/lib/tasks/newrelic.rb +1 -0
- data/lib/tasks/tests.rake +1 -0
- data/newrelic.yml +505 -486
- data/newrelic_rpm.gemspec +3 -1
- data/recipes/newrelic.rb +1 -0
- data/test/agent_helper.rb +113 -103
- metadata +28 -2
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
# This is a class for executing commands related to deployment
|
6
7
|
# events. It runs without loading the rails environment
|
@@ -27,7 +28,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
|
|
27
28
|
#
|
28
29
|
# Will throw CommandFailed exception if there's any error.
|
29
30
|
#
|
30
|
-
def initialize
|
31
|
+
def initialize(command_line_args)
|
31
32
|
@control = NewRelic::Control.instance
|
32
33
|
@environment = nil
|
33
34
|
@changelog = nil
|
@@ -89,8 +90,8 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
|
|
89
90
|
|
90
91
|
response = http.request(request)
|
91
92
|
|
92
|
-
if response.is_a?
|
93
|
-
info
|
93
|
+
if response.is_a?(Net::HTTPSuccess)
|
94
|
+
info("Recorded deployment to '#{@appname}' (#{@description || Time.now})")
|
94
95
|
else
|
95
96
|
err_string = REXML::Document.new(response.body).elements['errors/error'].map(&:to_s).join("; ") rescue response.message
|
96
97
|
raise NewRelic::Cli::Command::CommandFailure, "Deployment not recorded: #{err_string}"
|
@@ -102,8 +103,8 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
|
|
102
103
|
rescue NewRelic::Cli::Command::CommandFailure
|
103
104
|
raise
|
104
105
|
rescue => e
|
105
|
-
err
|
106
|
-
info
|
106
|
+
err("Unexpected error attempting to connect to #{control.api_server}")
|
107
|
+
info("#{e}: #{e.backtrace.join("\n ")}")
|
107
108
|
raise NewRelic::Cli::Command::CommandFailure.new(e.to_s)
|
108
109
|
end
|
109
110
|
end
|
@@ -111,8 +112,8 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
|
|
111
112
|
private
|
112
113
|
|
113
114
|
def options
|
114
|
-
OptionParser.new
|
115
|
-
o.separator
|
115
|
+
OptionParser.new(%Q(Usage: #{$0} #{self.class.command} [OPTIONS] ["description"] ), 40) do |o|
|
116
|
+
o.separator("OPTIONS:")
|
116
117
|
o.on("-a", "--appname=NAME", String,
|
117
118
|
"Set the application name.",
|
118
119
|
"Default is app_name setting in newrelic.yml") { |e| @appname = e }
|
@@ -128,7 +129,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
|
|
128
129
|
"Specify the license key of the account for the app being deployed") { |l| @license_key = l }
|
129
130
|
o.on("-c", "--changes",
|
130
131
|
"Read in a change log from the standard input") { @changelog = STDIN.read }
|
131
|
-
yield
|
132
|
+
yield(o) if block_given?
|
132
133
|
end
|
133
134
|
end
|
134
135
|
end
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'fileutils'
|
6
7
|
require 'new_relic/version'
|
@@ -20,12 +21,12 @@ class NewRelic::Cli::Install < NewRelic::Cli::Command
|
|
20
21
|
# Will throw CommandFailed exception if there's any error.
|
21
22
|
#
|
22
23
|
attr_reader :dest_dir, :license_key, :generated_for_user, :quiet, :src_file, :app_name
|
23
|
-
def initialize
|
24
|
+
def initialize(command_line_args = {})
|
24
25
|
@dest_dir = nil
|
25
|
-
super
|
26
|
+
super(command_line_args)
|
26
27
|
if @dest_dir.nil?
|
27
28
|
# Install a newrelic.yml file into the local config directory.
|
28
|
-
if File.directory?
|
29
|
+
if File.directory?("config")
|
29
30
|
@dest_dir = "config"
|
30
31
|
else
|
31
32
|
@dest_dir = "."
|
@@ -70,13 +71,13 @@ Visit support.newrelic.com if you are experiencing installation issues.
|
|
70
71
|
private
|
71
72
|
|
72
73
|
def options
|
73
|
-
OptionParser.new
|
74
|
+
OptionParser.new("Usage: #{$0} #{self.class.command} [ OPTIONS] 'application name'", 40) do |o|
|
74
75
|
o.on("-f", "--force", "Overwrite newrelic.yml if it exists") { |e| @force = true }
|
75
76
|
o.on("-l", "--license_key=NAME", String,
|
76
77
|
"Use the given license key") { |e| @license_key = e }
|
77
78
|
o.on("-d", "--destdir=name", String,
|
78
79
|
"Write the newrelic.yml to the given directory, default is '.'") { |e| @dest_dir = e }
|
79
|
-
yield
|
80
|
+
yield(o) if block_given?
|
80
81
|
end
|
81
82
|
end
|
82
83
|
end
|
data/lib/new_relic/coerce.rb
CHANGED
@@ -61,7 +61,7 @@ module NewRelic
|
|
61
61
|
end
|
62
62
|
end
|
63
63
|
|
64
|
-
def int!
|
64
|
+
def int!(value)
|
65
65
|
return nil unless value_or_nil(value)
|
66
66
|
Integer(value)
|
67
67
|
end
|
@@ -69,16 +69,16 @@ module NewRelic
|
|
69
69
|
# Use when you plan to perform a boolean check using the integer 1
|
70
70
|
# for true and the integer 0 for false
|
71
71
|
# String values will be converted to 0
|
72
|
-
def boolean_int!
|
72
|
+
def boolean_int!(value)
|
73
73
|
value.to_i
|
74
74
|
end
|
75
75
|
|
76
|
-
def float!
|
76
|
+
def float!(value, precision = NewRelic::PRIORITY_PRECISION)
|
77
77
|
return nil unless value_or_nil(value)
|
78
78
|
value.to_f.round(precision)
|
79
79
|
end
|
80
80
|
|
81
|
-
def value_or_nil
|
81
|
+
def value_or_nil(value)
|
82
82
|
return nil if value.nil? || (value.respond_to?(:empty?) && value.empty?)
|
83
83
|
value
|
84
84
|
end
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic
|
6
7
|
module CollectionHelper
|
@@ -39,7 +40,7 @@ module NewRelic
|
|
39
40
|
when nil then ''
|
40
41
|
when object.instance_of?(String) then object
|
41
42
|
when String then String.new(object) # convert string subclasses to strings
|
42
|
-
else "#<#{object.class
|
43
|
+
else String.new("#<#{object.class}>")
|
43
44
|
end
|
44
45
|
end
|
45
46
|
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'new_relic/control/frameworks/ruby'
|
6
7
|
module NewRelic
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'new_relic/control/frameworks/ruby'
|
6
7
|
module NewRelic
|
@@ -73,7 +74,7 @@ module NewRelic
|
|
73
74
|
begin
|
74
75
|
require 'new_relic/rack/agent_hooks'
|
75
76
|
return unless NewRelic::Rack::AgentHooks.needed?
|
76
|
-
config.middleware.use
|
77
|
+
config.middleware.use(NewRelic::Rack::AgentHooks)
|
77
78
|
::NewRelic::Agent.logger.debug("Installed New Relic Agent Hooks middleware")
|
78
79
|
rescue => e
|
79
80
|
::NewRelic::Agent.logger.warn("Error installing New Relic Agent Hooks middleware", e)
|
@@ -87,7 +88,7 @@ module NewRelic
|
|
87
88
|
return if config.nil? || !config.respond_to?(:middleware) || !Agent.config[:'browser_monitoring.auto_instrument']
|
88
89
|
begin
|
89
90
|
require 'new_relic/rack/browser_monitoring'
|
90
|
-
config.middleware.use
|
91
|
+
config.middleware.use(NewRelic::Rack::BrowserMonitoring)
|
91
92
|
::NewRelic::Agent.logger.debug("Installed New Relic Browser Monitoring middleware")
|
92
93
|
rescue => e
|
93
94
|
::NewRelic::Agent.logger.warn("Error installing New Relic Browser Monitoring middleware", e)
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'new_relic/control/frameworks/ruby'
|
6
7
|
module NewRelic
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'new_relic/agent/null_logger'
|
6
7
|
require 'new_relic/agent/memory_logger'
|
@@ -63,8 +64,8 @@ module NewRelic
|
|
63
64
|
|
64
65
|
# An artifact of earlier implementation, we put both #add_method_tracer and #trace_execution
|
65
66
|
# methods in the module methods.
|
66
|
-
Module.send
|
67
|
-
Module.send
|
67
|
+
Module.send(:include, NewRelic::Agent::MethodTracer::ClassMethods)
|
68
|
+
Module.send(:include, NewRelic::Agent::MethodTracer)
|
68
69
|
init_config(options)
|
69
70
|
NewRelic::Agent.agent = NewRelic::Agent::Agent.instance
|
70
71
|
|
@@ -120,11 +121,11 @@ module NewRelic
|
|
120
121
|
end
|
121
122
|
|
122
123
|
def handle_invalid_security_settings
|
123
|
-
NewRelic::Agent.logger.error
|
124
|
+
NewRelic::Agent.logger.error("Security Policies and High Security " \
|
124
125
|
"Mode cannot both be present in the agent configuration. If " \
|
125
126
|
"Security Policies have been set for your account, please " \
|
126
127
|
"ensure the security_policies_token is set but high_security is " \
|
127
|
-
"disabled (default)."
|
128
|
+
"disabled (default).")
|
128
129
|
install_shim
|
129
130
|
end
|
130
131
|
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic
|
6
7
|
class Control
|
@@ -12,12 +13,12 @@ module NewRelic
|
|
12
13
|
# This requires the files within a rescue block, so that any
|
13
14
|
# errors within instrumentation files do not affect the overall
|
14
15
|
# agent or application in which it runs.
|
15
|
-
def load_instrumentation_files
|
16
|
+
def load_instrumentation_files(pattern)
|
16
17
|
Dir.glob(pattern) do |file|
|
17
18
|
begin
|
18
19
|
require file.to_s
|
19
20
|
rescue => e
|
20
|
-
::NewRelic::Agent.logger.warn
|
21
|
+
::NewRelic::Agent.logger.warn("Error loading instrumentation file '#{file}':", e)
|
21
22
|
end
|
22
23
|
end
|
23
24
|
end
|
@@ -33,9 +34,9 @@ module NewRelic
|
|
33
34
|
#
|
34
35
|
# This happens after the agent has loaded and all dependencies
|
35
36
|
# are ready to be instrumented
|
36
|
-
def add_instrumentation
|
37
|
+
def add_instrumentation(pattern)
|
37
38
|
if @instrumented
|
38
|
-
load_instrumentation_files
|
39
|
+
load_instrumentation_files(pattern)
|
39
40
|
else
|
40
41
|
@instrumentation_files << pattern
|
41
42
|
end
|
@@ -60,11 +61,11 @@ module NewRelic
|
|
60
61
|
@instrumentation_files <<
|
61
62
|
File.join(instrumentation_path, '*.rb') <<
|
62
63
|
File.join(instrumentation_path, app.to_s, '*.rb')
|
63
|
-
@instrumentation_files.each { |pattern| load_instrumentation_files
|
64
|
+
@instrumentation_files.each { |pattern| load_instrumentation_files(pattern) }
|
64
65
|
DependencyDetection.detect!
|
65
66
|
ruby_22_deprecation
|
66
67
|
rails_32_deprecation
|
67
|
-
::NewRelic::Agent.logger.info
|
68
|
+
::NewRelic::Agent.logger.info("Finished instrumentation")
|
68
69
|
end
|
69
70
|
end
|
70
71
|
|
@@ -1,11 +1,12 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic
|
6
7
|
class Control
|
7
8
|
# Structs holding info for the remote server and proxy server
|
8
|
-
class Server < Struct.new
|
9
|
+
class Server < Struct.new(:name, :port) # :nodoc:
|
9
10
|
def to_s; "#{name}:#{port}"; end
|
10
11
|
end
|
11
12
|
|
data/lib/new_relic/control.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'yaml'
|
6
7
|
require 'new_relic/dependency_detection'
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module DependencyDetection
|
6
7
|
module_function
|
@@ -75,40 +76,40 @@ module DependencyDetection
|
|
75
76
|
!executed and check_dependencies
|
76
77
|
end
|
77
78
|
|
78
|
-
def source_location_for
|
79
|
+
def source_location_for(klass, method_name)
|
79
80
|
Object.instance_method(:method).bind(klass.allocate).call(method_name).source_location.to_s
|
80
81
|
end
|
81
82
|
|
82
83
|
# Extracts the instrumented library name from the instrumenting module's name
|
83
84
|
# Given "NewRelic::Agent::Instrumentation::NetHTTP::Prepend"
|
84
85
|
# Will extract "NetHTTP" which is in the 2nd to last spot
|
85
|
-
def extract_supportability_name
|
86
|
+
def extract_supportability_name(instrumenting_module)
|
86
87
|
instrumenting_module.to_s.split("::")[-2]
|
87
88
|
end
|
88
89
|
|
89
|
-
def log_and_instrument
|
90
|
+
def log_and_instrument(method, instrumenting_module, supportability_name)
|
90
91
|
supportability_name ||= extract_supportability_name(instrumenting_module)
|
91
|
-
NewRelic::Agent.logger.info
|
92
|
+
NewRelic::Agent.logger.info("Installing New Relic supported #{supportability_name} instrumentation using #{method}")
|
92
93
|
NewRelic::Agent.record_metric("Supportability/Instrumentation/#{supportability_name}/#{method}", 0.0)
|
93
94
|
yield
|
94
95
|
end
|
95
96
|
|
96
|
-
def prepend_instrument
|
97
|
+
def prepend_instrument(target_class, instrumenting_module, supportability_name = nil)
|
97
98
|
log_and_instrument("Prepend", instrumenting_module, supportability_name) do
|
98
|
-
target_class.send
|
99
|
+
target_class.send(:prepend, instrumenting_module)
|
99
100
|
end
|
100
101
|
end
|
101
102
|
|
102
|
-
def chain_instrument
|
103
|
+
def chain_instrument(instrumenting_module, supportability_name = nil)
|
103
104
|
log_and_instrument("MethodChaining", instrumenting_module, supportability_name) do
|
104
105
|
instrumenting_module.instrument!
|
105
106
|
end
|
106
107
|
end
|
107
108
|
|
108
|
-
def chain_instrument_target
|
109
|
-
NewRelic::Agent.logger.info
|
109
|
+
def chain_instrument_target(target, instrumenting_module, supportability_name = nil)
|
110
|
+
NewRelic::Agent.logger.info("Installing deferred #{target} instrumentation")
|
110
111
|
log_and_instrument("MethodChaining", instrumenting_module, supportability_name) do
|
111
|
-
instrumenting_module.instrument!
|
112
|
+
instrumenting_module.instrument!(target)
|
112
113
|
end
|
113
114
|
end
|
114
115
|
|
@@ -117,7 +118,7 @@ module DependencyDetection
|
|
117
118
|
begin
|
118
119
|
x.call
|
119
120
|
rescue => err
|
120
|
-
NewRelic::Agent.logger.error
|
121
|
+
NewRelic::Agent.logger.error("Error while installing #{self.name} instrumentation:", err)
|
121
122
|
break
|
122
123
|
end
|
123
124
|
end
|
@@ -138,7 +139,7 @@ module DependencyDetection
|
|
138
139
|
end
|
139
140
|
end
|
140
141
|
|
141
|
-
def depends_on
|
142
|
+
def depends_on(&block)
|
142
143
|
@dependencies << block if block_given?
|
143
144
|
end
|
144
145
|
|
@@ -155,9 +156,10 @@ module DependencyDetection
|
|
155
156
|
return false unless ::NewRelic::Agent.config[key] == true
|
156
157
|
|
157
158
|
::NewRelic::Agent.logger.debug("Not installing #{self.name} instrumentation because of configuration #{key}")
|
158
|
-
::NewRelic::Agent.logger.debug \
|
159
|
+
::NewRelic::Agent.logger.debug( \
|
159
160
|
"[DEPRECATED] configuration #{key} for #{self.name} will be removed in the next major release. " \
|
160
161
|
"Use `#{config_key}` with one of `#{VALID_CONFIG_VALUES.map(&:to_s).inspect}`"
|
162
|
+
)
|
161
163
|
|
162
164
|
return true
|
163
165
|
end
|
@@ -178,7 +180,7 @@ module DependencyDetection
|
|
178
180
|
|
179
181
|
# returns only a valid value for instrumentation configuration
|
180
182
|
# If user uses "enabled" it's converted to "auto"
|
181
|
-
def valid_config_value
|
183
|
+
def valid_config_value(retrieved_value)
|
182
184
|
VALID_CONFIG_VALUES.include?(retrieved_value) ? retrieved_value : AUTO_CONFIG_VALUE
|
183
185
|
end
|
184
186
|
|
@@ -203,11 +205,11 @@ module DependencyDetection
|
|
203
205
|
self.config_name = new_config_name
|
204
206
|
end
|
205
207
|
|
206
|
-
def executes
|
208
|
+
def executes(&block)
|
207
209
|
@executes << block if block_given?
|
208
210
|
end
|
209
211
|
|
210
|
-
def conflicts_with_prepend
|
212
|
+
def conflicts_with_prepend(&block)
|
211
213
|
@prepend_conflicts << block if block_given?
|
212
214
|
end
|
213
215
|
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
module NewRelic
|
6
7
|
# The EnvironmentReport is responsible for analyzing the application's
|
data/lib/new_relic/helper.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'new_relic/language_support'
|
6
7
|
require 'open3'
|
@@ -16,16 +17,16 @@ module NewRelic
|
|
16
17
|
# Confirm a string is correctly encoded,
|
17
18
|
# If not force the encoding to ASCII-8BIT (binary)
|
18
19
|
def correctly_encoded(string)
|
19
|
-
return string unless string.is_a?
|
20
|
+
return string unless string.is_a?(String)
|
20
21
|
# The .dup here is intentional, since force_encoding mutates the target,
|
21
22
|
# and we don't know who is going to use this string downstream of us.
|
22
23
|
string.valid_encoding? ? string : string.dup.force_encoding(Encoding::ASCII_8BIT)
|
23
24
|
end
|
24
25
|
|
25
26
|
def instance_method_visibility(klass, method_name)
|
26
|
-
if klass.private_instance_methods.map { |s| s.to_sym }.include?
|
27
|
+
if klass.private_instance_methods.map { |s| s.to_sym }.include?(method_name.to_sym)
|
27
28
|
:private
|
28
|
-
elsif klass.protected_instance_methods.map { |s| s.to_sym }.include?
|
29
|
+
elsif klass.protected_instance_methods.map { |s| s.to_sym }.include?(method_name.to_sym)
|
29
30
|
:protected
|
30
31
|
else
|
31
32
|
:public
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'set'
|
6
7
|
require 'new_relic/version'
|
@@ -37,8 +38,8 @@ module NewRelic
|
|
37
38
|
# Extend self with any any submodules of LocalEnvironment. These can override
|
38
39
|
# the discover methods to discover new framworks and dispatchers.
|
39
40
|
NewRelic::LocalEnvironment.constants.each do |const|
|
40
|
-
mod = NewRelic::LocalEnvironment.const_get
|
41
|
-
self.extend
|
41
|
+
mod = NewRelic::LocalEnvironment.const_get(const)
|
42
|
+
self.extend(mod) if mod.instance_of?(Module)
|
42
43
|
end
|
43
44
|
|
44
45
|
@discovered_dispatcher = nil
|
@@ -78,7 +79,7 @@ module NewRelic
|
|
78
79
|
]
|
79
80
|
# TODO: MAJOR VERSION - remove rainbows
|
80
81
|
while dispatchers.any? && @discovered_dispatcher.nil?
|
81
|
-
send
|
82
|
+
send('check_for_' + (dispatchers.shift))
|
82
83
|
end
|
83
84
|
end
|
84
85
|
|
@@ -197,9 +198,7 @@ module NewRelic
|
|
197
198
|
|
198
199
|
# outputs a human-readable description
|
199
200
|
def to_s
|
200
|
-
|
201
|
-
s << ";dispatcher=#{@discovered_dispatcher}" if @discovered_dispatcher
|
202
|
-
s << "]"
|
201
|
+
%Q(LocalEnvironment[#{";dispatcher=#{@discovered_dispatcher}" if @discovered_dispatcher}])
|
203
202
|
end
|
204
203
|
|
205
204
|
def executable
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'new_relic/coerce'
|
6
7
|
|
@@ -18,7 +19,7 @@ module NewRelic
|
|
18
19
|
end
|
19
20
|
|
20
21
|
def eql?(o)
|
21
|
-
(metric_spec.eql?
|
22
|
+
(metric_spec.eql?(o.metric_spec)) && (stats.eql?(o.stats))
|
22
23
|
end
|
23
24
|
|
24
25
|
def original_spec
|
@@ -27,7 +28,7 @@ module NewRelic
|
|
27
28
|
|
28
29
|
# assigns a new metric spec, and retains the old metric spec as
|
29
30
|
# @original_spec if it exists currently
|
30
|
-
def metric_spec=
|
31
|
+
def metric_spec=(new_spec)
|
31
32
|
@original_spec = @metric_spec if @metric_spec
|
32
33
|
@metric_spec = new_spec
|
33
34
|
end
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
# this struct uniquely defines a metric, optionally inside
|
6
7
|
# the call scope of another metric
|
@@ -34,7 +35,7 @@ class NewRelic::MetricSpec
|
|
34
35
|
self.eql?(o)
|
35
36
|
end
|
36
37
|
|
37
|
-
def eql?
|
38
|
+
def eql?(o)
|
38
39
|
@name == o.name && @scope == o.scope
|
39
40
|
end
|
40
41
|
|
@@ -189,7 +189,7 @@ class NewRelic::NoticedError
|
|
189
189
|
if exception.nil?
|
190
190
|
@exception_class_name = UNKNOWN_ERROR_CLASS_NAME
|
191
191
|
@message = NIL_ERROR_MESSAGE
|
192
|
-
elsif exception.is_a?
|
192
|
+
elsif exception.is_a?(NewRelic::Agent::NoticibleError)
|
193
193
|
@exception_class_name = exception.class_name
|
194
194
|
@message = exception.message
|
195
195
|
else
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'new_relic/agent/event_listener'
|
6
7
|
require 'new_relic/rack/agent_middleware'
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
require 'new_relic/agent/tracer'
|
6
7
|
require 'new_relic/agent/instrumentation/controller_instrumentation'
|