newrelic_rpm 4.8.0.341 → 6.13.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.github/ISSUE_TEMPLATE/bug_report.md +31 -0
- data/.github/ISSUE_TEMPLATE/config.yml +5 -0
- data/.github/ISSUE_TEMPLATE/feature_request.md +24 -0
- data/.github/actions/annotate/README.md +79 -0
- data/.github/actions/annotate/action.yml +6 -0
- data/.github/actions/annotate/dist/index.js +433 -0
- data/.github/actions/annotate/index.js +25 -0
- data/.github/actions/annotate/package-lock.json +172 -0
- data/.github/actions/annotate/package.json +30 -0
- data/.github/actions/annotate/pre-commit +5 -0
- data/.github/actions/build-ruby/README.md +79 -0
- data/.github/actions/build-ruby/action.yml +15 -0
- data/.github/actions/build-ruby/dist/index.js +52683 -0
- data/.github/actions/build-ruby/index.js +514 -0
- data/.github/actions/build-ruby/package-lock.json +581 -0
- data/.github/actions/build-ruby/package.json +32 -0
- data/.github/actions/build-ruby/pre-commit +5 -0
- data/.github/pull_request_template.md +16 -0
- data/.github/workflows/ci.yml +212 -0
- data/.github/workflows/pr_review_checklist.yml +22 -0
- data/.github/workflows/release.yml +78 -0
- data/.github/workflows/scripts/rubygems-authenticate.py +13 -0
- data/.github/workflows/scripts/rubygems-publish.rb +32 -0
- data/.github/workflows/snyk.yml +27 -0
- data/.github/workflows/stale.yml +21 -0
- data/.gitignore +9 -0
- data/.yardopts +4 -1
- data/CHANGELOG.md +868 -3
- data/CONTRIBUTING.md +106 -19
- data/Gemfile +6 -2
- data/Guardfile +18 -1
- data/LICENSE +208 -38
- data/README.md +81 -88
- data/ROADMAP.md +24 -0
- data/Rakefile +2 -0
- data/THIRD_PARTY_NOTICES.md +213 -0
- data/bin/nrdebug +1 -1
- data/config.dot +3 -12
- data/init.rb +1 -1
- data/install.rb +1 -1
- data/lib/new_relic/agent.rb +145 -31
- data/lib/new_relic/agent/adaptive_sampler.rb +104 -0
- data/lib/new_relic/agent/agent.rb +192 -190
- 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 +1 -1
- data/lib/new_relic/agent/autostart.rb +20 -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 +375 -67
- 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 -3
- data/lib/new_relic/agent/configuration/manager.rb +54 -43
- 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 +238 -0
- data/lib/new_relic/agent/configuration/server_source.rb +46 -5
- data/lib/new_relic/agent/configuration/yaml_source.rb +12 -7
- 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 +17 -6
- data/lib/new_relic/agent/database.rb +21 -3
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +12 -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/datastores.rb +12 -11
- 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 -1
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing.rb +216 -0
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +44 -0
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +248 -0
- 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_tracing/distributed_trace_payload.rb +165 -0
- 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 +51 -20
- data/lib/new_relic/agent/error_event_aggregator.rb +14 -7
- data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
- data/lib/new_relic/agent/event_aggregator.rb +34 -15
- 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 +31 -29
- 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 +140 -0
- 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 +56 -74
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +82 -56
- data/lib/new_relic/agent/instrumentation/active_job.rb +19 -17
- 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 +82 -24
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +168 -0
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +102 -31
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +47 -57
- 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 +24 -8
- data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
- data/lib/new_relic/agent/instrumentation/bunny.rb +115 -44
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +18 -12
- data/lib/new_relic/agent/instrumentation/curb.rb +121 -35
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +6 -4
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +61 -25
- data/lib/new_relic/agent/instrumentation/excon.rb +2 -2
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +8 -5
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +4 -3
- data/lib/new_relic/agent/instrumentation/grape.rb +46 -35
- data/lib/new_relic/agent/instrumentation/http.rb +8 -5
- data/lib/new_relic/agent/instrumentation/httpclient.rb +7 -5
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
- data/lib/new_relic/agent/instrumentation/memcache.rb +5 -3
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +10 -6
- 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 +13 -5
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +20 -11
- data/lib/new_relic/agent/instrumentation/mongo.rb +11 -5
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +39 -7
- data/lib/new_relic/agent/instrumentation/net.rb +60 -23
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +100 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +40 -16
- 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 +36 -13
- 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 +8 -5
- 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 +56 -22
- data/lib/new_relic/agent/instrumentation/redis.rb +141 -56
- data/lib/new_relic/agent/instrumentation/resque.rb +21 -37
- data/lib/new_relic/agent/instrumentation/sequel.rb +2 -3
- 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 +62 -23
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
- 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 +27 -10
- data/lib/new_relic/agent/internal_agent_error.rb +1 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +19 -16
- 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 -59
- data/lib/new_relic/agent/method_tracer.rb +42 -25
- 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 +174 -63
- 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 +61 -0
- 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 +5 -1
- data/lib/new_relic/agent/prepend_supportability.rb +1 -1
- data/lib/new_relic/agent/priority_sampled_buffer.rb +95 -0
- 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 +1 -1
- 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 +49 -0
- data/lib/new_relic/agent/span_event_primitive.rb +206 -0
- data/lib/new_relic/agent/sql_sampler.rb +23 -7
- data/lib/new_relic/agent/stats.rb +1 -1
- data/lib/new_relic/agent/stats_engine.rb +4 -4
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -1
- 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 +6 -13
- data/lib/new_relic/agent/system_info.rb +18 -8
- data/lib/new_relic/agent/threading/agent_thread.rb +6 -4
- 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 +19 -0
- data/lib/new_relic/agent/tracer.rb +509 -0
- data/lib/new_relic/agent/transaction.rb +191 -278
- data/lib/new_relic/agent/transaction/abstract_segment.rb +38 -5
- data/lib/new_relic/agent/transaction/datastore_segment.rb +30 -5
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +171 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +123 -71
- data/lib/new_relic/agent/transaction/external_request_segment.rb +41 -89
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +7 -8
- data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
- data/lib/new_relic/agent/transaction/segment.rb +42 -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 +7 -23
- 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 +2 -100
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction_error_primitive.rb +13 -22
- data/lib/new_relic/agent/transaction_event_aggregator.rb +7 -16
- data/lib/new_relic/agent/transaction_event_primitive.rb +31 -42
- data/lib/new_relic/agent/transaction_event_recorder.rb +8 -16
- data/lib/new_relic/agent/transaction_metrics.rb +1 -1
- data/lib/new_relic/agent/transaction_sampler.rb +3 -14
- data/lib/new_relic/agent/transaction_time_aggregator.rb +155 -0
- 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 +1 -1
- 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 -2
- 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 +38 -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 +1 -1
- 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 +30 -4
- 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 +5 -5
- data/lib/new_relic/environment_report.rb +6 -2
- 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 +39 -18
- 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 +6 -3
- data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +15 -1
- data/lib/new_relic/version.rb +4 -4
- data/lib/newrelic_rpm.rb +1 -1
- data/lib/sequel/extensions/newrelic_instrumentation.rb +3 -3
- data/lib/sequel/plugins/newrelic_instrumentation.rb +2 -2
- 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 +23 -17
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +357 -78
- metadata +154 -60
- data/.travis.yml +0 -173
- data/lib/new_relic/agent/busy_calculator.rb +0 -117
- 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 -140
- data/lib/new_relic/agent/cross_app_tracing.rb +0 -143
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -29
- data/lib/new_relic/agent/distributed_trace_payload.rb +0 -223
- data/lib/new_relic/agent/distributed_trace_priority_sampled_buffer.rb +0 -72
- 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 -36
- data/lib/new_relic/agent/instrumentation/evented_subscriber.rb +0 -104
- 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/sampled_buffer.rb +0 -68
- data/lib/new_relic/agent/sized_buffer.rb +0 -23
- data/lib/new_relic/agent/synthetics_event_buffer.rb +0 -40
- data/lib/new_relic/agent/throughput_monitor.rb +0 -59
- data/lib/new_relic/agent/transaction/attributes.rb +0 -153
- data/lib/new_relic/agent/transaction/xray_sample_buffer.rb +0 -64
- data/lib/new_relic/agent/transaction_state.rb +0 -145
- data/lib/new_relic/agent/transaction_timings.rb +0 -57
- 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,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
|
@@ -40,7 +40,7 @@ module NewRelic
|
|
40
40
|
def server_for_key key
|
41
41
|
server = server_for_key_without_newrelic_trace key
|
42
42
|
begin
|
43
|
-
if txn = ::NewRelic::Agent::
|
43
|
+
if txn = ::NewRelic::Agent::Tracer.current_transaction
|
44
44
|
segment = txn.current_segment
|
45
45
|
if ::NewRelic::Agent::Transaction::DatastoreSegment === segment
|
46
46
|
::NewRelic::Agent::Instrumentation::Memcache::Dalli.assign_instance_to(segment, server)
|
@@ -59,14 +59,16 @@ module NewRelic
|
|
59
59
|
alias_method :send_multiget_without_newrelic_trace, :send_multiget
|
60
60
|
|
61
61
|
def send_multiget(keys)
|
62
|
-
segment = ::NewRelic::Agent::
|
62
|
+
segment = ::NewRelic::Agent::Tracer.start_datastore_segment(
|
63
63
|
product: MEMCACHED,
|
64
64
|
operation: SEND_MULTIGET_METRIC_NAME
|
65
65
|
)
|
66
66
|
::NewRelic::Agent::Instrumentation::Memcache::Dalli.assign_instance_to(segment, self)
|
67
67
|
|
68
68
|
begin
|
69
|
-
|
69
|
+
NewRelic::Agent::Tracer.capture_segment_error segment do
|
70
|
+
send_multiget_without_newrelic_trace(keys)
|
71
|
+
end
|
70
72
|
ensure
|
71
73
|
if ::NewRelic::Agent.config[:capture_memcache_keys]
|
72
74
|
segment.notice_nosql_statement "#{SEND_MULTIGET_METRIC_NAME} #{keys.inspect}"
|
@@ -85,9 +87,11 @@ module NewRelic
|
|
85
87
|
alias_method method_name_without, method_name
|
86
88
|
|
87
89
|
define_method method_name do |*args, &block|
|
88
|
-
segment = NewRelic::Agent::
|
90
|
+
segment = NewRelic::Agent::Tracer.start_segment name: "Ruby/Memcached/Dalli/#{method_name}"
|
89
91
|
begin
|
90
|
-
|
92
|
+
NewRelic::Agent::Tracer.capture_segment_error segment do
|
93
|
+
__send__ method_name_without, *args, &block
|
94
|
+
end
|
91
95
|
ensure
|
92
96
|
segment.finish if segment
|
93
97
|
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
|
require 'set'
|
6
6
|
|
@@ -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 = :merb_error
|
@@ -1,10 +1,10 @@
|
|
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/method_tracer'
|
6
6
|
require 'new_relic/agent/transaction'
|
7
|
-
require 'new_relic/agent/
|
7
|
+
require 'new_relic/agent/tracer'
|
8
8
|
require 'new_relic/agent/instrumentation/queue_time'
|
9
9
|
require 'new_relic/agent/instrumentation/controller_instrumentation'
|
10
10
|
require 'new_relic/agent/instrumentation/middleware_tracing'
|
@@ -27,10 +27,18 @@ module NewRelic
|
|
27
27
|
@middleware_class = middleware_class
|
28
28
|
end
|
29
29
|
|
30
|
-
|
31
|
-
|
32
|
-
|
30
|
+
if RUBY_VERSION < "2.7.0"
|
31
|
+
def new(*args, &blk)
|
32
|
+
middleware_instance = @middleware_class.new(*args, &blk)
|
33
|
+
MiddlewareProxy.wrap(middleware_instance)
|
34
|
+
end
|
35
|
+
else
|
36
|
+
def new(*args, **kwargs, &blk)
|
37
|
+
middleware_instance = @middleware_class.new(*args, **kwargs, &blk)
|
38
|
+
MiddlewareProxy.wrap(middleware_instance)
|
39
|
+
end
|
33
40
|
end
|
41
|
+
|
34
42
|
end
|
35
43
|
|
36
44
|
def self.is_sinatra_app?(target)
|
@@ -1,10 +1,11 @@
|
|
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 'new_relic/agent/method_tracer'
|
6
7
|
require 'new_relic/agent/transaction'
|
7
|
-
require 'new_relic/agent/
|
8
|
+
require 'new_relic/agent/tracer'
|
8
9
|
require 'new_relic/agent/instrumentation/queue_time'
|
9
10
|
require 'new_relic/agent/instrumentation/controller_instrumentation'
|
10
11
|
|
@@ -26,7 +27,10 @@ module NewRelic
|
|
26
27
|
module Agent
|
27
28
|
module Instrumentation
|
28
29
|
module MiddlewareTracing
|
29
|
-
|
30
|
+
|
31
|
+
TXN_STARTED_KEY = 'newrelic.transaction_started'
|
32
|
+
CONTENT_TYPE = 'Content-Type'
|
33
|
+
CONTENT_LENGTH = 'Content-Length'
|
30
34
|
|
31
35
|
def _nr_has_middleware_tracing
|
32
36
|
true
|
@@ -56,8 +60,6 @@ module NewRelic
|
|
56
60
|
end
|
57
61
|
end
|
58
62
|
|
59
|
-
CONTENT_TYPE = 'Content-Type'.freeze
|
60
|
-
|
61
63
|
def capture_response_content_type(state, result)
|
62
64
|
if result.is_a?(Array) && state.current_transaction
|
63
65
|
_, headers, _ = result
|
@@ -65,12 +67,12 @@ module NewRelic
|
|
65
67
|
end
|
66
68
|
end
|
67
69
|
|
68
|
-
CONTENT_LENGTH = 'Content-Length'.freeze
|
69
|
-
|
70
70
|
def capture_response_content_length(state, result)
|
71
71
|
if result.is_a?(Array) && state.current_transaction
|
72
72
|
_, headers, _ = result
|
73
|
-
|
73
|
+
length = headers[CONTENT_LENGTH]
|
74
|
+
length = length.reduce(0){|sum, h| sum + h.to_i} if length.is_a?(Array)
|
75
|
+
state.current_transaction.response_content_length = length
|
74
76
|
end
|
75
77
|
end
|
76
78
|
|
@@ -83,10 +85,17 @@ module NewRelic
|
|
83
85
|
def call(env)
|
84
86
|
first_middleware = note_transaction_started(env)
|
85
87
|
|
86
|
-
state = NewRelic::Agent::
|
88
|
+
state = NewRelic::Agent::Tracer.state
|
87
89
|
|
88
90
|
begin
|
89
|
-
|
91
|
+
options = build_transaction_options(env, first_middleware)
|
92
|
+
|
93
|
+
finishable = Tracer.start_transaction_or_segment(
|
94
|
+
name: options[:transaction_name],
|
95
|
+
category: category,
|
96
|
+
options: options
|
97
|
+
)
|
98
|
+
|
90
99
|
events.notify(:before_call, env) if first_middleware
|
91
100
|
|
92
101
|
result = (target == self) ? traced_call(env) : target.call(env)
|
@@ -101,7 +110,7 @@ module NewRelic
|
|
101
110
|
NewRelic::Agent.notice_error(e)
|
102
111
|
raise e
|
103
112
|
ensure
|
104
|
-
|
113
|
+
finishable.finish if finishable
|
105
114
|
end
|
106
115
|
end
|
107
116
|
|
@@ -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
|
named :mongo
|
@@ -74,7 +74,7 @@ DependencyDetection.defer do
|
|
74
74
|
op_and_col = NewRelic::Agent::Datastores::Mongo::MetricTranslator.operation_and_collection_for name, payload
|
75
75
|
if op_and_col
|
76
76
|
operation, collection = op_and_col
|
77
|
-
NewRelic::Agent::
|
77
|
+
NewRelic::Agent::Tracer.start_datastore_segment(
|
78
78
|
product: product,
|
79
79
|
operation: operation,
|
80
80
|
collection: collection
|
@@ -87,7 +87,9 @@ DependencyDetection.defer do
|
|
87
87
|
|
88
88
|
begin
|
89
89
|
result = NewRelic::Agent.disable_all_tracing do
|
90
|
-
|
90
|
+
NewRelic::Agent::Tracer.capture_segment_error segment do
|
91
|
+
instrument_without_new_relic_trace(name, payload, &block)
|
92
|
+
end
|
91
93
|
end
|
92
94
|
|
93
95
|
new_relic_notice_statement(segment, payload, name) if segment
|
@@ -109,7 +111,9 @@ DependencyDetection.defer do
|
|
109
111
|
|
110
112
|
begin
|
111
113
|
result = NewRelic::Agent.disable_all_tracing do
|
112
|
-
|
114
|
+
NewRelic::Agent::Tracer.capture_segment_error segment do
|
115
|
+
save_without_new_relic_trace(doc, opts, &block)
|
116
|
+
end
|
113
117
|
end
|
114
118
|
|
115
119
|
new_relic_notice_statement(segment, doc, :save) if segment
|
@@ -131,7 +135,9 @@ DependencyDetection.defer do
|
|
131
135
|
|
132
136
|
begin
|
133
137
|
result = NewRelic::Agent.disable_all_tracing do
|
134
|
-
|
138
|
+
NewRelic::Agent::Tracer.capture_segment_error segment do
|
139
|
+
ensure_index_without_new_relic_trace(spec, opts, &block)
|
140
|
+
end
|
135
141
|
end
|
136
142
|
|
137
143
|
spec = case spec
|
@@ -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
|
require 'new_relic/agent/datastores/mongo/event_formatter'
|
5
5
|
|
6
6
|
module NewRelic
|
@@ -12,19 +12,42 @@ module NewRelic
|
|
12
12
|
|
13
13
|
def started(event)
|
14
14
|
begin
|
15
|
-
return unless NewRelic::Agent.
|
15
|
+
return unless NewRelic::Agent::Tracer.tracing_enabled?
|
16
16
|
segments[event.operation_id] = start_segment event
|
17
17
|
rescue Exception => e
|
18
18
|
log_notification_error('started', e)
|
19
19
|
end
|
20
20
|
end
|
21
21
|
|
22
|
+
ERROR_KEYS = %w{ writeErrors writeConcernError writeConcernErrors }.freeze
|
23
|
+
|
24
|
+
def error_key_present?(event)
|
25
|
+
if reply = event.reply
|
26
|
+
ERROR_KEYS.detect{ |key| reply[key] }
|
27
|
+
end
|
28
|
+
rescue
|
29
|
+
false
|
30
|
+
end
|
31
|
+
|
22
32
|
def completed(event)
|
23
33
|
begin
|
24
|
-
|
25
|
-
return unless state.is_execution_traced?
|
34
|
+
return unless NewRelic::Agent::Tracer.tracing_enabled?
|
26
35
|
segment = segments.delete(event.operation_id)
|
27
|
-
|
36
|
+
return unless segment
|
37
|
+
|
38
|
+
# operations that succeed but have errors return CommandSucceeded
|
39
|
+
# with an error_key that is populated with error specfics
|
40
|
+
if error_key = error_key_present?(event)
|
41
|
+
# taking the last error as there can potentially be many
|
42
|
+
attributes = event.reply[error_key][-1]
|
43
|
+
segment.notice_error Mongo::Error.new("%s (%s)" % [attributes["errmsg"], attributes["code"]])
|
44
|
+
|
45
|
+
# failing commands return a CommandFailed event with an error message
|
46
|
+
# in the form of "% (%s)" for the message and code
|
47
|
+
elsif event.is_a? Mongo::Monitoring::Event::CommandFailed
|
48
|
+
segment.notice_error Mongo::Error.new(event.message)
|
49
|
+
end
|
50
|
+
segment.finish
|
28
51
|
rescue Exception => e
|
29
52
|
log_notification_error('completed', e)
|
30
53
|
end
|
@@ -38,9 +61,9 @@ module NewRelic
|
|
38
61
|
def start_segment event
|
39
62
|
host = host_from_address event.address
|
40
63
|
port_path_or_id = port_path_or_id_from_address event.address
|
41
|
-
segment = NewRelic::Agent::
|
64
|
+
segment = NewRelic::Agent::Tracer.start_datastore_segment(
|
42
65
|
product: MONGODB,
|
43
|
-
operation: event.command_name,
|
66
|
+
operation: operation(event.command_name),
|
44
67
|
collection: collection(event),
|
45
68
|
host: host,
|
46
69
|
port_path_or_id: port_path_or_id,
|
@@ -50,6 +73,15 @@ module NewRelic
|
|
50
73
|
segment
|
51
74
|
end
|
52
75
|
|
76
|
+
def operation(command_name)
|
77
|
+
# from 2.0 to 2.5, :findandmodify was the command_name
|
78
|
+
if command_name == :findandmodify
|
79
|
+
:findAndModify
|
80
|
+
else
|
81
|
+
command_name
|
82
|
+
end
|
83
|
+
end
|
84
|
+
|
53
85
|
def collection(event)
|
54
86
|
event.command[COLLECTION] || event.command[:collection] || event.command.values.first
|
55
87
|
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
|
named :net_http
|
@@ -11,38 +11,75 @@ DependencyDetection.defer do
|
|
11
11
|
|
12
12
|
executes do
|
13
13
|
::NewRelic::Agent.logger.info 'Installing Net instrumentation'
|
14
|
-
require 'new_relic/agent/cross_app_tracing'
|
14
|
+
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
15
15
|
require 'new_relic/agent/http_clients/net_http_wrappers'
|
16
16
|
end
|
17
17
|
|
18
18
|
executes do
|
19
19
|
class Net::HTTP
|
20
|
-
def request_with_newrelic_trace(request, *args, &block)
|
21
|
-
wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
|
22
20
|
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
21
|
+
if RUBY_VERSION < "2.7.0"
|
22
|
+
def request_with_newrelic_trace(request, *args, &block)
|
23
|
+
wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
|
24
|
+
|
25
|
+
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
26
|
+
library: wrapped_request.type,
|
27
|
+
uri: wrapped_request.uri,
|
28
|
+
procedure: wrapped_request.method
|
29
|
+
)
|
30
|
+
|
31
|
+
begin
|
32
|
+
response = nil
|
33
|
+
segment.add_request_headers wrapped_request
|
34
|
+
|
35
|
+
# RUBY-1244 Disable further tracing in request to avoid double
|
36
|
+
# counting if connection wasn't started (which calls request again).
|
37
|
+
NewRelic::Agent.disable_all_tracing do
|
38
|
+
response = NewRelic::Agent::Tracer.capture_segment_error segment do
|
39
|
+
request_without_newrelic_trace(request, *args, &block)
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new response
|
44
|
+
segment.process_response_headers wrapped_response
|
45
|
+
response
|
46
|
+
ensure
|
47
|
+
segment.finish
|
48
|
+
end
|
49
|
+
end
|
50
|
+
else
|
51
|
+
def request_with_newrelic_trace(request, *args, **kwargs, &block)
|
52
|
+
wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
|
53
|
+
|
54
|
+
segment = NewRelic::Agent::Tracer.start_external_request_segment(
|
55
|
+
library: wrapped_request.type,
|
56
|
+
uri: wrapped_request.uri,
|
57
|
+
procedure: wrapped_request.method
|
58
|
+
)
|
59
|
+
|
60
|
+
begin
|
61
|
+
response = nil
|
62
|
+
segment.add_request_headers wrapped_request
|
63
|
+
|
64
|
+
# RUBY-1244 Disable further tracing in request to avoid double
|
65
|
+
# counting if connection wasn't started (which calls request again).
|
66
|
+
NewRelic::Agent.disable_all_tracing do
|
67
|
+
response = NewRelic::Agent::Tracer.capture_segment_error segment do
|
68
|
+
request_without_newrelic_trace(request, *args, **kwargs, &block)
|
69
|
+
end
|
70
|
+
end
|
71
|
+
|
72
|
+
wrapped_response = NewRelic::Agent::HTTPClients::NetHTTPResponse.new response
|
73
|
+
segment.process_response_headers wrapped_response
|
74
|
+
response
|
75
|
+
ensure
|
76
|
+
segment.finish
|
37
77
|
end
|
38
|
-
|
39
|
-
segment.read_response_headers response
|
40
|
-
response
|
41
|
-
ensure
|
42
|
-
segment.finish
|
43
78
|
end
|
79
|
+
|
44
80
|
end
|
45
81
|
|
82
|
+
|
46
83
|
alias request_without_newrelic_trace request
|
47
84
|
alias request request_with_newrelic_trace
|
48
85
|
end
|
@@ -0,0 +1,100 @@
|
|
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
|
6
|
+
module Agent
|
7
|
+
module Instrumentation
|
8
|
+
class NotificationsSubscriber
|
9
|
+
def initialize
|
10
|
+
@queue_key = ['NewRelic', self.class.name, object_id].join('-')
|
11
|
+
define_exception_method
|
12
|
+
end
|
13
|
+
|
14
|
+
def self.subscribed?
|
15
|
+
find_all_subscribers.find{|s| s.instance_variable_get(:@delegate).class == self }
|
16
|
+
end
|
17
|
+
|
18
|
+
def self.find_all_subscribers
|
19
|
+
# TODO: need to talk to Rails core about an API for this,
|
20
|
+
# rather than digging through Listener ivars
|
21
|
+
instance_variable_names = [:@subscribers, :@string_subscribers, :@other_subscribers]
|
22
|
+
all_subscribers = []
|
23
|
+
|
24
|
+
notifier = ActiveSupport::Notifications.notifier
|
25
|
+
|
26
|
+
instance_variable_names.each do |name|
|
27
|
+
if notifier.instance_variable_defined?(name)
|
28
|
+
subscribers = notifier.instance_variable_get(name)
|
29
|
+
if subscribers.is_a? Array
|
30
|
+
# Rails 5 @subscribers, and Rails 6 @other_subscribers is a
|
31
|
+
# plain array of subscriber objects
|
32
|
+
all_subscribers += subscribers
|
33
|
+
elsif subscribers.is_a? Hash
|
34
|
+
# Rails 6 @string_subscribers is a Hash mapping the pattern
|
35
|
+
# string of a subscriber to an array of subscriber objects
|
36
|
+
subscribers.values.each { |array| all_subscribers += array }
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
all_subscribers
|
42
|
+
end
|
43
|
+
|
44
|
+
def self.subscribe(pattern)
|
45
|
+
if !subscribed?
|
46
|
+
ActiveSupport::Notifications.subscribe(pattern, new)
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
def log_notification_error(error, name, event_type)
|
51
|
+
# These are important enough failures that we want the backtraces
|
52
|
+
# logged at error level, hence the explicit log_exception call.
|
53
|
+
NewRelic::Agent.logger.error("Error during #{event_type} callback for event '#{name}':")
|
54
|
+
NewRelic::Agent.logger.log_exception(:error, error)
|
55
|
+
end
|
56
|
+
|
57
|
+
def push_segment(id, segment)
|
58
|
+
segment_stack[id].push segment
|
59
|
+
end
|
60
|
+
|
61
|
+
def pop_segment(id)
|
62
|
+
segment = segment_stack[id].pop
|
63
|
+
segment
|
64
|
+
end
|
65
|
+
|
66
|
+
def segment_stack
|
67
|
+
Thread.current[@queue_key] ||= Hash.new {|h,id| h[id] = [] }
|
68
|
+
end
|
69
|
+
|
70
|
+
def state
|
71
|
+
NewRelic::Agent::Tracer.state
|
72
|
+
end
|
73
|
+
|
74
|
+
def define_exception_method
|
75
|
+
# we don't expect this to be called more than once, but we're being
|
76
|
+
# defensive.
|
77
|
+
return if defined?(exception_object)
|
78
|
+
return unless defined?(::ActiveSupport)
|
79
|
+
if ::ActiveSupport::VERSION::STRING < "5.0.0"
|
80
|
+
# Earlier versions of Rails did not add the exception itself to the
|
81
|
+
# payload asssessible via :exception_object, so we create a stand-in
|
82
|
+
# error object from the given class name and message.
|
83
|
+
# NOTE: no backtrace available this way, but we can notice the error
|
84
|
+
# well enough to send the necessary info the UI requires to present it.
|
85
|
+
def exception_object(payload)
|
86
|
+
exception_class, message = payload[:exception]
|
87
|
+
return nil unless exception_class
|
88
|
+
NewRelic::Agent::NoticibleError.new exception_class, message
|
89
|
+
end
|
90
|
+
else
|
91
|
+
def exception_object(payload)
|
92
|
+
payload[:exception_object]
|
93
|
+
end
|
94
|
+
end
|
95
|
+
end
|
96
|
+
end
|
97
|
+
|
98
|
+
end
|
99
|
+
end
|
100
|
+
end
|