newrelic_rpm 8.9.0 → 8.10.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/.rubocop.yml +23 -8
- data/.rubocop_todo.yml +243 -0
- data/.simplecov +10 -2
- data/.snyk +11 -0
- data/Brewfile +1 -0
- data/CHANGELOG.md +78 -0
- data/Guardfile +1 -0
- data/Rakefile +5 -0
- data/Thorfile +6 -0
- 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 +10 -4
- 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 +98 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +112 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +31 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +33 -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 +11 -6
- 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 +17 -14
- 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 +6 -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 +3 -2
- 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 +22 -11
- data/lib/tasks/install.rake +1 -0
- data/lib/tasks/instrumentation_generator/README.md +63 -0
- data/lib/tasks/instrumentation_generator/TODO.md +33 -0
- data/lib/tasks/instrumentation_generator/instrumentation.thor +96 -0
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +10 -0
- data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +7 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +30 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +14 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +16 -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 +15 -17
- data/recipes/newrelic.rb +1 -0
- data/test/agent_helper.rb +114 -118
- metadata +58 -89
- data/bin/mongrel_rpm +0 -32
@@ -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 'net/http'
|
6
7
|
|
@@ -9,23 +10,23 @@ module NewRelic
|
|
9
10
|
module Utilization
|
10
11
|
class Vendor
|
11
12
|
class << self
|
12
|
-
def vendor_name
|
13
|
+
def vendor_name(vendor_name = nil)
|
13
14
|
vendor_name ? @vendor_name = vendor_name.freeze : @vendor_name
|
14
15
|
end
|
15
16
|
|
16
|
-
def endpoint
|
17
|
+
def endpoint(endpoint = nil)
|
17
18
|
endpoint ? @endpoint = URI(endpoint) : @endpoint
|
18
19
|
end
|
19
20
|
|
20
|
-
def headers
|
21
|
+
def headers(headers = nil)
|
21
22
|
headers ? @headers = headers.freeze : processed_headers
|
22
23
|
end
|
23
24
|
|
24
|
-
def keys
|
25
|
+
def keys(keys = nil)
|
25
26
|
keys ? @keys = keys.freeze : @keys
|
26
27
|
end
|
27
28
|
|
28
|
-
def key_transforms
|
29
|
+
def key_transforms(key_transforms = nil)
|
29
30
|
key_transforms ? @key_transforms = Array(key_transforms).freeze : @key_transforms
|
30
31
|
end
|
31
32
|
|
@@ -58,12 +59,12 @@ module NewRelic
|
|
58
59
|
|
59
60
|
begin
|
60
61
|
if response.code == SUCCESS
|
61
|
-
process_response
|
62
|
+
process_response(prepare_response(response))
|
62
63
|
else
|
63
64
|
false
|
64
65
|
end
|
65
66
|
rescue => e
|
66
|
-
NewRelic::Agent.logger.error
|
67
|
+
NewRelic::Agent.logger.error("Error occurred detecting: #{vendor_name}", e)
|
67
68
|
record_supportability_metric
|
68
69
|
false
|
69
70
|
end
|
@@ -75,25 +76,25 @@ module NewRelic
|
|
75
76
|
processed_headers = headers
|
76
77
|
raise if processed_headers.values.include?(:error)
|
77
78
|
|
78
|
-
Timeout.timeout
|
79
|
+
Timeout.timeout(1) do
|
79
80
|
response = nil
|
80
|
-
Net::HTTP.start
|
81
|
-
req = Net::HTTP::Get.new
|
82
|
-
response = http.request
|
81
|
+
Net::HTTP.start(endpoint.host, endpoint.port) do |http|
|
82
|
+
req = Net::HTTP::Get.new(endpoint, processed_headers)
|
83
|
+
response = http.request(req)
|
83
84
|
end
|
84
85
|
response
|
85
86
|
end
|
86
87
|
rescue
|
87
|
-
NewRelic::Agent.logger.debug
|
88
|
+
NewRelic::Agent.logger.debug("#{vendor_name} environment not detected")
|
88
89
|
end
|
89
90
|
|
90
|
-
def prepare_response
|
91
|
-
JSON.parse
|
91
|
+
def prepare_response(response)
|
92
|
+
JSON.parse(response.body)
|
92
93
|
end
|
93
94
|
|
94
|
-
def process_response
|
95
|
+
def process_response(response)
|
95
96
|
keys.each do |key|
|
96
|
-
normalized = normalize
|
97
|
+
normalized = normalize(response[key])
|
97
98
|
if normalized
|
98
99
|
@metadata[transform_key(key)] = normalized
|
99
100
|
else
|
@@ -105,51 +106,51 @@ module NewRelic
|
|
105
106
|
true
|
106
107
|
end
|
107
108
|
|
108
|
-
def normalize
|
109
|
+
def normalize(value)
|
109
110
|
return if value.nil?
|
110
111
|
|
111
112
|
value = value.to_s
|
112
113
|
value = value.dup if value.frozen?
|
113
114
|
|
114
|
-
value.force_encoding
|
115
|
+
value.force_encoding(Encoding::UTF_8)
|
115
116
|
value.strip!
|
116
117
|
|
117
|
-
return unless valid_length?
|
118
|
-
return unless valid_chars?
|
118
|
+
return unless valid_length?(value)
|
119
|
+
return unless valid_chars?(value)
|
119
120
|
|
120
121
|
value
|
121
122
|
end
|
122
123
|
|
123
|
-
def valid_length?
|
124
|
+
def valid_length?(value)
|
124
125
|
if value.bytesize <= 255
|
125
126
|
true
|
126
127
|
else
|
127
|
-
NewRelic::Agent.logger.warn
|
128
|
+
NewRelic::Agent.logger.warn("Found invalid length value while detecting: #{vendor_name}")
|
128
129
|
false
|
129
130
|
end
|
130
131
|
end
|
131
132
|
|
132
133
|
VALID_CHARS = /^[0-9a-zA-Z_ .\/-]$/
|
133
134
|
|
134
|
-
def valid_chars?
|
135
|
+
def valid_chars?(value)
|
135
136
|
value.each_char do |ch|
|
136
137
|
next if ch =~ VALID_CHARS
|
137
138
|
code_point = ch[0].ord # this works in Ruby 1.8.7 - 2.1.2
|
138
139
|
next if code_point >= 0x80
|
139
140
|
|
140
|
-
NewRelic::Agent.logger.warn
|
141
|
+
NewRelic::Agent.logger.warn("Found invalid character while detecting: #{vendor_name}")
|
141
142
|
return false # it's in neither set of valid characters
|
142
143
|
end
|
143
144
|
true
|
144
145
|
end
|
145
146
|
|
146
|
-
def transform_key
|
147
|
+
def transform_key(key)
|
147
148
|
return key unless key_transforms
|
148
149
|
key_transforms.inject(key) { |memo, transform| memo.send(transform) }
|
149
150
|
end
|
150
151
|
|
151
152
|
def record_supportability_metric
|
152
|
-
NewRelic::Agent.increment_metric
|
153
|
+
NewRelic::Agent.increment_metric("Supportability/utilization/#{vendor_name}/error")
|
153
154
|
end
|
154
155
|
end
|
155
156
|
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 'new_relic/agent/utilization/aws'
|
6
7
|
require 'new_relic/agent/utilization/gcp'
|
@@ -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 'thread'
|
6
7
|
require 'new_relic/agent/vm/snapshot'
|
@@ -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
|
# The GC::Profiler class available on MRI has to be reset periodically to avoid
|
6
7
|
# memory "leaking" in the underlying implementation. However, it's a major
|
@@ -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 'thread'
|
6
7
|
require 'new_relic/agent/vm/snapshot'
|
data/lib/new_relic/agent/vm.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 'new_relic/agent/vm/mri_vm'
|
@@ -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 'thread'
|
6
7
|
|
@@ -88,7 +89,7 @@ module NewRelic
|
|
88
89
|
raise
|
89
90
|
rescue => e
|
90
91
|
# Don't blow out the stack for anything that hasn't already propagated
|
91
|
-
::NewRelic::Agent.logger.error
|
92
|
+
::NewRelic::Agent.logger.error("Error running task in Agent Worker Loop:", e)
|
92
93
|
end
|
93
94
|
end
|
94
95
|
end
|
data/lib/new_relic/agent.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 'forwardable'
|
6
7
|
|
@@ -419,7 +420,7 @@ module NewRelic
|
|
419
420
|
#
|
420
421
|
def add_instrumentation(file_pattern)
|
421
422
|
record_api_supportability_metric(:add_instrumentation)
|
422
|
-
NewRelic::Control.instance.add_instrumentation
|
423
|
+
NewRelic::Control.instance.add_instrumentation(file_pattern)
|
423
424
|
end
|
424
425
|
|
425
426
|
# Require agent testing helper methods
|
@@ -515,8 +516,8 @@ module NewRelic
|
|
515
516
|
# @api public
|
516
517
|
#
|
517
518
|
def disable_transaction_tracing
|
518
|
-
Deprecator.deprecate
|
519
|
-
'disable_all_tracing or ignore_transaction'
|
519
|
+
Deprecator.deprecate(:disable_transaction_tracing,
|
520
|
+
'disable_all_tracing or ignore_transaction')
|
520
521
|
record_api_supportability_metric(:disable_transaction_tracing)
|
521
522
|
yield
|
522
523
|
end
|
@@ -579,7 +580,7 @@ module NewRelic
|
|
579
580
|
def add_custom_attributes(params) # THREAD_LOCAL_ACCESS
|
580
581
|
record_api_supportability_metric(:add_custom_attributes)
|
581
582
|
|
582
|
-
if params.is_a?
|
583
|
+
if params.is_a?(Hash)
|
583
584
|
txn = Transaction.tl_current
|
584
585
|
txn.add_custom_attributes(params) if txn
|
585
586
|
|
@@ -607,15 +608,15 @@ module NewRelic
|
|
607
608
|
#
|
608
609
|
# @see https://docs.newrelic.com/docs/using-new-relic/welcome-new-relic/get-started/glossary#span
|
609
610
|
# @api public
|
610
|
-
def add_custom_span_attributes
|
611
|
-
record_api_supportability_metric
|
611
|
+
def add_custom_span_attributes(params)
|
612
|
+
record_api_supportability_metric(:add_custom_span_attributes)
|
612
613
|
|
613
|
-
if params.is_a?
|
614
|
+
if params.is_a?(Hash)
|
614
615
|
if segment = NewRelic::Agent::Tracer.current_segment
|
615
|
-
segment.add_custom_attributes
|
616
|
+
segment.add_custom_attributes(params)
|
616
617
|
end
|
617
618
|
else
|
618
|
-
::NewRelic::Agent.logger.warn
|
619
|
+
::NewRelic::Agent.logger.warn("Bad argument passed to #add_custom_span_attributes. Expected Hash but got #{params.class}")
|
619
620
|
end
|
620
621
|
end
|
621
622
|
|
@@ -698,7 +699,7 @@ module NewRelic
|
|
698
699
|
def notify(event_type, *args)
|
699
700
|
agent.events.notify(event_type, *args)
|
700
701
|
rescue
|
701
|
-
NewRelic::Agent.logger.debug
|
702
|
+
NewRelic::Agent.logger.debug("Ignoring exception during %p event notification" % [event_type])
|
702
703
|
end
|
703
704
|
|
704
705
|
# @!group Trace and Entity metadata
|
@@ -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 'optparse'
|
6
7
|
|
@@ -15,8 +16,8 @@ module NewRelic
|
|
15
16
|
# Capture a failure to execute the command.
|
16
17
|
class CommandFailure < StandardError
|
17
18
|
attr_reader :options
|
18
|
-
def initialize
|
19
|
-
super
|
19
|
+
def initialize(message, opt_parser = nil)
|
20
|
+
super(message)
|
20
21
|
@options = opt_parser
|
21
22
|
end
|
22
23
|
end
|
@@ -33,7 +34,7 @@ module NewRelic
|
|
33
34
|
if Hash === command_line_args
|
34
35
|
# command line args is an options hash
|
35
36
|
command_line_args.each do |key, value|
|
36
|
-
instance_variable_set
|
37
|
+
instance_variable_set("@#{key}", value.to_s) if value
|
37
38
|
end
|
38
39
|
else
|
39
40
|
# parse command line args. Throw an exception on a bad arg.
|
@@ -65,7 +66,7 @@ module NewRelic
|
|
65
66
|
script_name = 'newrelic'
|
66
67
|
end
|
67
68
|
opts.banner = "Usage: #{script_name} [ #{@command_names.join(" | ")} ] [options]"
|
68
|
-
opts.separator
|
69
|
+
opts.separator("use '#{script_name} <command> -h' to see detailed command options")
|
69
70
|
opts
|
70
71
|
end
|
71
72
|
extra = options.order!
|
@@ -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
|
|