newrelic_rpm 8.15.0 → 9.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.build_ignore +26 -0
- data/CHANGELOG.md +538 -44
- data/CONTRIBUTING.md +1 -1
- data/Gemfile +1 -1
- data/README.md +11 -6
- data/Rakefile +9 -9
- data/Thorfile +1 -1
- data/bin/newrelic +1 -0
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +36 -36
- data/init.rb +1 -1
- data/lib/new_relic/agent/agent.rb +3 -16
- data/lib/new_relic/agent/agent_helpers/connect.rb +5 -10
- data/lib/new_relic/agent/agent_helpers/harvest.rb +4 -4
- data/lib/new_relic/agent/agent_helpers/shutdown.rb +5 -5
- data/lib/new_relic/agent/agent_helpers/special_startup.rb +3 -4
- data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +47 -39
- data/lib/new_relic/agent/agent_helpers/startup.rb +13 -13
- data/lib/new_relic/agent/agent_helpers/transmit.rb +6 -6
- data/lib/new_relic/agent/agent_logger.rb +9 -9
- data/lib/new_relic/agent/attribute_filter.rb +2 -4
- data/lib/new_relic/agent/attribute_pre_filtering.rb +109 -0
- data/lib/new_relic/agent/attribute_processing.rb +2 -2
- data/lib/new_relic/agent/audit_logger.rb +5 -5
- data/lib/new_relic/agent/autostart.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +2 -2
- data/lib/new_relic/agent/commands/agent_command_router.rb +5 -4
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +8 -8
- data/lib/new_relic/agent/configuration/default_source.rb +428 -586
- data/lib/new_relic/agent/configuration/environment_source.rb +2 -2
- data/lib/new_relic/agent/configuration/high_security_source.rb +3 -5
- data/lib/new_relic/agent/configuration/manager.rb +16 -2
- data/lib/new_relic/agent/configuration/security_policy_source.rb +10 -26
- data/lib/new_relic/agent/configuration/server_source.rb +24 -24
- data/lib/new_relic/agent/configuration/yaml_source.rb +17 -4
- data/lib/new_relic/agent/connect/request_builder.rb +1 -1
- data/lib/new_relic/agent/connect/response_handler.rb +1 -1
- data/lib/new_relic/agent/custom_event_aggregator.rb +4 -4
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
- data/lib/new_relic/agent/database/obfuscator.rb +2 -2
- data/lib/new_relic/agent/database.rb +4 -18
- data/lib/new_relic/agent/datastores/metric_helper.rb +5 -5
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +11 -11
- data/lib/new_relic/agent/datastores/redis.rb +6 -6
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +8 -10
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +10 -10
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +7 -7
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +6 -6
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +7 -7
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +4 -4
- data/lib/new_relic/agent/distributed_tracing.rb +6 -6
- data/lib/new_relic/agent/error_collector.rb +36 -8
- data/lib/new_relic/agent/error_filter.rb +5 -5
- data/lib/new_relic/agent/error_trace_aggregator.rb +5 -4
- data/lib/new_relic/agent/event_loop.rb +3 -3
- data/lib/new_relic/agent/external.rb +1 -1
- data/lib/new_relic/agent/harvester.rb +1 -3
- data/lib/new_relic/agent/heap.rb +2 -1
- data/lib/new_relic/agent/hostname.rb +1 -1
- data/lib/new_relic/agent/http_clients/abstract.rb +9 -21
- data/lib/new_relic/agent/http_clients/async_http_wrappers.rb +83 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +7 -3
- data/lib/new_relic/agent/http_clients/ethon_wrappers.rb +111 -0
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +7 -5
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -0
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +6 -2
- data/lib/new_relic/agent/http_clients/httpx_wrappers.rb +93 -0
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +5 -1
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +8 -5
- data/lib/new_relic/agent/http_clients/uri_util.rb +2 -2
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +6 -19
- data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +42 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +3 -2
- data/lib/new_relic/agent/instrumentation/action_dispatch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/action_dispatch_subscriber.rb +64 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailbox_subscriber.rb +33 -0
- data/lib/new_relic/agent/instrumentation/action_mailer.rb +30 -0
- data/lib/new_relic/agent/instrumentation/action_mailer_subscriber.rb +85 -0
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +10 -10
- data/lib/new_relic/agent/instrumentation/active_job.rb +16 -3
- data/lib/new_relic/agent/instrumentation/active_job_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +3 -3
- data/lib/new_relic/agent/instrumentation/active_record.rb +4 -3
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +38 -36
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +5 -4
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +2 -2
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +3 -2
- data/lib/new_relic/agent/instrumentation/active_storage.rb +4 -0
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +2 -30
- data/lib/new_relic/agent/instrumentation/active_support.rb +21 -6
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/instrumentation.rb +13 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger/prepend.rb +37 -0
- data/lib/new_relic/agent/instrumentation/active_support_broadcast_logger.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +4 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +3 -1
- data/lib/new_relic/agent/instrumentation/active_support_subscriber.rb +41 -0
- data/lib/new_relic/agent/instrumentation/async_http/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/async_http/instrumentation.rb +37 -0
- data/lib/new_relic/agent/instrumentation/async_http/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/async_http.rb +26 -0
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +12 -3
- data/lib/new_relic/agent/instrumentation/bunny.rb +1 -1
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/instrumentation.rb +3 -4
- data/lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +7 -6
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +9 -5
- data/lib/new_relic/agent/instrumentation/curb.rb +1 -1
- data/lib/new_relic/agent/instrumentation/custom_events.rb +12 -0
- data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +2 -1
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +1 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +4 -1
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +2 -1
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +2 -2
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +8 -4
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +2 -2
- data/lib/new_relic/agent/instrumentation/ethon/chain.rb +39 -0
- data/lib/new_relic/agent/instrumentation/ethon/instrumentation.rb +105 -0
- data/lib/new_relic/agent/instrumentation/ethon/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/ethon.rb +39 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +5 -1
- data/lib/new_relic/agent/instrumentation/excon.rb +3 -3
- data/lib/new_relic/agent/instrumentation/fiber/chain.rb +27 -0
- data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +23 -0
- data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +25 -0
- data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +8 -4
- data/lib/new_relic/agent/instrumentation/grape.rb +4 -4
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +7 -2
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +8 -4
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +2 -2
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +2 -2
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +4 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +4 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +1 -1
- data/lib/new_relic/agent/instrumentation/httpx/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/httpx/instrumentation.rb +51 -0
- data/lib/new_relic/agent/instrumentation/httpx/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpx.rb +27 -0
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +3 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +1 -1
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +3 -1
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +14 -5
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +3 -1
- data/lib/new_relic/agent/instrumentation/memcache.rb +12 -12
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +3 -3
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +1 -1
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +6 -8
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +5 -1
- data/lib/new_relic/agent/instrumentation/net_http.rb +2 -2
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +46 -1
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +7 -3
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +2 -2
- data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +7 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +7 -2
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +14 -1
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +12 -15
- data/lib/new_relic/agent/instrumentation/rake.rb +3 -3
- data/lib/new_relic/agent/instrumentation/redis/constants.rb +1 -1
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +6 -1
- data/lib/new_relic/agent/instrumentation/redis.rb +1 -1
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +4 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +1 -1
- data/lib/new_relic/agent/instrumentation/roda/chain.rb +43 -0
- data/lib/new_relic/agent/instrumentation/roda/ignorer.rb +45 -0
- data/lib/new_relic/agent/instrumentation/roda/instrumentation.rb +68 -0
- data/lib/new_relic/agent/instrumentation/roda/prepend.rb +24 -0
- data/lib/new_relic/agent/instrumentation/roda/roda_transaction_namer.rb +29 -0
- data/lib/new_relic/agent/instrumentation/roda.rb +36 -0
- data/lib/new_relic/agent/instrumentation/sequel.rb +8 -9
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +10 -10
- data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +4 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +26 -3
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +6 -3
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +10 -5
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -4
- data/lib/new_relic/agent/instrumentation/stripe.rb +28 -0
- data/lib/new_relic/agent/instrumentation/stripe_subscriber.rb +77 -0
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +3 -8
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +6 -1
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +10 -6
- data/lib/new_relic/agent/javascript_instrumentor.rb +29 -24
- data/lib/new_relic/agent/linking_metadata.rb +2 -2
- data/lib/new_relic/agent/log_event_aggregator.rb +64 -17
- data/lib/new_relic/agent/log_event_attributes.rb +115 -0
- data/lib/new_relic/agent/logging.rb +77 -37
- data/lib/new_relic/agent/messaging.rb +9 -7
- data/lib/new_relic/agent/method_tracer.rb +7 -7
- data/lib/new_relic/agent/method_tracer_helpers.rb +27 -6
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +4 -5
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +1 -1
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +12 -1
- data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +2 -2
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +0 -1
- data/lib/new_relic/agent/new_relic_service.rb +47 -32
- data/lib/new_relic/agent/obfuscator.rb +1 -1
- data/lib/new_relic/agent/parameter_filtering.rb +6 -6
- data/lib/new_relic/agent/pipe_channel_manager.rb +7 -6
- data/lib/new_relic/agent/pipe_service.rb +5 -3
- data/lib/new_relic/agent/priority_sampled_buffer.rb +1 -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 +2 -1
- data/lib/new_relic/agent/sampler_collection.rb +1 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +5 -5
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +9 -9
- data/lib/new_relic/agent/samplers/memory_sampler.rb +9 -9
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +4 -4
- data/lib/new_relic/agent/span_event_primitive.rb +18 -6
- data/lib/new_relic/agent/sql_sampler.rb +2 -2
- data/lib/new_relic/agent/stats.rb +1 -1
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/system_info.rb +36 -10
- data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
- data/lib/new_relic/agent/threading/backtrace_node.rb +3 -3
- data/lib/new_relic/agent/threading/backtrace_service.rb +3 -7
- data/lib/new_relic/agent/threading/thread_profile.rb +5 -5
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +25 -16
- data/lib/new_relic/agent/transaction/abstract_segment.rb +109 -48
- data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +7 -6
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +13 -14
- data/lib/new_relic/agent/transaction/external_request_segment.rb +16 -13
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +2 -3
- data/lib/new_relic/agent/transaction/request_attributes.rb +47 -11
- data/lib/new_relic/agent/transaction/segment.rb +1 -1
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/trace.rb +1 -1
- data/lib/new_relic/agent/transaction/trace_context.rb +4 -4
- data/lib/new_relic/agent/transaction/trace_node.rb +8 -7
- data/lib/new_relic/agent/transaction/tracing.rb +10 -4
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction.rb +90 -58
- data/lib/new_relic/agent/transaction_error_primitive.rb +21 -5
- data/lib/new_relic/agent/transaction_event_aggregator.rb +4 -4
- data/lib/new_relic/agent/transaction_event_primitive.rb +22 -3
- data/lib/new_relic/agent/transaction_sampler.rb +3 -3
- data/lib/new_relic/agent/transaction_time_aggregator.rb +7 -3
- data/lib/new_relic/agent/utilization/aws.rb +1 -1
- data/lib/new_relic/agent/utilization/azure.rb +3 -3
- data/lib/new_relic/agent/utilization/gcp.rb +4 -6
- data/lib/new_relic/agent/utilization/pcf.rb +1 -1
- data/lib/new_relic/agent/utilization/vendor.rb +6 -8
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
- data/lib/new_relic/agent/vm/mri_vm.rb +9 -8
- data/lib/new_relic/agent/worker_loop.rb +1 -1
- data/lib/new_relic/agent.rb +133 -36
- data/lib/new_relic/cli/command.rb +4 -3
- data/lib/new_relic/cli/commands/deployments.rb +26 -25
- data/lib/new_relic/cli/commands/install.rb +23 -23
- data/lib/new_relic/collection_helper.rb +2 -2
- data/lib/new_relic/constants.rb +10 -8
- data/lib/new_relic/control/class_methods.rb +4 -10
- data/lib/new_relic/control/frameworks/rails.rb +44 -20
- data/lib/new_relic/control/frameworks/roda.rb +20 -0
- data/lib/new_relic/control/instance_methods.rb +6 -6
- data/lib/new_relic/control/instrumentation.rb +1 -15
- data/lib/new_relic/control/private_instance_methods.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +20 -18
- data/lib/new_relic/environment_report.rb +4 -4
- data/lib/new_relic/helper.rb +2 -1
- data/lib/new_relic/language_support.rb +10 -1
- data/lib/new_relic/latest_changes.rb +6 -6
- data/lib/new_relic/local_environment.rb +0 -10
- data/lib/new_relic/noticed_error.rb +25 -20
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +0 -16
- data/lib/new_relic/rack/browser_monitoring.rb +21 -17
- data/lib/new_relic/recipes/capistrano3.rb +1 -1
- data/lib/new_relic/recipes/capistrano_legacy.rb +6 -6
- data/lib/new_relic/recipes/helpers/send_deployment.rb +5 -5
- data/lib/new_relic/supportability_helper.rb +4 -1
- data/lib/new_relic/traced_thread.rb +2 -3
- data/lib/new_relic/version.rb +2 -2
- data/lib/newrelic_rpm.rb +4 -4
- data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +6 -6
- data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +4 -4
- data/lib/tasks/bump_version.rake +21 -0
- data/lib/tasks/config.rake +13 -12
- data/lib/tasks/coverage_report.rake +4 -4
- data/lib/tasks/helpers/config.html.erb +93 -0
- data/lib/tasks/helpers/format.rb +19 -15
- data/lib/tasks/helpers/newrelicyml.rb +144 -0
- data/lib/tasks/helpers/version_bump.rb +62 -0
- data/lib/tasks/install.rake +4 -4
- data/lib/tasks/instrumentation_generator/instrumentation.thor +16 -19
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +1 -1
- data/lib/tasks/instrumentation_generator/templates/chain.tt +1 -1
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +1 -1
- data/lib/tasks/newrelic.rb +1 -0
- data/lib/tasks/newrelicyml.rake +13 -0
- data/lib/tasks/tests.rake +77 -6
- data/newrelic.yml +393 -274
- data/newrelic_rpm.gemspec +41 -30
- data/test/agent_helper.rb +25 -24
- metadata +172 -35
- data/.gitignore +0 -42
- data/.project +0 -23
- data/.rubocop.yml +0 -1946
- data/.rubocop_todo.yml +0 -62
- data/.simplecov +0 -15
- data/.snyk +0 -11
- data/.yardopts +0 -27
- data/Brewfile +0 -12
- data/DOCKER.md +0 -167
- data/Dockerfile +0 -10
- data/Guardfile +0 -26
- data/config/database.yml +0 -5
- data/config.dot +0 -278
- data/docker-compose.yml +0 -107
- data/lefthook.yml +0 -9
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -83
- data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -33
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -215
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -36
- data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -41
- data/lib/new_relic/agent/range_extensions.rb +0 -27
- data/lib/tasks/helpers/removers.rb +0 -33
- data/lib/tasks/multiverse.rake +0 -6
- data/lib/tasks/multiverse.rb +0 -77
data/lib/new_relic/agent.rb
CHANGED
@@ -58,6 +58,7 @@ module NewRelic
|
|
58
58
|
require 'new_relic/agent/deprecator'
|
59
59
|
require 'new_relic/agent/logging'
|
60
60
|
require 'new_relic/agent/distributed_tracing'
|
61
|
+
require 'new_relic/agent/attribute_pre_filtering'
|
61
62
|
require 'new_relic/agent/attribute_processing'
|
62
63
|
require 'new_relic/agent/linking_metadata'
|
63
64
|
require 'new_relic/agent/local_log_decorator'
|
@@ -105,7 +106,10 @@ module NewRelic
|
|
105
106
|
# placeholder name used when we cannot determine a transaction's name
|
106
107
|
UNKNOWN_METRIC = '(unknown)'.freeze
|
107
108
|
|
109
|
+
attr_reader :error_group_callback
|
110
|
+
|
108
111
|
@agent = nil
|
112
|
+
@error_group_callback = nil
|
109
113
|
@logger = nil
|
110
114
|
@tracer_lock = Mutex.new
|
111
115
|
@tracer_queue = []
|
@@ -210,6 +214,19 @@ module NewRelic
|
|
210
214
|
record_metric(metric_name, value)
|
211
215
|
end
|
212
216
|
|
217
|
+
def record_instrumentation_invocation(library)
|
218
|
+
record_metric_once("Supportability/#{library}/Invoked")
|
219
|
+
end
|
220
|
+
|
221
|
+
# see ActiveSupport::Inflector.demodulize
|
222
|
+
def base_name(klass_name)
|
223
|
+
return klass_name unless ridx = klass_name.rindex('::')
|
224
|
+
|
225
|
+
klass_name[(ridx + 2), klass_name.length]
|
226
|
+
end
|
227
|
+
|
228
|
+
SUPPORTABILITY_INCREMENT_METRIC = 'Supportability/API/increment_metric'.freeze
|
229
|
+
|
213
230
|
# Increment a simple counter metric.
|
214
231
|
#
|
215
232
|
# +metric_name+ should follow a slash separated path convention. Application
|
@@ -218,9 +235,7 @@ module NewRelic
|
|
218
235
|
# This method is safe to use from any thread.
|
219
236
|
#
|
220
237
|
# @api public
|
221
|
-
|
222
|
-
SUPPORTABILITY_INCREMENT_METRIC = 'Supportability/API/increment_metric'.freeze
|
223
|
-
|
238
|
+
#
|
224
239
|
def increment_metric(metric_name, amount = 1) # THREAD_LOCAL_ACCESS
|
225
240
|
return unless agent
|
226
241
|
|
@@ -293,6 +308,47 @@ module NewRelic
|
|
293
308
|
nil # don't return a noticed error data structure. it can only hurt.
|
294
309
|
end
|
295
310
|
|
311
|
+
# Set a callback proc for determining an error's error group name
|
312
|
+
#
|
313
|
+
# @param callback_proc [Proc] the callback proc
|
314
|
+
#
|
315
|
+
# Typically this method should be called only once to set a callback for
|
316
|
+
# use with all noticed errors. If it is called multiple times, each new
|
317
|
+
# callback given will replace the old one.
|
318
|
+
#
|
319
|
+
# The proc will be called with a single hash as its input argument and is
|
320
|
+
# expected to return a string representing the desired error group.
|
321
|
+
#
|
322
|
+
# see https://docs.newrelic.com/docs/errors-inbox/errors-inbox/#groups
|
323
|
+
#
|
324
|
+
# The hash passed to the customer defined callback proc has the following
|
325
|
+
# keys:
|
326
|
+
#
|
327
|
+
# :error => The Ruby error class instance, likely inheriting from
|
328
|
+
# StandardError. Call `#class`, `#message`, and `#backtrace` on
|
329
|
+
# the error object to retrieve the error's class, message, and
|
330
|
+
# backtrace.
|
331
|
+
# :customAttributes => Any customer defined custom attributes that have been
|
332
|
+
# associated with the current transaction.
|
333
|
+
# :'request.uri' => The current request URI if available
|
334
|
+
# :'http.statusCode' => The HTTP status code (200, 404, etc.) if available
|
335
|
+
# :'http.method' => The HTTP method (GET, PUT, etc.) if available
|
336
|
+
# :'error.expected' => Whether (true) or not (false) the error was expected
|
337
|
+
# :options => The options hash passed to `NewRelic::Agent.notice_error`
|
338
|
+
#
|
339
|
+
# @api public
|
340
|
+
#
|
341
|
+
def set_error_group_callback(callback_proc)
|
342
|
+
unless callback_proc.is_a?(Proc)
|
343
|
+
NewRelic::Agent.logger.error("#{self}.#{__method__}: expected an argument of type Proc, " \
|
344
|
+
"got #{callback_proc.class}")
|
345
|
+
return
|
346
|
+
end
|
347
|
+
|
348
|
+
record_api_supportability_metric(:set_error_group_callback)
|
349
|
+
@error_group_callback = callback_proc
|
350
|
+
end
|
351
|
+
|
296
352
|
# @!endgroup
|
297
353
|
|
298
354
|
# @!group Recording custom Insights events
|
@@ -353,7 +409,7 @@ module NewRelic
|
|
353
409
|
# @api public
|
354
410
|
#
|
355
411
|
def manual_start(options = {})
|
356
|
-
raise
|
412
|
+
raise 'Options must be a hash' unless Hash === options
|
357
413
|
|
358
414
|
NewRelic::Control.instance.init_plugin({:agent_enabled => true, :sync_startup => true}.merge(options))
|
359
415
|
record_api_supportability_metric(:manual_start)
|
@@ -371,7 +427,7 @@ module NewRelic
|
|
371
427
|
# jobs or other work. If you are doing this with a web dispatcher
|
372
428
|
# that forks worker processes then you will need to force the
|
373
429
|
# agent to reconnect, which it won't do by default. Passenger and
|
374
|
-
#
|
430
|
+
# Unicorn are already handled, nothing special needed for them.
|
375
431
|
#
|
376
432
|
# Options:
|
377
433
|
# * <tt>:force_reconnect => true</tt> to force the spawned process to
|
@@ -386,7 +442,8 @@ module NewRelic
|
|
386
442
|
#
|
387
443
|
def after_fork(options = {})
|
388
444
|
record_api_supportability_metric(:after_fork)
|
389
|
-
|
445
|
+
# the following line needs else branch coverage
|
446
|
+
agent.after_fork(options) if agent # rubocop:disable Style/SafeNavigation
|
390
447
|
end
|
391
448
|
|
392
449
|
# Shutdown the agent. Call this before exiting. Sends any queued data
|
@@ -398,7 +455,7 @@ module NewRelic
|
|
398
455
|
#
|
399
456
|
def shutdown(options = {})
|
400
457
|
record_api_supportability_metric(:shutdown)
|
401
|
-
agent
|
458
|
+
agent&.shutdown
|
402
459
|
end
|
403
460
|
|
404
461
|
# Clear out any data the agent has buffered but has not yet transmitted
|
@@ -406,7 +463,8 @@ module NewRelic
|
|
406
463
|
#
|
407
464
|
# @api public
|
408
465
|
def drop_buffered_data
|
409
|
-
|
466
|
+
# the following line needs else branch coverage
|
467
|
+
agent.drop_buffered_data if agent # rubocop:disable Style/SafeNavigation
|
410
468
|
record_api_supportability_metric(:drop_buffered_data)
|
411
469
|
end
|
412
470
|
|
@@ -465,8 +523,7 @@ module NewRelic
|
|
465
523
|
#
|
466
524
|
def ignore_transaction
|
467
525
|
record_api_supportability_metric(:ignore_transaction)
|
468
|
-
|
469
|
-
txn.ignore! if txn
|
526
|
+
NewRelic::Agent::Transaction.tl_current&.ignore!
|
470
527
|
end
|
471
528
|
|
472
529
|
# This method disables the recording of Apdex metrics in the current
|
@@ -476,8 +533,7 @@ module NewRelic
|
|
476
533
|
#
|
477
534
|
def ignore_apdex
|
478
535
|
record_api_supportability_metric(:ignore_apdex)
|
479
|
-
|
480
|
-
txn.ignore_apdex! if txn
|
536
|
+
NewRelic::Agent::Transaction.tl_current&.ignore_apdex!
|
481
537
|
end
|
482
538
|
|
483
539
|
# This method disables browser monitoring javascript injection in the
|
@@ -487,8 +543,7 @@ module NewRelic
|
|
487
543
|
#
|
488
544
|
def ignore_enduser
|
489
545
|
record_api_supportability_metric(:ignore_enduser)
|
490
|
-
|
491
|
-
txn.ignore_enduser! if txn
|
546
|
+
NewRelic::Agent::Transaction.tl_current&.ignore_enduser!
|
492
547
|
end
|
493
548
|
|
494
549
|
# Yield to the block without collecting any metrics or traces in
|
@@ -511,18 +566,6 @@ module NewRelic
|
|
511
566
|
end
|
512
567
|
end
|
513
568
|
|
514
|
-
# This method disables the recording of transaction traces in the given
|
515
|
-
# block. See also #disable_all_tracing
|
516
|
-
#
|
517
|
-
# @api public
|
518
|
-
#
|
519
|
-
def disable_transaction_tracing
|
520
|
-
Deprecator.deprecate(:disable_transaction_tracing,
|
521
|
-
'disable_all_tracing or ignore_transaction')
|
522
|
-
record_api_supportability_metric(:disable_transaction_tracing)
|
523
|
-
yield
|
524
|
-
end
|
525
|
-
|
526
569
|
# This method sets the state of sql recording in the transaction
|
527
570
|
# sampler feature. Within the given block, no sql will be recorded
|
528
571
|
#
|
@@ -554,12 +597,6 @@ module NewRelic
|
|
554
597
|
NewRelic::Agent::Tracer.state.is_execution_traced?
|
555
598
|
end
|
556
599
|
|
557
|
-
# helper method to check the thread local to determine whether sql
|
558
|
-
# is being recorded or not
|
559
|
-
def tl_is_sql_recorded?
|
560
|
-
NewRelic::Agent::Tracer.state.is_sql_recorded?
|
561
|
-
end
|
562
|
-
|
563
600
|
# @!group Adding custom attributes to traces
|
564
601
|
|
565
602
|
# Add attributes to the transaction trace, Insights Transaction event, and
|
@@ -582,8 +619,7 @@ module NewRelic
|
|
582
619
|
record_api_supportability_metric(:add_custom_attributes)
|
583
620
|
|
584
621
|
if params.is_a?(Hash)
|
585
|
-
|
586
|
-
txn.add_custom_attributes(params) if txn
|
622
|
+
Transaction.tl_current&.add_custom_attributes(params)
|
587
623
|
|
588
624
|
segment = ::NewRelic::Agent::Tracer.current_segment
|
589
625
|
if segment
|
@@ -597,7 +633,9 @@ module NewRelic
|
|
597
633
|
def add_new_segment_attributes(params, segment)
|
598
634
|
# Make sure not to override existing segment-level custom attributes
|
599
635
|
segment_custom_keys = segment.attributes.custom_attributes.keys.map(&:to_sym)
|
600
|
-
segment.add_custom_attributes(params.reject
|
636
|
+
segment.add_custom_attributes(params.reject do |k, _v|
|
637
|
+
segment_custom_keys.include?(k.to_sym) if k.respond_to?(:to_sym) # param keys can be integers
|
638
|
+
end)
|
601
639
|
end
|
602
640
|
|
603
641
|
# Add custom attributes to the span event for the current span. Attributes will be visible on spans in the
|
@@ -625,6 +663,65 @@ module NewRelic
|
|
625
663
|
end
|
626
664
|
end
|
627
665
|
|
666
|
+
# Add global custom attributes to log events for the current agent instance. As these attributes are global to the
|
667
|
+
# agent instance, they will be attached to all log events generated by the agent, and this methods usage isn't
|
668
|
+
# suitable for setting dynamic values.
|
669
|
+
#
|
670
|
+
# @param [Hash] params A Hash of attributes to attach to log
|
671
|
+
# events. The agent accepts up to 240 custom
|
672
|
+
# log event attributes.
|
673
|
+
#
|
674
|
+
# Keys will be coerced into Strings and must
|
675
|
+
# be less than 256 characters. Keys longer
|
676
|
+
# than 255 characters will be truncated.
|
677
|
+
#
|
678
|
+
# Values may be Strings, Symbols, numeric
|
679
|
+
# values or Booleans and must be less than
|
680
|
+
# 4095 characters. If the value is a String
|
681
|
+
# or a Symbol, values longer than 4094
|
682
|
+
# characters will be truncated. If the value
|
683
|
+
# exceeds 4094 characters and is of a
|
684
|
+
# different class, the attribute pair will
|
685
|
+
# be dropped.
|
686
|
+
#
|
687
|
+
# This API can be called multiple times.
|
688
|
+
# If the same key is passed more than once,
|
689
|
+
# the value associated with the last call
|
690
|
+
# will be preserved.
|
691
|
+
#
|
692
|
+
# Attribute pairs with empty or nil contents
|
693
|
+
# will be dropped.
|
694
|
+
# @api public
|
695
|
+
def add_custom_log_attributes(params)
|
696
|
+
record_api_supportability_metric(:add_custom_log_attributes)
|
697
|
+
|
698
|
+
if params.is_a?(Hash)
|
699
|
+
NewRelic::Agent.agent.log_event_aggregator.add_custom_attributes(params)
|
700
|
+
else
|
701
|
+
NewRelic::Agent.logger.warn("Bad argument passed to #add_custom_log_attributes. Expected Hash but got #{params.class}.")
|
702
|
+
end
|
703
|
+
end
|
704
|
+
|
705
|
+
# Set the user id for the current transaction. When present, this value will be included in the agent attributes for transaction and error events as 'enduser.id'.
|
706
|
+
#
|
707
|
+
# @param [String] user_id The user id to add to the current transaction attributes
|
708
|
+
#
|
709
|
+
# @api public
|
710
|
+
def set_user_id(user_id)
|
711
|
+
record_api_supportability_metric(:set_user_id)
|
712
|
+
|
713
|
+
if user_id.nil? || user_id.empty?
|
714
|
+
::NewRelic::Agent.logger.warn('NewRelic::Agent.set_user_id called with a nil or empty user id.')
|
715
|
+
return
|
716
|
+
end
|
717
|
+
|
718
|
+
default_destinations = NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER |
|
719
|
+
NewRelic::Agent::AttributeFilter::DST_TRANSACTION_EVENTS |
|
720
|
+
NewRelic::Agent::AttributeFilter::DST_ERROR_COLLECTOR
|
721
|
+
|
722
|
+
NewRelic::Agent::Transaction.add_agent_attribute(:'enduser.id', user_id, default_destinations)
|
723
|
+
end
|
724
|
+
|
628
725
|
# @!endgroup
|
629
726
|
|
630
727
|
# @!group Transaction naming
|
@@ -704,7 +801,7 @@ module NewRelic
|
|
704
801
|
def notify(event_type, *args)
|
705
802
|
agent.events.notify(event_type, *args)
|
706
803
|
rescue
|
707
|
-
NewRelic::Agent.logger.debug(
|
804
|
+
NewRelic::Agent.logger.debug('Ignoring exception during %p event notification' % [event_type])
|
708
805
|
end
|
709
806
|
|
710
807
|
# @!group Trace and Entity metadata
|
@@ -38,7 +38,7 @@ module NewRelic
|
|
38
38
|
else
|
39
39
|
# parse command line args. Throw an exception on a bad arg.
|
40
40
|
@options = options do |opts|
|
41
|
-
opts.on(
|
41
|
+
opts.on('-h', 'Show this help') { raise CommandFailure, opts.to_s }
|
42
42
|
end
|
43
43
|
@leftover = @options.parse(command_line_args)
|
44
44
|
end
|
@@ -60,11 +60,12 @@ module NewRelic
|
|
60
60
|
extra = []
|
61
61
|
options = ARGV.options do |opts|
|
62
62
|
script_name = File.basename($0)
|
63
|
-
|
63
|
+
# TODO: MAJOR VERSION - remove newrelic_cmd, deprecated since version 2.13
|
64
|
+
if /newrelic_cmd$/.match?(script_name)
|
64
65
|
$stdout.puts "warning: the 'newrelic_cmd' script has been renamed 'newrelic'"
|
65
66
|
script_name = 'newrelic'
|
66
67
|
end
|
67
|
-
opts.banner = "Usage: #{script_name} [ #{@command_names.join(
|
68
|
+
opts.banner = "Usage: #{script_name} [ #{@command_names.join(' | ')} ] [options]"
|
68
69
|
opts.separator("use '#{script_name} <command> -h' to see detailed command options")
|
69
70
|
opts
|
70
71
|
end
|
@@ -16,7 +16,7 @@ require 'new_relic/control' unless defined? NewRelic::Control
|
|
16
16
|
|
17
17
|
class NewRelic::Cli::Deployments < NewRelic::Cli::Command
|
18
18
|
attr_reader :control
|
19
|
-
def self.command;
|
19
|
+
def self.command; 'deployments'; end
|
20
20
|
|
21
21
|
# Initialize the deployment uploader with command line args.
|
22
22
|
# Use -h to see options.
|
@@ -33,7 +33,8 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
|
|
33
33
|
@changelog = nil
|
34
34
|
@user = nil
|
35
35
|
super(command_line_args)
|
36
|
-
|
36
|
+
# needs else branch coverage
|
37
|
+
@description ||= @leftover && @leftover.join(' ') # rubocop:disable Style/SafeNavigation
|
37
38
|
@user ||= ENV['USER']
|
38
39
|
control.env = @environment if @environment
|
39
40
|
|
@@ -71,17 +72,17 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
|
|
71
72
|
end
|
72
73
|
|
73
74
|
if !api_v1? && (@revision.nil? || @revision.empty?)
|
74
|
-
raise
|
75
|
+
raise 'revision required when using New Relic REST API v2 with api_key. Pass in revision using: -r, --revision=REV'
|
75
76
|
end
|
76
77
|
|
77
78
|
request = if api_v1?
|
78
|
-
uri =
|
79
|
-
create_request(uri, {'x-license-key' => @license_key},
|
79
|
+
uri = '/deployments.xml'
|
80
|
+
create_request(uri, {'x-license-key' => @license_key}, 'application/octet-stream').tap do |req|
|
80
81
|
set_params_v1(req)
|
81
82
|
end
|
82
83
|
else
|
83
84
|
uri = "/v2/applications/#{application_id}/deployments.json"
|
84
|
-
create_request(uri, {
|
85
|
+
create_request(uri, {'Api-Key' => @api_key}, 'application/json').tap do |req|
|
85
86
|
set_params_v2(req)
|
86
87
|
end
|
87
88
|
end
|
@@ -92,7 +93,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
|
|
92
93
|
if response.is_a?(Net::HTTPSuccess)
|
93
94
|
info("Recorded deployment to '#{@appname}' (#{@description || Time.now})")
|
94
95
|
else
|
95
|
-
err_string = REXML::Document.new(response.body).elements['errors/error'].map(&:to_s).join(
|
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}"
|
97
98
|
end
|
98
99
|
rescue SystemCallError, SocketError => e
|
@@ -150,7 +151,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
|
|
150
151
|
|
151
152
|
def set_params_v2(request)
|
152
153
|
request.body = {
|
153
|
-
|
154
|
+
'deployment' => {
|
154
155
|
:description => @description,
|
155
156
|
:user => @user,
|
156
157
|
:revision => @revision,
|
@@ -161,25 +162,25 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
|
|
161
162
|
|
162
163
|
def options
|
163
164
|
OptionParser.new(%Q(Usage: #{$0} #{self.class.command} [OPTIONS] ["description"] ), 40) do |o|
|
164
|
-
o.separator(
|
165
|
-
o.on(
|
166
|
-
|
167
|
-
|
168
|
-
o.on(
|
169
|
-
|
170
|
-
|
171
|
-
o.on(
|
172
|
-
|
165
|
+
o.separator('OPTIONS:')
|
166
|
+
o.on('-a', '--appname=NAME', String,
|
167
|
+
'Set the application name.',
|
168
|
+
'Default is app_name setting in newrelic.yml. Available only when using API v1.') { |e| @appname = e }
|
169
|
+
o.on('-i', '--appid=ID', String,
|
170
|
+
'Set the application ID',
|
171
|
+
'If not provided, will connect to the New Relic collector to get it') { |i| @application_id = i }
|
172
|
+
o.on('-e', '--environment=name', String,
|
173
|
+
'Override the (RAILS|RUBY|RACK)_ENV setting',
|
173
174
|
"currently: #{control.env}") { |e| @environment = e }
|
174
|
-
o.on(
|
175
|
-
|
175
|
+
o.on('-u', '--user=USER', String,
|
176
|
+
'Specify the user deploying, for information only',
|
176
177
|
"Default: #{@user || '<none>'}") { |u| @user = u }
|
177
|
-
o.on(
|
178
|
-
|
179
|
-
o.on(
|
180
|
-
|
181
|
-
o.on(
|
182
|
-
|
178
|
+
o.on('-r', '--revision=REV', String,
|
179
|
+
'Specify the revision being deployed. Required when using New Relic REST API v2') { |r| @revision = r }
|
180
|
+
o.on('-l', '--license-key=KEY', String,
|
181
|
+
'Specify the license key of the account for the app being deployed') { |l| @license_key = l }
|
182
|
+
o.on('-c', '--changes',
|
183
|
+
'Read in a change log from the standard input') { @changelog = STDIN.read }
|
183
184
|
yield(o) if block_given?
|
184
185
|
end
|
185
186
|
end
|
@@ -7,9 +7,9 @@ require 'new_relic/version'
|
|
7
7
|
require 'erb'
|
8
8
|
|
9
9
|
class NewRelic::Cli::Install < NewRelic::Cli::Command
|
10
|
-
NO_LICENSE_KEY =
|
10
|
+
NO_LICENSE_KEY = '<PASTE LICENSE KEY HERE>'
|
11
11
|
|
12
|
-
def self.command;
|
12
|
+
def self.command; 'install'; end
|
13
13
|
|
14
14
|
# Use -h to see options.
|
15
15
|
# When command_line_args is a hash, we are invoking directly and
|
@@ -25,45 +25,45 @@ class NewRelic::Cli::Install < NewRelic::Cli::Command
|
|
25
25
|
super(command_line_args)
|
26
26
|
if @dest_dir.nil?
|
27
27
|
# Install a newrelic.yml file into the local config directory.
|
28
|
-
if File.directory?(
|
29
|
-
@dest_dir =
|
28
|
+
if File.directory?('config')
|
29
|
+
@dest_dir = 'config'
|
30
30
|
else
|
31
|
-
@dest_dir =
|
31
|
+
@dest_dir = '.'
|
32
32
|
end
|
33
33
|
end
|
34
34
|
@license_key ||= NO_LICENSE_KEY
|
35
|
-
@app_name ||= @leftover.join(
|
35
|
+
@app_name ||= @leftover.join(' ')
|
36
36
|
@agent_version = NewRelic::VERSION::STRING
|
37
|
-
raise CommandFailure.new(
|
37
|
+
raise CommandFailure.new('Application name required.', @options) unless @app_name && @app_name.size > 0
|
38
38
|
end
|
39
39
|
|
40
40
|
def run
|
41
|
-
dest_file = File.expand_path(@dest_dir +
|
41
|
+
dest_file = File.expand_path(@dest_dir + '/newrelic.yml')
|
42
42
|
if File.exist?(dest_file) && !@force
|
43
|
-
raise NewRelic::Cli::Command::CommandFailure,
|
43
|
+
raise NewRelic::Cli::Command::CommandFailure, 'newrelic.yml file already exists. Use --force flag to overwrite.'
|
44
44
|
end
|
45
45
|
|
46
46
|
File.open(dest_file, 'w') { |out| out.puts(content) }
|
47
47
|
|
48
|
-
puts
|
48
|
+
puts <<~EOF unless quiet
|
49
49
|
|
50
|
-
Installed a default configuration file at
|
51
|
-
#{dest_file}.
|
50
|
+
Installed a default configuration file at
|
51
|
+
#{dest_file}.
|
52
52
|
EOF
|
53
|
-
puts
|
53
|
+
puts <<~EOF unless quiet || @license_key != NO_LICENSE_KEY
|
54
54
|
|
55
|
-
To monitor your application in production mode, sign up for an account
|
56
|
-
at www.newrelic.com, and replace the newrelic.yml file with the one
|
57
|
-
you receive upon registration.
|
55
|
+
To monitor your application in production mode, sign up for an account
|
56
|
+
at www.newrelic.com, and replace the newrelic.yml file with the one
|
57
|
+
you receive upon registration.
|
58
58
|
EOF
|
59
|
-
puts
|
59
|
+
puts <<~EOF unless quiet
|
60
60
|
|
61
|
-
Visit support.newrelic.com if you are experiencing installation issues.
|
61
|
+
Visit support.newrelic.com if you are experiencing installation issues.
|
62
62
|
EOF
|
63
63
|
end
|
64
64
|
|
65
65
|
def content
|
66
|
-
@src_file ||= File.expand_path(File.join(File.dirname(__FILE__),
|
66
|
+
@src_file ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'newrelic.yml'))
|
67
67
|
template = File.read(@src_file)
|
68
68
|
ERB.new(template).result(binding)
|
69
69
|
end
|
@@ -72,10 +72,10 @@ Visit support.newrelic.com if you are experiencing installation issues.
|
|
72
72
|
|
73
73
|
def options
|
74
74
|
OptionParser.new("Usage: #{$0} #{self.class.command} [ OPTIONS] 'application name'", 40) do |o|
|
75
|
-
o.on(
|
76
|
-
o.on(
|
77
|
-
|
78
|
-
o.on(
|
75
|
+
o.on('-f', '--force', 'Overwrite newrelic.yml if it exists') { |e| @force = true }
|
76
|
+
o.on('-l', '--license_key=NAME', String,
|
77
|
+
'Use the given license key') { |e| @license_key = e }
|
78
|
+
o.on('-d', '--destdir=name', String,
|
79
79
|
"Write the newrelic.yml to the given directory, default is '.'") { |e| @dest_dir = e }
|
80
80
|
yield(o) if block_given?
|
81
81
|
end
|
@@ -40,7 +40,7 @@ module NewRelic
|
|
40
40
|
when nil then ''
|
41
41
|
when object.instance_of?(String) then object
|
42
42
|
when String then String.new(object) # convert string subclasses to strings
|
43
|
-
else
|
43
|
+
else +"#<#{object.class}>"
|
44
44
|
end
|
45
45
|
end
|
46
46
|
|
@@ -52,7 +52,7 @@ module NewRelic
|
|
52
52
|
real_string = flatten(string)
|
53
53
|
if real_string.size > len
|
54
54
|
real_string = real_string.slice(0...len)
|
55
|
-
real_string <<
|
55
|
+
real_string << '...'
|
56
56
|
end
|
57
57
|
real_string
|
58
58
|
else
|
data/lib/new_relic/constants.rb
CHANGED
@@ -7,16 +7,16 @@ module NewRelic
|
|
7
7
|
|
8
8
|
EMPTY_ARRAY = [].freeze
|
9
9
|
EMPTY_HASH = {}.freeze
|
10
|
-
EMPTY_STR =
|
10
|
+
EMPTY_STR = ''
|
11
11
|
|
12
|
-
HTTP =
|
13
|
-
HTTPS =
|
14
|
-
UNKNOWN =
|
12
|
+
HTTP = 'HTTP'
|
13
|
+
HTTPS = 'HTTPS'
|
14
|
+
UNKNOWN = 'Unknown'
|
15
15
|
|
16
16
|
FORMAT_NON_RACK = 0
|
17
17
|
FORMAT_RACK = 1
|
18
18
|
|
19
|
-
NEWRELIC_KEY =
|
19
|
+
NEWRELIC_KEY = 'newrelic'
|
20
20
|
CANDIDATE_NEWRELIC_KEYS = [
|
21
21
|
NEWRELIC_KEY,
|
22
22
|
'NEWRELIC',
|
@@ -24,8 +24,8 @@ module NewRelic
|
|
24
24
|
'Newrelic'
|
25
25
|
].freeze
|
26
26
|
|
27
|
-
TRACEPARENT_KEY =
|
28
|
-
TRACESTATE_KEY =
|
27
|
+
TRACEPARENT_KEY = 'traceparent'
|
28
|
+
TRACESTATE_KEY = 'tracestate'
|
29
29
|
|
30
30
|
STANDARD_OUT = 'STDOUT'
|
31
31
|
|
@@ -34,6 +34,8 @@ module NewRelic
|
|
34
34
|
HTTP_NEWRELIC_KEY = "HTTP_#{NEWRELIC_KEY.upcase}"
|
35
35
|
|
36
36
|
CONNECT_RETRY_PERIODS = [15, 15, 30, 60, 120, 300]
|
37
|
-
MIN_RETRY_PERIOD = 15
|
38
37
|
MAX_RETRY_PERIOD = 300
|
38
|
+
|
39
|
+
SLASH = '/'
|
40
|
+
ROOT = SLASH
|
39
41
|
end
|
@@ -35,8 +35,8 @@ module NewRelic
|
|
35
35
|
|
36
36
|
# nb this does not 'load test' the framework, it loads the 'test framework'
|
37
37
|
def load_test_framework
|
38
|
-
config = File.expand_path(File.join('..', '..', '..', '..',
|
39
|
-
require
|
38
|
+
config = File.expand_path(File.join('..', '..', '..', '..', 'test', 'config', 'newrelic.yml'), __FILE__)
|
39
|
+
require 'config/test_control'
|
40
40
|
NewRelic::Control::Frameworks::Test.new(local_env, config)
|
41
41
|
end
|
42
42
|
|
@@ -49,18 +49,12 @@ module NewRelic
|
|
49
49
|
# maybe it is already loaded by some external system
|
50
50
|
# i.e. rpm_contrib or user extensions?
|
51
51
|
end
|
52
|
-
NewRelic::Control::Frameworks.const_get(camelize(framework.to_s))
|
52
|
+
NewRelic::Control::Frameworks.const_get(NewRelic::LanguageSupport.camelize(framework.to_s))
|
53
53
|
end
|
54
54
|
|
55
55
|
# The root directory for the plugin or gem
|
56
56
|
def newrelic_root
|
57
|
-
File.expand_path(File.join(
|
58
|
-
end
|
59
|
-
|
60
|
-
def camelize(snake_case_name)
|
61
|
-
snake_case_name.gsub(/(\_|^)[a-z]/) do |substring|
|
62
|
-
substring[-1].capitalize!
|
63
|
-
end
|
57
|
+
File.expand_path(File.join('..', '..', '..', '..'), __FILE__)
|
64
58
|
end
|
65
59
|
end
|
66
60
|
extend ClassMethods
|