newrelic_rpm 5.5.0.348 → 7.2.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 +931 -0
- data/CONTRIBUTING.md +117 -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/config.dot +1 -0
- data/init.rb +1 -1
- data/install.rb +1 -1
- data/lib/new_relic/agent.rb +111 -20
- data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
- data/lib/new_relic/agent/agent.rb +182 -194
- data/lib/new_relic/agent/agent_logger.rb +5 -1
- data/lib/new_relic/agent/attribute_filter.rb +85 -25
- 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.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +656 -188
- 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 +17 -13
- 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 +15 -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/connect/request_builder.rb +63 -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.rb +2 -3
- 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_adapter.rb +33 -0
- data/lib/new_relic/agent/datastores.rb +7 -9
- data/lib/new_relic/agent/datastores/metric_helper.rb +2 -3
- data/lib/new_relic/agent/datastores/mongo.rb +2 -2
- 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/redis.rb +1 -5
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing.rb +115 -32
- 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/encoding_normalizer.rb +1 -1
- data/lib/new_relic/agent/error_collector.rb +88 -58
- data/lib/new_relic/agent/error_event_aggregator.rb +10 -7
- data/lib/new_relic/agent/error_filter.rb +167 -0
- 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.rb +1 -1
- 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 -51
- data/lib/new_relic/agent/instrumentation/active_storage.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +63 -0
- 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.rb +13 -132
- 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/controller_instrumentation.rb +11 -4
- data/lib/new_relic/agent/instrumentation/curb.rb +11 -183
- 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/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.rb +4 -3
- 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/grape.rb +14 -107
- 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/httpclient.rb +10 -30
- 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/httprb.rb +29 -0
- 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/ignore_actions.rb +1 -1
- data/lib/new_relic/agent/instrumentation/memcache.rb +55 -68
- 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/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.rb +44 -0
- 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/notifications_subscriber.rb +100 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +19 -52
- 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/passenger_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rack.rb +30 -138
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +58 -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 +37 -0
- 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.rb +14 -155
- 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/redis.rb +13 -102
- 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/resque.rb +22 -30
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +35 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +16 -0
- data/lib/new_relic/agent/instrumentation/sequel.rb +2 -2
- 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.rb +21 -160
- 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 +124 -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/sunspot.rb +1 -1
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +12 -74
- 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/internal_agent_error.rb +1 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +15 -10
- 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.rb +27 -0
- 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/new_relic_service.rb +106 -40
- 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/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.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/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 +129 -65
- data/lib/new_relic/agent/sql_sampler.rb +12 -12
- data/lib/new_relic/agent/stats.rb +1 -1
- data/lib/new_relic/agent/stats_engine.rb +3 -3
- 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/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.rb +143 -171
- data/lib/new_relic/agent/transaction/abstract_segment.rb +33 -6
- data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -3
- 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 +12 -8
- 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_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 +50 -26
- 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.rb +1 -1
- 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/worker_loop.rb +1 -1
- 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.rb +1 -1
- data/lib/new_relic/control/class_methods.rb +8 -2
- data/lib/new_relic/control/frameworks.rb +1 -1
- 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/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/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 +4 -4
- 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 +38 -21
- data/lib/new_relic/rack.rb +1 -1
- 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/recipes.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/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.html.erb +14 -25
- data/lib/tasks/config.rake +9 -9
- 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 +151 -66
- data/.travis.yml +0 -201
- 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,16 +1,14 @@
|
|
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
|
+
# frozen_string_literal: true
|
4
5
|
|
5
|
-
|
6
|
+
require_relative 'abstract'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
9
10
|
module HTTPClients
|
10
|
-
class TyphoeusHTTPResponse
|
11
|
-
def initialize(response)
|
12
|
-
@response = response
|
13
|
-
end
|
11
|
+
class TyphoeusHTTPResponse < AbstractResponse
|
14
12
|
|
15
13
|
def [](key)
|
16
14
|
unless headers.nil?
|
@@ -33,7 +31,7 @@ module NewRelic
|
|
33
31
|
private
|
34
32
|
|
35
33
|
def headers
|
36
|
-
@
|
34
|
+
@wrapped_response.headers
|
37
35
|
end
|
38
36
|
end
|
39
37
|
|
@@ -1,7 +1,8 @@
|
|
1
1
|
# -*- ruby -*-
|
2
2
|
# encoding: utf-8
|
3
3
|
# This file is distributed under New Relic's license terms.
|
4
|
-
# See https://github.com/newrelic/
|
4
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
5
|
+
# frozen_string_literal: true
|
5
6
|
|
6
7
|
# This module includes utilities for manipulating URIs, particularly from the
|
7
8
|
# context of Net::HTTP requests. We don't always have direct access to the full
|
@@ -14,20 +15,20 @@ module NewRelic
|
|
14
15
|
module HTTPClients
|
15
16
|
module URIUtil
|
16
17
|
|
17
|
-
def self.
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
18
|
+
def self.obfuscated_uri(url)
|
19
|
+
parse_and_normalize_url(url).tap do |obfuscated|
|
20
|
+
obfuscated.user = nil
|
21
|
+
obfuscated.password = nil
|
22
|
+
obfuscated.query = nil
|
23
|
+
obfuscated.fragment = nil
|
24
|
+
end
|
24
25
|
end
|
25
26
|
|
26
27
|
# There are valid URI strings that some HTTP client libraries will
|
27
28
|
# accept that the stdlib URI module doesn't handle. If we find that
|
28
29
|
# Addressable is around, use that to normalize out our URL's.
|
29
30
|
def self.parse_and_normalize_url(url)
|
30
|
-
uri = url
|
31
|
+
uri = url.dup
|
31
32
|
unless ::URI === uri
|
32
33
|
if defined?(::Addressable::URI)
|
33
34
|
address = ::Addressable::URI.parse(url)
|
@@ -41,10 +42,10 @@ module NewRelic
|
|
41
42
|
uri
|
42
43
|
end
|
43
44
|
|
44
|
-
QUESTION_MARK = "?"
|
45
|
+
QUESTION_MARK = "?"
|
45
46
|
|
46
47
|
def self.strip_query_string(fragment)
|
47
|
-
if
|
48
|
+
if fragment.include? QUESTION_MARK
|
48
49
|
fragment.split(QUESTION_MARK).first
|
49
50
|
else
|
50
51
|
fragment
|
@@ -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
|
require 'new_relic/agent'
|
6
6
|
module NewRelic
|
@@ -1,75 +1,58 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
4
|
-
require 'new_relic/agent/instrumentation/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
require 'new_relic/agent/instrumentation/notifications_subscriber'
|
5
5
|
|
6
6
|
module NewRelic
|
7
7
|
module Agent
|
8
8
|
module Instrumentation
|
9
|
-
class ActionCableSubscriber <
|
9
|
+
class ActionCableSubscriber < NotificationsSubscriber
|
10
10
|
|
11
11
|
PERFORM_ACTION = 'perform_action.action_cable'.freeze
|
12
12
|
|
13
|
-
def start
|
13
|
+
def start(name, id, payload) #THREAD_LOCAL_ACCESS
|
14
14
|
return unless state.is_execution_traced?
|
15
|
-
|
16
|
-
if
|
17
|
-
|
15
|
+
|
16
|
+
finishable = if name == PERFORM_ACTION
|
17
|
+
Tracer.start_transaction_or_segment(
|
18
|
+
name: transaction_name_from_payload(payload),
|
19
|
+
category: :action_cable
|
20
|
+
)
|
18
21
|
else
|
19
|
-
|
22
|
+
Tracer.start_segment(name: metric_name_from_payload(name, payload))
|
20
23
|
end
|
24
|
+
push_segment(id, finishable)
|
21
25
|
rescue => e
|
22
26
|
log_notification_error e, name, 'start'
|
23
27
|
end
|
24
28
|
|
25
|
-
def finish
|
29
|
+
def finish(name, id, payload) #THREAD_LOCAL_ACCESS
|
26
30
|
return unless state.is_execution_traced?
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
finish_transaction
|
31
|
-
else
|
32
|
-
stop_recording_metrics event
|
31
|
+
|
32
|
+
if exception = exception_object(payload)
|
33
|
+
NewRelic::Agent.notice_error exception
|
33
34
|
end
|
35
|
+
|
36
|
+
finishable = pop_segment(id)
|
37
|
+
finishable.finish if finishable
|
34
38
|
rescue => e
|
35
39
|
log_notification_error e, name, 'finish'
|
36
40
|
end
|
37
41
|
|
38
42
|
private
|
39
43
|
|
40
|
-
def
|
41
|
-
|
42
|
-
end
|
43
|
-
|
44
|
-
def finish_transaction
|
45
|
-
Transaction.stop(state)
|
46
|
-
end
|
47
|
-
|
48
|
-
def start_recording_metrics event
|
49
|
-
event.payload[:segment] = Transaction.start_segment name: metric_name_from_event(event)
|
50
|
-
end
|
51
|
-
|
52
|
-
def stop_recording_metrics event
|
53
|
-
event.payload[:segment].finish if event.payload[:segment]
|
44
|
+
def transaction_name_from_payload(payload)
|
45
|
+
"Controller/ActionCable/#{payload[:channel_class]}/#{payload[:action]}"
|
54
46
|
end
|
55
47
|
|
56
|
-
def
|
57
|
-
"
|
48
|
+
def metric_name_from_payload(name, payload)
|
49
|
+
"Ruby/ActionCable/#{payload[:channel_class]}/#{action_name(name)}"
|
58
50
|
end
|
59
51
|
|
60
|
-
|
61
|
-
"Ruby/ActionCable/#{event.payload[:channel_class]}/#{action_name_from_event(event)}"
|
62
|
-
end
|
63
|
-
|
64
|
-
DOT_ACTION_CABLE = ".action_cable".freeze
|
65
|
-
EMPTY_STRING = "".freeze
|
66
|
-
|
67
|
-
def action_name_from_event event
|
68
|
-
event.name.gsub DOT_ACTION_CABLE, EMPTY_STRING
|
69
|
-
end
|
52
|
+
DOT_ACTION_CABLE = '.action_cable'.freeze
|
70
53
|
|
71
|
-
def
|
72
|
-
NewRelic::
|
54
|
+
def action_name(name)
|
55
|
+
name.gsub DOT_ACTION_CABLE, NewRelic::EMPTY_STR
|
73
56
|
end
|
74
57
|
end
|
75
58
|
end
|
@@ -1,24 +1,24 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
4
|
-
require 'new_relic/agent/instrumentation/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
require 'new_relic/agent/instrumentation/notifications_subscriber'
|
5
5
|
require 'new_relic/agent/instrumentation/ignore_actions'
|
6
6
|
require 'new_relic/agent/parameter_filtering'
|
7
7
|
|
8
8
|
module NewRelic
|
9
9
|
module Agent
|
10
10
|
module Instrumentation
|
11
|
-
class ActionControllerSubscriber <
|
11
|
+
class ActionControllerSubscriber < NotificationsSubscriber
|
12
12
|
|
13
13
|
def start(name, id, payload) #THREAD_LOCAL_ACCESS
|
14
14
|
# @req is a historically stable but not guaranteed Rails header property
|
15
15
|
request = payload[:headers].instance_variable_get(:@req)
|
16
16
|
|
17
|
-
|
18
|
-
push_event(event)
|
17
|
+
controller_class = controller_class(payload)
|
19
18
|
|
20
|
-
if state.is_execution_traced? && !
|
21
|
-
|
19
|
+
if state.is_execution_traced? && !should_ignore(payload, controller_class)
|
20
|
+
finishable = start_transaction_or_segment(payload, request, controller_class)
|
21
|
+
push_segment(id, finishable)
|
22
22
|
else
|
23
23
|
# if this transaction is ignored, make sure child
|
24
24
|
# transaction are also ignored
|
@@ -30,11 +30,16 @@ module NewRelic
|
|
30
30
|
end
|
31
31
|
|
32
32
|
def finish(name, id, payload) #THREAD_LOCAL_ACCESS
|
33
|
-
|
34
|
-
event.payload.merge!(payload)
|
33
|
+
finishable = pop_segment(id)
|
35
34
|
|
36
|
-
if state.is_execution_traced?
|
37
|
-
|
35
|
+
if state.is_execution_traced? \
|
36
|
+
&& !should_ignore(payload, controller_class(payload))
|
37
|
+
|
38
|
+
if exception = exception_object(payload)
|
39
|
+
finishable.notice_error(exception)
|
40
|
+
end
|
41
|
+
|
42
|
+
finishable.finish
|
38
43
|
else
|
39
44
|
Agent.instance.pop_trace_execution_flag
|
40
45
|
end
|
@@ -42,77 +47,52 @@ module NewRelic
|
|
42
47
|
log_notification_error(e, name, 'finish')
|
43
48
|
end
|
44
49
|
|
45
|
-
def
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
attr_reader :queue_start, :request
|
69
|
-
|
70
|
-
def initialize(name, start, ending, transaction_id, payload, request)
|
71
|
-
# We have a different initialize parameter list, so be explicit
|
72
|
-
super(name, start, ending, transaction_id, payload)
|
73
|
-
|
74
|
-
@request = request
|
75
|
-
@controller_class = payload[:controller].split('::') \
|
76
|
-
.inject(Object){|m,o| m.const_get(o)}
|
77
|
-
|
78
|
-
if request && request.respond_to?(:env)
|
79
|
-
@queue_start = QueueTime.parse_frontend_timestamp(request.env, self.time)
|
80
|
-
end
|
81
|
-
end
|
82
|
-
|
83
|
-
def metric_name
|
84
|
-
@metric_name || "Controller/#{metric_path}/#{metric_action}"
|
85
|
-
end
|
86
|
-
|
87
|
-
def metric_path
|
88
|
-
@controller_class.controller_path
|
50
|
+
def start_transaction_or_segment(payload, request, controller_class)
|
51
|
+
Tracer.start_transaction_or_segment(
|
52
|
+
name: format_metric_name(payload[:action], controller_class),
|
53
|
+
category: :controller,
|
54
|
+
options: {
|
55
|
+
request: request,
|
56
|
+
filtered_params: NewRelic::Agent::ParameterFiltering.filter_using_rails(
|
57
|
+
payload[:params],
|
58
|
+
Rails.application.config.filter_parameters
|
59
|
+
),
|
60
|
+
apdex_start_time: queue_start(request),
|
61
|
+
ignore_apdex: NewRelic::Agent::Instrumentation::IgnoreActions.is_filtered?(
|
62
|
+
ControllerInstrumentation::NR_IGNORE_APDEX_KEY,
|
63
|
+
controller_class,
|
64
|
+
payload[:action]
|
65
|
+
),
|
66
|
+
ignore_enduser: NewRelic::Agent::Instrumentation::IgnoreActions.is_filtered?(
|
67
|
+
ControllerInstrumentation::NR_IGNORE_ENDUSER_KEY,
|
68
|
+
controller_class,
|
69
|
+
payload[:action]
|
70
|
+
)
|
71
|
+
}
|
72
|
+
)
|
89
73
|
end
|
90
74
|
|
91
|
-
def metric_action
|
92
|
-
|
75
|
+
def format_metric_name(metric_action, controller_name)
|
76
|
+
controller_class = ::NewRelic::LanguageSupport.constantize(controller_name)
|
77
|
+
"Controller/#{controller_class.controller_path}/#{metric_action}"
|
93
78
|
end
|
94
79
|
|
95
|
-
def
|
96
|
-
|
80
|
+
def controller_class(payload)
|
81
|
+
::NewRelic::LanguageSupport.constantize(payload[:controller])
|
97
82
|
end
|
98
83
|
|
99
|
-
def
|
100
|
-
_is_filtered?(ControllerInstrumentation::NR_IGNORE_APDEX_KEY)
|
101
|
-
end
|
102
|
-
|
103
|
-
def enduser_ignored?
|
104
|
-
_is_filtered?(ControllerInstrumentation::NR_IGNORE_ENDUSER_KEY)
|
105
|
-
end
|
106
|
-
|
107
|
-
def _is_filtered?(key)
|
84
|
+
def should_ignore(payload, controller_class)
|
108
85
|
NewRelic::Agent::Instrumentation::IgnoreActions.is_filtered?(
|
109
|
-
|
110
|
-
|
111
|
-
|
86
|
+
ControllerInstrumentation::NR_DO_NOT_TRACE_KEY,
|
87
|
+
controller_class,
|
88
|
+
payload[:action]
|
89
|
+
)
|
112
90
|
end
|
113
91
|
|
114
|
-
def
|
115
|
-
|
92
|
+
def queue_start(request)
|
93
|
+
if request && request.respond_to?(:env)
|
94
|
+
QueueTime.parse_frontend_timestamp(request.env, Time.now)
|
95
|
+
end
|
116
96
|
end
|
117
97
|
end
|
118
98
|
end
|
@@ -1,87 +1,112 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
4
|
-
require 'new_relic/agent/instrumentation/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
require 'new_relic/agent/instrumentation/notifications_subscriber'
|
5
5
|
|
6
6
|
# Listen for ActiveSupport::Notifications events for ActionView render
|
7
7
|
# events. Write metric data and transaction trace nodes for each event.
|
8
8
|
module NewRelic
|
9
9
|
module Agent
|
10
10
|
module Instrumentation
|
11
|
-
class ActionViewSubscriber <
|
11
|
+
class ActionViewSubscriber < NotificationsSubscriber
|
12
12
|
|
13
13
|
def start(name, id, payload) #THREAD_LOCAL_ACCESS
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
14
|
+
parent = segment_stack[id].last
|
15
|
+
metric_name = format_metric_name(name, payload, parent)
|
16
|
+
|
17
|
+
event = ActionViewEvent.new(metric_name, payload[:identifier])
|
18
|
+
if state.is_execution_traced? && recordable?(name, metric_name)
|
19
|
+
event.finishable = Tracer.start_segment(name: metric_name)
|
18
20
|
end
|
21
|
+
push_segment id, event
|
19
22
|
rescue => e
|
20
23
|
log_notification_error(e, name, 'start')
|
21
24
|
end
|
22
25
|
|
23
|
-
def finish(name, id, payload)
|
24
|
-
|
25
|
-
|
26
|
+
def finish(name, id, payload)
|
27
|
+
if segment = pop_segment(id)
|
28
|
+
if exception = exception_object(payload)
|
29
|
+
segment.notice_error exception
|
30
|
+
end
|
31
|
+
segment.finish
|
32
|
+
end
|
26
33
|
rescue => e
|
27
34
|
log_notification_error(e, name, 'finish')
|
28
35
|
end
|
29
36
|
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
# are the ones we want to record. There are a couple
|
40
|
-
# special cases of events without children.
|
41
|
-
def recordable?
|
42
|
-
name[0] == '!' ||
|
43
|
-
metric_name == 'View/text template/Rendering' ||
|
44
|
-
metric_name == "View/#{::NewRelic::Agent::UNKNOWN_METRIC}/Partial"
|
37
|
+
def format_metric_name(event_name, payload, parent)
|
38
|
+
return parent.name if parent \
|
39
|
+
&& (payload[:virtual_path] \
|
40
|
+
|| (parent.identifier =~ /template$/))
|
41
|
+
|
42
|
+
if payload.key?(:virtual_path)
|
43
|
+
identifier = payload[:virtual_path]
|
44
|
+
else
|
45
|
+
identifier = payload[:identifier]
|
45
46
|
end
|
46
47
|
|
47
|
-
|
48
|
-
|
49
|
-
(parent.payload[:identifier] =~ /template$/))
|
50
|
-
return parent.metric_name
|
51
|
-
elsif payload.key?(:virtual_path)
|
52
|
-
identifier = payload[:virtual_path]
|
53
|
-
else
|
54
|
-
identifier = payload[:identifier]
|
55
|
-
end
|
48
|
+
"View/#{metric_path(event_name, identifier)}/#{metric_action(event_name)}"
|
49
|
+
end
|
56
50
|
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
51
|
+
# Nearly every "render_blah.action_view" event has a child
|
52
|
+
# in the form of "!render_blah.action_view". The children
|
53
|
+
# are the ones we want to record. There are a couple
|
54
|
+
# special cases of events without children.
|
55
|
+
def recordable?(event_name, metric_name)
|
56
|
+
event_name[0] == '!' \
|
57
|
+
|| metric_name == 'View/text template/Rendering' \
|
58
|
+
|| metric_name == "View/#{::NewRelic::Agent::UNKNOWN_METRIC}/Partial"
|
59
|
+
end
|
61
60
|
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
else
|
72
|
-
::NewRelic::Agent::UNKNOWN_METRIC
|
73
|
-
end
|
61
|
+
RENDER_TEMPLATE_EVENT_NAME = 'render_template.action_view'.freeze
|
62
|
+
RENDER_PARTIAL_EVENT_NAME = 'render_partial.action_view'.freeze
|
63
|
+
RENDER_COLLECTION_EVENT_NAME = 'render_collection.action_view'.freeze
|
64
|
+
|
65
|
+
def metric_action(name)
|
66
|
+
case name
|
67
|
+
when /#{RENDER_TEMPLATE_EVENT_NAME}$/ then 'Rendering'
|
68
|
+
when RENDER_PARTIAL_EVENT_NAME then 'Partial'
|
69
|
+
when RENDER_COLLECTION_EVENT_NAME then 'Partial'
|
74
70
|
end
|
71
|
+
end
|
75
72
|
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
73
|
+
def metric_path(name, identifier)
|
74
|
+
# Rails 5 sets identifier to nil for empty collections,
|
75
|
+
# so do not mistake rendering a collection for rendering a file.
|
76
|
+
if identifier.nil? && name != RENDER_COLLECTION_EVENT_NAME
|
77
|
+
'file'
|
78
|
+
elsif identifier =~ /template$/
|
79
|
+
identifier
|
80
|
+
elsif identifier && (parts = identifier.split('/')).size > 1
|
81
|
+
parts[-2..-1].join('/')
|
82
|
+
else
|
83
|
+
::NewRelic::Agent::UNKNOWN_METRIC
|
82
84
|
end
|
83
85
|
end
|
84
86
|
end
|
87
|
+
|
88
|
+
# This class holds state information between calls to `start`
|
89
|
+
# and `finish` for ActiveSupport events that we do not want to track
|
90
|
+
# as a transaction or segment.
|
91
|
+
class ActionViewEvent
|
92
|
+
attr_reader :name, :identifier
|
93
|
+
attr_accessor :finishable
|
94
|
+
|
95
|
+
def initialize(name, identifier)
|
96
|
+
@name = name
|
97
|
+
@identifier = identifier
|
98
|
+
@finishable = nil
|
99
|
+
end
|
100
|
+
|
101
|
+
def finish
|
102
|
+
@finishable.finish if @finishable
|
103
|
+
end
|
104
|
+
|
105
|
+
def notice_error error
|
106
|
+
@finishable.notice_error error if @finishable
|
107
|
+
end
|
108
|
+
end
|
85
109
|
end
|
110
|
+
|
86
111
|
end
|
87
112
|
end
|