newrelic_rpm 5.7.0.350 → 7.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +9 -0
- data/.yardopts +1 -0
- data/CHANGELOG.md +788 -0
- data/CONTRIBUTING.md +106 -19
- data/Gemfile +6 -2
- data/Guardfile +18 -1
- data/LICENSE +208 -38
- data/README.md +80 -84
- data/ROADMAP.md +24 -0
- data/Rakefile +2 -0
- data/THIRD_PARTY_NOTICES.md +213 -0
- data/bin/nrdebug +1 -1
- data/init.rb +1 -1
- data/install.rb +1 -1
- data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
- data/lib/new_relic/agent/agent.rb +176 -191
- data/lib/new_relic/agent/agent_logger.rb +5 -1
- data/lib/new_relic/agent/attribute_filter.rb +8 -8
- data/lib/new_relic/agent/attribute_processing.rb +1 -1
- data/lib/new_relic/agent/attributes.rb +152 -0
- data/lib/new_relic/agent/audit_logger.rb +11 -1
- data/lib/new_relic/agent/autostart.rb +19 -15
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command_router.rb +3 -22
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +447 -89
- data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
- data/lib/new_relic/agent/configuration/environment_source.rb +5 -3
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +45 -0
- data/lib/new_relic/agent/configuration/high_security_source.rb +2 -1
- data/lib/new_relic/agent/configuration/manager.rb +16 -12
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
- data/lib/new_relic/agent/configuration/security_policy_source.rb +1 -1
- data/lib/new_relic/agent/configuration/server_source.rb +39 -4
- data/lib/new_relic/agent/configuration/yaml_source.rb +12 -7
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +61 -0
- data/lib/new_relic/agent/connect/response_handler.rb +61 -0
- data/lib/new_relic/agent/custom_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
- data/lib/new_relic/agent/database/obfuscator.rb +1 -1
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
- data/lib/new_relic/agent/database.rb +2 -3
- data/lib/new_relic/agent/database_adapter.rb +33 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +2 -3
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +3 -3
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +9 -9
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo.rb +2 -2
- data/lib/new_relic/agent/datastores/redis.rb +1 -5
- data/lib/new_relic/agent/datastores.rb +7 -9
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +3 -2
- data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +61 -46
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
- data/lib/new_relic/agent/{distributed_trace_payload.rb → distributed_tracing/distributed_trace_payload.rb} +32 -113
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +39 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +246 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +126 -0
- data/lib/new_relic/agent/distributed_tracing.rb +115 -32
- data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
- data/lib/new_relic/agent/error_collector.rb +37 -20
- data/lib/new_relic/agent/error_event_aggregator.rb +10 -7
- data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
- data/lib/new_relic/agent/event_aggregator.rb +27 -33
- data/lib/new_relic/agent/event_buffer.rb +1 -1
- data/lib/new_relic/agent/event_listener.rb +1 -1
- data/lib/new_relic/agent/event_loop.rb +1 -1
- data/lib/new_relic/agent/external.rb +13 -11
- data/lib/new_relic/agent/guid_generator.rb +28 -0
- data/lib/new_relic/agent/harvester.rb +1 -1
- data/lib/new_relic/agent/heap.rb +1 -1
- data/lib/new_relic/agent/hostname.rb +16 -2
- data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +25 -20
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +29 -14
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -22
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +11 -12
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +17 -5
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -7
- data/lib/new_relic/agent/http_clients/uri_util.rb +12 -11
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +26 -43
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +53 -73
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +81 -56
- data/lib/new_relic/agent/instrumentation/active_job.rb +7 -8
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_record.rb +85 -38
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +17 -6
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +152 -0
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +35 -11
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +47 -49
- data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +13 -9
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +10 -9
- data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +152 -0
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/bunny.rb +13 -132
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +10 -4
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +93 -0
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +222 -0
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +63 -0
- data/lib/new_relic/agent/instrumentation/curb.rb +11 -183
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +5 -3
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +53 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +34 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +9 -49
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +8 -5
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
- data/lib/new_relic/agent/instrumentation/excon.rb +4 -3
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +100 -0
- data/lib/new_relic/agent/instrumentation/grape/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/grape.rb +14 -118
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +38 -0
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +17 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +10 -30
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +30 -0
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httprb.rb +29 -0
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +16 -0
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +39 -118
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +56 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +88 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +88 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +55 -68
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +1 -1
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +4 -2
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +20 -11
- data/lib/new_relic/agent/instrumentation/mongo.rb +17 -4
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +36 -3
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +40 -0
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
- data/lib/new_relic/agent/instrumentation/net_http.rb +39 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +100 -0
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +34 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +27 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +19 -52
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +57 -0
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +32 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +73 -0
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +36 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +30 -138
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
- data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_cable.rb +6 -7
- data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_controller.rb +4 -4
- data/lib/new_relic/agent/instrumentation/{rails4 → rails_notifications}/action_view.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +25 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +144 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +14 -155
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +34 -0
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +65 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +24 -0
- data/lib/new_relic/agent/instrumentation/redis.rb +11 -104
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +33 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +16 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +9 -26
- data/lib/new_relic/agent/instrumentation/sequel.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +48 -24
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -35
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +118 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra.rb +21 -160
- data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +82 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +12 -74
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +1 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +3 -3
- data/lib/new_relic/agent/log_once.rb +1 -1
- data/lib/new_relic/agent/logging.rb +139 -0
- data/lib/new_relic/agent/memory_logger.rb +1 -1
- data/lib/new_relic/agent/messaging.rb +15 -82
- data/lib/new_relic/agent/method_tracer.rb +10 -8
- data/lib/new_relic/agent/method_tracer_helpers.rb +5 -5
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +110 -0
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +27 -0
- data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +4 -4
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +4 -7
- data/lib/new_relic/agent/monitors.rb +27 -0
- data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +1 -2
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +6 -27
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -1
- data/lib/new_relic/agent/new_relic_service.rb +95 -40
- data/lib/new_relic/agent/noticible_error.rb +22 -0
- data/lib/new_relic/agent/null_logger.rb +1 -1
- data/lib/new_relic/agent/obfuscator.rb +1 -1
- data/lib/new_relic/agent/parameter_filtering.rb +19 -6
- data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
- data/lib/new_relic/agent/pipe_channel_manager.rb +1 -1
- data/lib/new_relic/agent/pipe_service.rb +1 -1
- data/lib/new_relic/agent/prepend_supportability.rb +1 -1
- data/lib/new_relic/agent/priority_sampled_buffer.rb +9 -4
- data/lib/new_relic/agent/range_extensions.rb +1 -1
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine.rb +1 -1
- data/lib/new_relic/agent/sampler.rb +1 -1
- data/lib/new_relic/agent/sampler_collection.rb +1 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/memory_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +3 -5
- data/lib/new_relic/agent/span_event_primitive.rb +108 -54
- data/lib/new_relic/agent/sql_sampler.rb +10 -10
- data/lib/new_relic/agent/stats.rb +1 -1
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +2 -2
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
- data/lib/new_relic/agent/stats_engine.rb +3 -3
- data/lib/new_relic/agent/supported_versions.rb +3 -3
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/system_info.rb +18 -4
- data/lib/new_relic/agent/threading/agent_thread.rb +2 -2
- data/lib/new_relic/agent/threading/backtrace_node.rb +1 -1
- data/lib/new_relic/agent/threading/backtrace_service.rb +4 -4
- data/lib/new_relic/agent/threading/thread_profile.rb +10 -24
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +509 -0
- data/lib/new_relic/agent/transaction/abstract_segment.rb +33 -6
- data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +177 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +59 -149
- data/lib/new_relic/agent/transaction/external_request_segment.rb +32 -39
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +5 -12
- data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
- data/lib/new_relic/agent/transaction/segment.rb +28 -2
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/trace.rb +6 -13
- data/lib/new_relic/agent/transaction/trace_builder.rb +1 -2
- data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
- data/lib/new_relic/agent/transaction/trace_node.rb +11 -9
- data/lib/new_relic/agent/transaction/tracing.rb +1 -100
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction.rb +140 -170
- data/lib/new_relic/agent/transaction_error_primitive.rb +11 -16
- data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/transaction_event_primitive.rb +29 -40
- data/lib/new_relic/agent/transaction_event_recorder.rb +4 -4
- data/lib/new_relic/agent/transaction_metrics.rb +1 -1
- data/lib/new_relic/agent/transaction_sampler.rb +2 -6
- data/lib/new_relic/agent/transaction_time_aggregator.rb +20 -6
- data/lib/new_relic/agent/utilization/aws.rb +1 -1
- data/lib/new_relic/agent/utilization/azure.rb +1 -1
- data/lib/new_relic/agent/utilization/gcp.rb +1 -1
- data/lib/new_relic/agent/utilization/pcf.rb +1 -1
- data/lib/new_relic/agent/utilization/vendor.rb +1 -1
- data/lib/new_relic/agent/utilization_data.rb +37 -2
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
- data/lib/new_relic/agent/vm/mri_vm.rb +7 -5
- data/lib/new_relic/agent/vm/snapshot.rb +1 -1
- data/lib/new_relic/agent/vm.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +1 -1
- data/lib/new_relic/agent.rb +106 -18
- data/lib/new_relic/cli/command.rb +1 -1
- data/lib/new_relic/cli/commands/deployments.rb +2 -3
- data/lib/new_relic/cli/commands/install.rb +4 -3
- data/lib/new_relic/coerce.rb +32 -7
- data/lib/new_relic/collection_helper.rb +1 -1
- data/lib/new_relic/constants.rb +42 -0
- data/lib/new_relic/control/class_methods.rb +8 -2
- data/lib/new_relic/control/frameworks/external.rb +1 -1
- data/lib/new_relic/control/frameworks/merb.rb +1 -1
- data/lib/new_relic/control/frameworks/rails.rb +12 -10
- data/lib/new_relic/control/frameworks/rails3.rb +1 -1
- data/lib/new_relic/control/frameworks/rails4.rb +1 -1
- data/lib/new_relic/control/frameworks/{rails5.rb → rails_notifications.rb} +2 -2
- data/lib/new_relic/control/frameworks/ruby.rb +1 -1
- data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/instance_methods.rb +12 -2
- data/lib/new_relic/control/instrumentation.rb +1 -1
- data/lib/new_relic/control/server_methods.rb +1 -1
- data/lib/new_relic/control.rb +1 -1
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +124 -14
- data/lib/new_relic/environment_report.rb +2 -4
- data/lib/new_relic/helper.rb +1 -1
- data/lib/new_relic/language_support.rb +1 -1
- data/lib/new_relic/latest_changes.rb +2 -2
- data/lib/new_relic/local_environment.rb +1 -1
- data/lib/new_relic/metric_data.rb +1 -1
- data/lib/new_relic/metric_spec.rb +1 -1
- data/lib/new_relic/noticed_error.rb +35 -18
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +2 -2
- data/lib/new_relic/rack/browser_monitoring.rb +16 -9
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +1 -1
- data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +16 -1
- data/lib/new_relic/version.rb +3 -3
- data/lib/newrelic_rpm.rb +1 -1
- data/lib/sequel/extensions/newrelic_instrumentation.rb +1 -1
- data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -1
- data/lib/tasks/all.rb +1 -1
- data/lib/tasks/config.rake +1 -2
- data/lib/tasks/multiverse.rb +35 -1
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +6 -1
- data/newrelic_rpm.gemspec +22 -17
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +358 -78
- metadata +147 -66
- data/.travis.yml +0 -228
- data/cert/cacert.pem +0 -1177
- data/lib/new_relic/agent/commands/xray_session.rb +0 -55
- data/lib/new_relic/agent/commands/xray_session_collection.rb +0 -161
- data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -41
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/agent/instrumentation/active_record_4.rb +0 -42
- data/lib/new_relic/agent/instrumentation/active_record_5.rb +0 -41
- data/lib/new_relic/agent/instrumentation/evented_subscriber.rb +0 -104
- data/lib/new_relic/agent/instrumentation/http.rb +0 -46
- data/lib/new_relic/agent/instrumentation/net.rb +0 -50
- data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb +0 -32
- data/lib/new_relic/agent/instrumentation/rails5/action_view.rb +0 -27
- data/lib/new_relic/agent/transaction/attributes.rb +0 -154
- data/lib/new_relic/agent/transaction/xray_sample_buffer.rb +0 -64
- data/lib/new_relic/agent/transaction_state.rb +0 -186
- data/lib/new_relic/build.rb +0 -2
- data/lib/new_relic/metrics.rb +0 -13
- data/lib/tasks/versions.html.erb +0 -28
- data/lib/tasks/versions.postface.html +0 -8
- data/lib/tasks/versions.preface.html +0 -9
- data/lib/tasks/versions.rake +0 -65
- data/lib/tasks/versions.txt.erb +0 -14
@@ -1,6 +1,5 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
2
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
3
|
|
5
4
|
DependencyDetection.defer do
|
6
5
|
@name = :sidekiq
|
@@ -14,32 +13,48 @@ DependencyDetection.defer do
|
|
14
13
|
end
|
15
14
|
|
16
15
|
executes do
|
17
|
-
|
18
|
-
|
16
|
+
module NewRelic::SidekiqInstrumentation
|
17
|
+
class Server
|
18
|
+
include NewRelic::Agent::Instrumentation::ControllerInstrumentation
|
19
19
|
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
20
|
+
# Client middleware has additional parameters, and our tests use the
|
21
|
+
# middleware client-side to work inline.
|
22
|
+
def call(worker, msg, queue, *_)
|
23
|
+
trace_args = if worker.respond_to?(:newrelic_trace_args)
|
24
|
+
worker.newrelic_trace_args(msg, queue)
|
25
|
+
else
|
26
|
+
self.class.default_trace_args(msg)
|
27
|
+
end
|
28
|
+
trace_headers = msg.delete(NewRelic::NEWRELIC_KEY)
|
28
29
|
|
29
|
-
|
30
|
-
|
31
|
-
|
30
|
+
perform_action_with_newrelic_trace(trace_args) do
|
31
|
+
NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(msg['args'], :'job.sidekiq.args',
|
32
|
+
NewRelic::Agent::AttributeFilter::DST_NONE)
|
32
33
|
|
33
|
-
|
34
|
+
::NewRelic::Agent::DistributedTracing::accept_distributed_trace_headers(trace_headers, "Other") if ::NewRelic::Agent.config[:'distributed_tracing.enabled']
|
35
|
+
yield
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
def self.default_trace_args(msg)
|
40
|
+
{
|
41
|
+
:name => 'perform',
|
42
|
+
:class_name => msg['class'],
|
43
|
+
:category => 'OtherTransaction/SidekiqJob'
|
44
|
+
}
|
34
45
|
end
|
35
46
|
end
|
47
|
+
class Client
|
48
|
+
def call(_worker_class, job, *_)
|
49
|
+
job[NewRelic::NEWRELIC_KEY] ||= distributed_tracing_headers if ::NewRelic::Agent.config[:'distributed_tracing.enabled']
|
50
|
+
yield
|
51
|
+
end
|
36
52
|
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
}
|
53
|
+
def distributed_tracing_headers
|
54
|
+
headers = {}
|
55
|
+
::NewRelic::Agent::DistributedTracing.insert_distributed_trace_headers(headers)
|
56
|
+
headers
|
57
|
+
end
|
43
58
|
end
|
44
59
|
end
|
45
60
|
|
@@ -53,13 +68,22 @@ DependencyDetection.defer do
|
|
53
68
|
}
|
54
69
|
rescue => e
|
55
70
|
NewRelic::Agent.logger.error("Failure during deserializing YAML for Sidekiq::Extensions::DelayedClass", e)
|
56
|
-
NewRelic::SidekiqInstrumentation.default_trace_args(msg)
|
71
|
+
NewRelic::SidekiqInstrumentation::Server.default_trace_args(msg)
|
72
|
+
end
|
73
|
+
end
|
74
|
+
|
75
|
+
Sidekiq.configure_client do |config|
|
76
|
+
config.client_middleware do |chain|
|
77
|
+
chain.add NewRelic::SidekiqInstrumentation::Client
|
57
78
|
end
|
58
79
|
end
|
59
80
|
|
60
81
|
Sidekiq.configure_server do |config|
|
82
|
+
config.client_middleware do |chain|
|
83
|
+
chain.add NewRelic::SidekiqInstrumentation::Client
|
84
|
+
end
|
61
85
|
config.server_middleware do |chain|
|
62
|
-
chain.add NewRelic::SidekiqInstrumentation
|
86
|
+
chain.add NewRelic::SidekiqInstrumentation::Server
|
63
87
|
end
|
64
88
|
|
65
89
|
if config.respond_to?(:error_handlers)
|
@@ -0,0 +1,55 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module Sinatra
|
7
|
+
module Chain
|
8
|
+
def self.instrument!
|
9
|
+
::Sinatra::Base.class_eval do
|
10
|
+
include ::NewRelic::Agent::Instrumentation::Sinatra::Tracer
|
11
|
+
|
12
|
+
def dispatch_with_newrelic
|
13
|
+
dispatch_with_tracing { dispatch_without_newrelic }
|
14
|
+
end
|
15
|
+
alias dispatch_without_newrelic dispatch!
|
16
|
+
alias dispatch! dispatch_with_newrelic
|
17
|
+
|
18
|
+
def process_route_with_newrelic(*args, &block)
|
19
|
+
process_route_with_tracing(*args) do
|
20
|
+
process_route_without_newrelic(*args, &block)
|
21
|
+
end
|
22
|
+
end
|
23
|
+
alias process_route_without_newrelic process_route
|
24
|
+
alias process_route process_route_with_newrelic
|
25
|
+
|
26
|
+
def route_eval_with_newrelic(*args, &block)
|
27
|
+
route_eval_with_tracing(*args) do
|
28
|
+
route_eval_without_newrelic(*args, &block)
|
29
|
+
end
|
30
|
+
end
|
31
|
+
alias route_eval_without_newrelic route_eval
|
32
|
+
alias route_eval route_eval_with_newrelic
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
module Build
|
38
|
+
module Chain
|
39
|
+
def self.instrument!
|
40
|
+
::Sinatra::Base.class_eval do
|
41
|
+
class << self
|
42
|
+
def build_with_newrelic(*args, &block)
|
43
|
+
build_with_tracing(*args) do
|
44
|
+
build_without_newrelic(*args, &block)
|
45
|
+
end
|
46
|
+
end
|
47
|
+
alias build_without_newrelic build
|
48
|
+
alias build build_with_newrelic
|
49
|
+
end
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
@@ -1,50 +1,45 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
|
-
module NewRelic
|
6
|
-
module
|
7
|
-
module
|
8
|
-
module Sinatra
|
9
|
-
module Ignorer
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module Sinatra
|
7
|
+
module Ignorer
|
10
8
|
|
11
|
-
|
12
|
-
|
9
|
+
def self.should_ignore?(app, type)
|
10
|
+
return false if !app.settings.respond_to?(:newrelic_ignores)
|
13
11
|
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
def newrelic_ignore(*routes)
|
20
|
-
set_newrelic_ignore(:routes, *routes)
|
21
|
-
end
|
12
|
+
app.settings.newrelic_ignores[type].any? do |pattern|
|
13
|
+
pattern.match(app.request.path_info)
|
14
|
+
end
|
15
|
+
end
|
22
16
|
|
23
|
-
|
24
|
-
|
25
|
-
|
17
|
+
def newrelic_ignore(*routes)
|
18
|
+
set_newrelic_ignore(:routes, *routes)
|
19
|
+
end
|
26
20
|
|
27
|
-
|
28
|
-
|
29
|
-
|
21
|
+
def newrelic_ignore_apdex(*routes)
|
22
|
+
set_newrelic_ignore(:apdex, *routes)
|
23
|
+
end
|
30
24
|
|
31
|
-
|
25
|
+
def newrelic_ignore_enduser(*routes)
|
26
|
+
set_newrelic_ignore(:enduser, *routes)
|
27
|
+
end
|
32
28
|
|
33
|
-
|
34
|
-
# Important to default this in the context of the actual app
|
35
|
-
# If it's done at register time, ignores end up shared between apps.
|
36
|
-
set :newrelic_ignores, Hash.new([]) if !respond_to?(:newrelic_ignores)
|
29
|
+
private
|
37
30
|
|
38
|
-
|
39
|
-
|
31
|
+
def set_newrelic_ignore(type, *routes)
|
32
|
+
# Important to default this in the context of the actual app
|
33
|
+
# If it's done at register time, ignores end up shared between apps.
|
34
|
+
set :newrelic_ignores, Hash.new([]) if !respond_to?(:newrelic_ignores)
|
40
35
|
|
41
|
-
|
42
|
-
|
43
|
-
# exactly Sinatra's mapping of route text to regex
|
44
|
-
Array(send(:compile, r)).first
|
45
|
-
end
|
46
|
-
end
|
36
|
+
# If we call an ignore without a route, it applies to the whole app
|
37
|
+
routes = ["*"] if routes.empty?
|
47
38
|
|
39
|
+
settings.newrelic_ignores[type] += routes.map do |r|
|
40
|
+
# Ugly sending to private Base#compile, but we want to mimic
|
41
|
+
# exactly Sinatra's mapping of route text to regex
|
42
|
+
Array(send(:compile, r)).first
|
48
43
|
end
|
49
44
|
end
|
50
45
|
end
|
@@ -0,0 +1,118 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
# NewRelic instrumentation for Sinatra applications. Sinatra actions will
|
6
|
+
# appear in the UI similar to controller actions, and have breakdown charts
|
7
|
+
# and transaction traces.
|
8
|
+
#
|
9
|
+
# The actions in the UI will correspond to the pattern expression used
|
10
|
+
# to match them, not directly to full URL's.
|
11
|
+
module NewRelic::Agent::Instrumentation
|
12
|
+
module Sinatra
|
13
|
+
module Tracer
|
14
|
+
include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
|
15
|
+
|
16
|
+
def self.included(clazz)
|
17
|
+
clazz.extend(self)
|
18
|
+
end
|
19
|
+
|
20
|
+
# Expected method for supporting ControllerInstrumentation
|
21
|
+
def newrelic_request_headers(_)
|
22
|
+
request.env
|
23
|
+
end
|
24
|
+
|
25
|
+
def newrelic_middlewares
|
26
|
+
middlewares = [NewRelic::Rack::BrowserMonitoring]
|
27
|
+
if NewRelic::Rack::AgentHooks.needed?
|
28
|
+
middlewares << NewRelic::Rack::AgentHooks
|
29
|
+
end
|
30
|
+
middlewares
|
31
|
+
end
|
32
|
+
|
33
|
+
def build_with_tracing(*args, &block)
|
34
|
+
unless NewRelic::Agent.config[:disable_sinatra_auto_middleware]
|
35
|
+
newrelic_middlewares.each do |middleware_class|
|
36
|
+
try_to_use(self, middleware_class)
|
37
|
+
end
|
38
|
+
end
|
39
|
+
yield
|
40
|
+
end
|
41
|
+
|
42
|
+
def try_to_use(app, clazz)
|
43
|
+
has_middleware = app.middleware.any? { |info| info[0] == clazz }
|
44
|
+
app.use(clazz) unless has_middleware
|
45
|
+
end
|
46
|
+
|
47
|
+
# Capture last route we've seen. Will set for transaction on route_eval
|
48
|
+
def process_route_with_tracing(*args)
|
49
|
+
begin
|
50
|
+
env["newrelic.last_route"] = args[0]
|
51
|
+
rescue => e
|
52
|
+
::NewRelic::Agent.logger.debug("Failed determining last route in Sinatra", e)
|
53
|
+
end
|
54
|
+
yield
|
55
|
+
end
|
56
|
+
|
57
|
+
# If a transaction name is already set, this call will tromple over it.
|
58
|
+
# This is intentional, as typically passing to a separate route is like
|
59
|
+
# an entirely separate transaction, so we pick up the new name.
|
60
|
+
#
|
61
|
+
# If we're ignored, this remains safe, since set_transaction_name
|
62
|
+
# care for the gating on the transaction's existence for us.
|
63
|
+
def route_eval_with_tracing(*args)
|
64
|
+
begin
|
65
|
+
if txn_name = TransactionNamer.transaction_name_for_route(env, request)
|
66
|
+
::NewRelic::Agent::Transaction.set_default_transaction_name(
|
67
|
+
"#{self.class.name}/#{txn_name}", :sinatra)
|
68
|
+
end
|
69
|
+
rescue => e
|
70
|
+
::NewRelic::Agent.logger.debug("Failed during route_eval to set transaction name", e)
|
71
|
+
end
|
72
|
+
yield
|
73
|
+
end
|
74
|
+
|
75
|
+
def get_request_params
|
76
|
+
begin
|
77
|
+
@request.params
|
78
|
+
rescue => e
|
79
|
+
NewRelic::Agent.logger.debug("Failed to get params from Rack request.", e)
|
80
|
+
nil
|
81
|
+
end
|
82
|
+
end
|
83
|
+
|
84
|
+
def dispatch_with_tracing
|
85
|
+
request_params = get_request_params
|
86
|
+
filtered_params = ::NewRelic::Agent::ParameterFiltering::apply_filters(request.env, request_params || {})
|
87
|
+
|
88
|
+
name = TransactionNamer.initial_transaction_name(request)
|
89
|
+
perform_action_with_newrelic_trace(:category => :sinatra,
|
90
|
+
:name => name,
|
91
|
+
:params => filtered_params) do
|
92
|
+
begin
|
93
|
+
yield
|
94
|
+
ensure
|
95
|
+
# Will only see an error raised if :show_exceptions is true, but
|
96
|
+
# will always see them in the env hash if they occur
|
97
|
+
had_error = env.has_key?('sinatra.error')
|
98
|
+
::NewRelic::Agent.notice_error(env['sinatra.error']) if had_error
|
99
|
+
end
|
100
|
+
end
|
101
|
+
end
|
102
|
+
|
103
|
+
def do_not_trace?
|
104
|
+
Ignorer.should_ignore?(self, :routes)
|
105
|
+
end
|
106
|
+
|
107
|
+
# Overrides ControllerInstrumentation implementation
|
108
|
+
def ignore_apdex?
|
109
|
+
Ignorer.should_ignore?(self, :apdex)
|
110
|
+
end
|
111
|
+
|
112
|
+
# Overrides ControllerInstrumentation implementation
|
113
|
+
def ignore_enduser?
|
114
|
+
Ignorer.should_ignore?(self, :enduser)
|
115
|
+
end
|
116
|
+
end
|
117
|
+
end
|
118
|
+
end
|
@@ -0,0 +1,33 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module Sinatra
|
7
|
+
module Prepend
|
8
|
+
include ::NewRelic::Agent::Instrumentation::Sinatra::Tracer
|
9
|
+
|
10
|
+
def dispatch!
|
11
|
+
dispatch_with_tracing { super }
|
12
|
+
end
|
13
|
+
|
14
|
+
def process_route(*args, &block)
|
15
|
+
process_route_with_tracing(*args) { super }
|
16
|
+
end
|
17
|
+
|
18
|
+
def route_eval(*args, &block)
|
19
|
+
route_eval_with_tracing(*args) { super }
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
module Build
|
24
|
+
module Prepend
|
25
|
+
include ::NewRelic::Agent::Instrumentation::Sinatra::Tracer
|
26
|
+
|
27
|
+
def build(*args, &block)
|
28
|
+
build_with_tracing(*args) { super }
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -1,46 +1,34 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
5
|
+
require_relative 'sinatra/transaction_namer'
|
6
|
+
require_relative 'sinatra/ignorer'
|
7
|
+
require_relative 'sinatra/instrumentation'
|
8
|
+
require_relative 'sinatra/chain'
|
9
|
+
require_relative 'sinatra/prepend'
|
9
10
|
|
10
11
|
DependencyDetection.defer do
|
11
|
-
|
12
|
+
named :sinatra
|
12
13
|
|
13
|
-
depends_on
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
Sinatra::Base.private_method_defined?(:process_route) &&
|
18
|
-
Sinatra::Base.private_method_defined?(:route_eval)
|
19
|
-
end
|
14
|
+
depends_on { defined?(::Sinatra) && defined?(::Sinatra::Base) }
|
15
|
+
depends_on { Sinatra::Base.private_method_defined?(:dispatch!) }
|
16
|
+
depends_on { Sinatra::Base.private_method_defined?(:process_route) }
|
17
|
+
depends_on { Sinatra::Base.private_method_defined?(:route_eval) }
|
20
18
|
|
21
19
|
executes do
|
22
20
|
::NewRelic::Agent.logger.info 'Installing Sinatra instrumentation'
|
23
21
|
end
|
24
22
|
|
25
23
|
executes do
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
alias dispatch! dispatch_with_newrelic
|
31
|
-
|
32
|
-
alias process_route_without_newrelic process_route
|
33
|
-
alias process_route process_route_with_newrelic
|
34
|
-
|
35
|
-
alias route_eval_without_newrelic route_eval
|
36
|
-
alias route_eval route_eval_with_newrelic
|
37
|
-
|
38
|
-
register NewRelic::Agent::Instrumentation::Sinatra::Ignorer
|
24
|
+
if use_prepend?
|
25
|
+
prepend_instrument ::Sinatra::Base, NewRelic::Agent::Instrumentation::Sinatra::Prepend
|
26
|
+
else
|
27
|
+
chain_instrument NewRelic::Agent::Instrumentation::Sinatra::Chain
|
39
28
|
end
|
40
29
|
|
41
|
-
|
42
|
-
|
43
|
-
end
|
30
|
+
::Sinatra::Base.class_eval { register ::NewRelic::Agent::Instrumentation::Sinatra::Ignorer }
|
31
|
+
::Sinatra.module_eval { register NewRelic::Agent::Instrumentation::Sinatra::Ignorer }
|
44
32
|
end
|
45
33
|
|
46
34
|
executes do
|
@@ -49,140 +37,13 @@ DependencyDetection.defer do
|
|
49
37
|
# we can't be sure that rack is available when this file is first required.
|
50
38
|
require 'new_relic/rack/agent_hooks'
|
51
39
|
require 'new_relic/rack/browser_monitoring'
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
alias build build_with_newrelic
|
57
|
-
end
|
40
|
+
if use_prepend?
|
41
|
+
prepend_instrument ::Sinatra::Base.singleton_class, NewRelic::Agent::Instrumentation::Sinatra::Build::Prepend
|
42
|
+
else
|
43
|
+
chain_instrument NewRelic::Agent::Instrumentation::Sinatra::Build::Chain
|
58
44
|
end
|
59
45
|
else
|
60
46
|
::NewRelic::Agent.logger.info("Skipping auto-injection of middleware for Sinatra - requires Sinatra 1.2.1+")
|
61
47
|
end
|
62
48
|
end
|
63
49
|
end
|
64
|
-
|
65
|
-
module NewRelic
|
66
|
-
module Agent
|
67
|
-
module Instrumentation
|
68
|
-
# NewRelic instrumentation for Sinatra applications. Sinatra actions will
|
69
|
-
# appear in the UI similar to controller actions, and have breakdown charts
|
70
|
-
# and transaction traces.
|
71
|
-
#
|
72
|
-
# The actions in the UI will correspond to the pattern expression used
|
73
|
-
# to match them, not directly to full URL's.
|
74
|
-
module Sinatra
|
75
|
-
include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
|
76
|
-
|
77
|
-
# Expected method for supporting ControllerInstrumentation
|
78
|
-
def newrelic_request_headers(_)
|
79
|
-
request.env
|
80
|
-
end
|
81
|
-
|
82
|
-
def self.included(clazz)
|
83
|
-
clazz.extend(ClassMethods)
|
84
|
-
end
|
85
|
-
|
86
|
-
module ClassMethods
|
87
|
-
def newrelic_middlewares
|
88
|
-
middlewares = [NewRelic::Rack::BrowserMonitoring]
|
89
|
-
if NewRelic::Rack::AgentHooks.needed?
|
90
|
-
middlewares << NewRelic::Rack::AgentHooks
|
91
|
-
end
|
92
|
-
middlewares
|
93
|
-
end
|
94
|
-
|
95
|
-
def build_with_newrelic(*args, &block)
|
96
|
-
unless NewRelic::Agent.config[:disable_sinatra_auto_middleware]
|
97
|
-
newrelic_middlewares.each do |middleware_class|
|
98
|
-
try_to_use(self, middleware_class)
|
99
|
-
end
|
100
|
-
end
|
101
|
-
build_without_newrelic(*args, &block)
|
102
|
-
end
|
103
|
-
|
104
|
-
def try_to_use(app, clazz)
|
105
|
-
has_middleware = app.middleware.any? { |info| info[0] == clazz }
|
106
|
-
app.use(clazz) unless has_middleware
|
107
|
-
end
|
108
|
-
end
|
109
|
-
|
110
|
-
# Capture last route we've seen. Will set for transaction on route_eval
|
111
|
-
def process_route_with_newrelic(*args, &block)
|
112
|
-
begin
|
113
|
-
env["newrelic.last_route"] = args[0]
|
114
|
-
rescue => e
|
115
|
-
::NewRelic::Agent.logger.debug("Failed determining last route in Sinatra", e)
|
116
|
-
end
|
117
|
-
|
118
|
-
process_route_without_newrelic(*args, &block)
|
119
|
-
end
|
120
|
-
|
121
|
-
# If a transaction name is already set, this call will tromple over it.
|
122
|
-
# This is intentional, as typically passing to a separate route is like
|
123
|
-
# an entirely separate transaction, so we pick up the new name.
|
124
|
-
#
|
125
|
-
# If we're ignored, this remains safe, since set_transaction_name
|
126
|
-
# care for the gating on the transaction's existence for us.
|
127
|
-
def route_eval_with_newrelic(*args, &block)
|
128
|
-
begin
|
129
|
-
txn_name = TransactionNamer.transaction_name_for_route(env, request)
|
130
|
-
unless txn_name.nil?
|
131
|
-
::NewRelic::Agent::Transaction.set_default_transaction_name(
|
132
|
-
"#{self.class.name}/#{txn_name}", :sinatra)
|
133
|
-
end
|
134
|
-
rescue => e
|
135
|
-
::NewRelic::Agent.logger.debug("Failed during route_eval to set transaction name", e)
|
136
|
-
end
|
137
|
-
|
138
|
-
route_eval_without_newrelic(*args, &block)
|
139
|
-
end
|
140
|
-
|
141
|
-
def dispatch_with_newrelic #THREAD_LOCAL_ACCESS
|
142
|
-
request_params = get_request_params
|
143
|
-
filtered_params = ParameterFiltering::apply_filters(request.env, request_params || {})
|
144
|
-
|
145
|
-
name = TransactionNamer.initial_transaction_name(request)
|
146
|
-
perform_action_with_newrelic_trace(:category => :sinatra,
|
147
|
-
:name => name,
|
148
|
-
:params => filtered_params) do
|
149
|
-
dispatch_and_notice_errors_with_newrelic
|
150
|
-
end
|
151
|
-
end
|
152
|
-
|
153
|
-
def get_request_params
|
154
|
-
begin
|
155
|
-
@request.params
|
156
|
-
rescue => e
|
157
|
-
NewRelic::Agent.logger.debug("Failed to get params from Rack request.", e)
|
158
|
-
nil
|
159
|
-
end
|
160
|
-
end
|
161
|
-
|
162
|
-
def dispatch_and_notice_errors_with_newrelic
|
163
|
-
dispatch_without_newrelic
|
164
|
-
ensure
|
165
|
-
# Will only see an error raised if :show_exceptions is true, but
|
166
|
-
# will always see them in the env hash if they occur
|
167
|
-
had_error = env.has_key?('sinatra.error')
|
168
|
-
::NewRelic::Agent.notice_error(env['sinatra.error']) if had_error
|
169
|
-
end
|
170
|
-
|
171
|
-
def do_not_trace?
|
172
|
-
Ignorer.should_ignore?(self, :routes)
|
173
|
-
end
|
174
|
-
|
175
|
-
# Overrides ControllerInstrumentation implementation
|
176
|
-
def ignore_apdex?
|
177
|
-
Ignorer.should_ignore?(self, :apdex)
|
178
|
-
end
|
179
|
-
|
180
|
-
# Overrides ControllerInstrumentation implementation
|
181
|
-
def ignore_enduser?
|
182
|
-
Ignorer.should_ignore?(self, :enduser)
|
183
|
-
end
|
184
|
-
|
185
|
-
end
|
186
|
-
end
|
187
|
-
end
|
188
|
-
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
DependencyDetection.defer do
|
6
6
|
@name = :sunspot
|
@@ -0,0 +1,22 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
module NewRelic::Agent::Instrumentation
|
6
|
+
module Typhoeus
|
7
|
+
module Chain
|
8
|
+
def self.instrument!
|
9
|
+
::Typhoeus::Hydra.class_eval do
|
10
|
+
include NewRelic::Agent::Instrumentation::Typhoeus
|
11
|
+
|
12
|
+
def run_with_newrelic(*args)
|
13
|
+
with_tracing { run_without_newrelic(*args) }
|
14
|
+
end
|
15
|
+
|
16
|
+
alias run_without_newrelic run
|
17
|
+
alias run run_with_newrelic
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|