newrelic_rpm 6.15.0 → 8.13.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +7 -1
- data/.rubocop.yml +1817 -0
- data/.rubocop_todo.yml +59 -0
- data/.simplecov +15 -0
- data/.snyk +11 -0
- data/.yardopts +1 -0
- data/Brewfile +12 -0
- data/CHANGELOG.md +754 -40
- data/CONTRIBUTING.md +32 -5
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Gemfile +0 -1
- data/Guardfile +9 -8
- data/LICENSE +0 -6
- data/README.md +21 -20
- data/Rakefile +27 -29
- data/THIRD_PARTY_NOTICES.md +14 -199
- data/Thorfile +5 -0
- data/bin/newrelic +3 -2
- data/bin/newrelic_cmd +1 -0
- data/bin/nrdebug +76 -53
- data/config.dot +5 -5
- data/docker-compose.yml +107 -0
- data/init.rb +4 -6
- data/install.rb +2 -2
- data/lefthook.yml +9 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +13 -9
- data/lib/new_relic/agent/agent/shutdown.rb +35 -0
- data/lib/new_relic/agent/agent/special_startup.rb +72 -0
- data/lib/new_relic/agent/agent/start_worker_thread.rb +163 -0
- data/lib/new_relic/agent/agent/startup.rb +197 -0
- data/lib/new_relic/agent/agent.rb +178 -555
- data/lib/new_relic/agent/agent_logger.rb +23 -19
- data/lib/new_relic/agent/attribute_filter.rb +66 -47
- data/lib/new_relic/agent/attribute_processing.rb +7 -7
- data/lib/new_relic/agent/attributes.rb +5 -4
- data/lib/new_relic/agent/audit_logger.rb +8 -3
- data/lib/new_relic/agent/autostart.rb +20 -19
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +3 -3
- data/lib/new_relic/agent/commands/agent_command_router.rb +12 -11
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +9 -7
- data/lib/new_relic/agent/configuration/default_source.rb +1728 -1194
- data/lib/new_relic/agent/configuration/dotted_hash.rb +6 -5
- data/lib/new_relic/agent/configuration/environment_source.rb +11 -9
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +40 -17
- data/lib/new_relic/agent/configuration/high_security_source.rb +9 -8
- data/lib/new_relic/agent/configuration/manager.rb +82 -69
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +3 -3
- data/lib/new_relic/agent/configuration/security_policy_source.rb +90 -77
- data/lib/new_relic/agent/configuration/server_source.rb +21 -19
- data/lib/new_relic/agent/configuration/yaml_source.rb +31 -7
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +18 -18
- data/lib/new_relic/agent/connect/response_handler.rb +5 -8
- data/lib/new_relic/agent/custom_event_aggregator.rb +14 -14
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +4 -5
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +14 -13
- data/lib/new_relic/agent/database/obfuscator.rb +2 -2
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +3 -3
- data/lib/new_relic/agent/database.rb +53 -47
- data/lib/new_relic/agent/database_adapter.rb +3 -1
- data/lib/new_relic/agent/datastores/metric_helper.rb +17 -18
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +7 -6
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +6 -10
- data/lib/new_relic/agent/datastores/mongo.rb +6 -11
- data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
- data/lib/new_relic/agent/datastores/redis.rb +5 -11
- data/lib/new_relic/agent/datastores.rb +11 -13
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +10 -10
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +39 -32
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +22 -22
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +19 -19
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +50 -52
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +5 -6
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +76 -77
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +39 -38
- data/lib/new_relic/agent/distributed_tracing.rb +32 -100
- data/lib/new_relic/agent/encoding_normalizer.rb +4 -2
- data/lib/new_relic/agent/error_collector.rb +73 -54
- data/lib/new_relic/agent/error_event_aggregator.rb +4 -5
- data/lib/new_relic/agent/error_filter.rb +174 -0
- data/lib/new_relic/agent/error_trace_aggregator.rb +4 -3
- data/lib/new_relic/agent/event_aggregator.rb +22 -21
- data/lib/new_relic/agent/event_buffer.rb +7 -8
- data/lib/new_relic/agent/event_listener.rb +1 -2
- data/lib/new_relic/agent/event_loop.rb +25 -23
- data/lib/new_relic/agent/external.rb +11 -44
- data/lib/new_relic/agent/guid_generator.rb +4 -11
- data/lib/new_relic/agent/harvester.rb +4 -5
- data/lib/new_relic/agent/heap.rb +6 -8
- data/lib/new_relic/agent/hostname.rb +20 -13
- data/lib/new_relic/agent/http_clients/abstract.rb +10 -11
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +6 -11
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +8 -9
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -5
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +2 -4
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +8 -4
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +4 -5
- data/lib/new_relic/agent/http_clients/uri_util.rb +1 -3
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +8 -8
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +38 -31
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +12 -13
- data/lib/new_relic/agent/instrumentation/active_job.rb +14 -7
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +20 -6
- data/lib/new_relic/agent/instrumentation/active_record.rb +29 -27
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +71 -61
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +31 -44
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +4 -4
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +27 -20
- data/lib/new_relic/agent/instrumentation/active_storage.rb +2 -2
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +18 -15
- data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +23 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +20 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +12 -0
- data/lib/new_relic/agent/instrumentation/active_support_logger.rb +24 -0
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +18 -10
- data/lib/new_relic/agent/instrumentation/authlogic.rb +10 -2
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +150 -0
- data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/bunny.rb +11 -154
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +68 -58
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +91 -0
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +221 -0
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +61 -0
- data/lib/new_relic/agent/instrumentation/curb.rb +11 -243
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +65 -54
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +35 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +48 -0
- data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +29 -53
- data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +5 -5
- data/lib/new_relic/agent/instrumentation/excon.rb +22 -24
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +24 -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 +11 -112
- data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +97 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +89 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +111 -0
- data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +30 -0
- data/lib/new_relic/agent/instrumentation/grpc/helper.rb +32 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +69 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +134 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +35 -0
- data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +26 -0
- data/lib/new_relic/agent/instrumentation/grpc_client.rb +23 -0
- data/lib/new_relic/agent/instrumentation/grpc_server.rb +25 -0
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +37 -0
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/httpclient.rb +10 -32
- 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 +4 -5
- data/lib/new_relic/agent/instrumentation/logger/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +66 -0
- data/lib/new_relic/agent/instrumentation/logger/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/logger.rb +26 -0
- data/lib/new_relic/agent/instrumentation/memcache/chain.rb +15 -0
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +57 -128
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +59 -0
- data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +90 -0
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +101 -0
- data/lib/new_relic/agent/instrumentation/memcache.rb +56 -72
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +13 -12
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +5 -7
- data/lib/new_relic/agent/instrumentation/mongo.rb +5 -136
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +21 -18
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/{net_prepend.rb → net_http/instrumentation.rb} +13 -13
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +21 -0
- data/lib/new_relic/agent/instrumentation/net_http.rb +44 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +10 -9
- data/lib/new_relic/agent/instrumentation/padrino/chain.rb +38 -0
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +20 -0
- data/lib/new_relic/agent/instrumentation/padrino.rb +20 -58
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +3 -3
- data/lib/new_relic/agent/instrumentation/queue_time.rb +8 -9
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +66 -0
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +33 -0
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +75 -0
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +43 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +30 -140
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +16 -52
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +5 -4
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +3 -3
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +3 -2
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +13 -3
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +20 -0
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +149 -0
- data/lib/new_relic/agent/instrumentation/rake/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/rake.rb +16 -157
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +45 -0
- data/lib/new_relic/agent/instrumentation/redis/constants.rb +17 -0
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +72 -0
- data/lib/new_relic/agent/instrumentation/redis/middleware.rb +16 -0
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +29 -0
- data/lib/new_relic/agent/instrumentation/redis.rb +18 -107
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +21 -0
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +19 -0
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +34 -0
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +15 -0
- data/lib/new_relic/agent/instrumentation/resque.rb +28 -39
- data/lib/new_relic/agent/instrumentation/sequel.rb +14 -16
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +2 -2
- data/lib/new_relic/agent/instrumentation/sidekiq/client.rb +20 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +30 -0
- data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +37 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +23 -64
- data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +55 -0
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +30 -36
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +125 -0
- data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +33 -0
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +2 -2
- data/lib/new_relic/agent/instrumentation/sinatra.rb +34 -163
- data/lib/new_relic/agent/instrumentation/sunspot.rb +11 -3
- data/lib/new_relic/agent/instrumentation/thread/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +28 -0
- data/lib/new_relic/agent/instrumentation/thread/prepend.rb +22 -0
- data/lib/new_relic/agent/instrumentation/thread.rb +20 -0
- data/lib/new_relic/agent/instrumentation/tilt/chain.rb +24 -0
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +41 -0
- data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +13 -0
- data/lib/new_relic/agent/instrumentation/tilt.rb +25 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +22 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +80 -0
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +14 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +12 -91
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +2 -2
- data/lib/new_relic/agent/javascript_instrumentor.rb +47 -41
- data/lib/new_relic/agent/linking_metadata.rb +44 -0
- data/lib/new_relic/agent/local_log_decorator.rb +37 -0
- data/lib/new_relic/agent/log_event_aggregator.rb +235 -0
- data/lib/new_relic/agent/log_once.rb +1 -1
- data/lib/new_relic/agent/log_priority.rb +20 -0
- data/lib/new_relic/agent/logging.rb +24 -21
- data/lib/new_relic/agent/memory_logger.rb +2 -2
- data/lib/new_relic/agent/messaging.rb +65 -81
- data/lib/new_relic/agent/method_tracer.rb +154 -149
- data/lib/new_relic/agent/method_tracer_helpers.rb +85 -3
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +25 -17
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +5 -4
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -2
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +6 -9
- data/lib/new_relic/agent/monitors.rb +6 -7
- data/lib/new_relic/agent/new_relic_service/encoders.rb +6 -6
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +5 -5
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +2 -2
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +5 -4
- data/lib/new_relic/agent/new_relic_service.rb +248 -196
- data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +2 -5
- data/lib/new_relic/agent/null_logger.rb +7 -3
- data/lib/new_relic/agent/obfuscator.rb +8 -10
- data/lib/new_relic/agent/parameter_filtering.rb +24 -10
- data/lib/new_relic/agent/payload_metric_mapping.rb +9 -10
- data/lib/new_relic/agent/pipe_channel_manager.rb +27 -17
- data/lib/new_relic/agent/pipe_service.rb +8 -5
- data/lib/new_relic/agent/prepend_supportability.rb +2 -2
- data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -11
- data/lib/new_relic/agent/range_extensions.rb +8 -28
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +11 -11
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +13 -13
- data/lib/new_relic/agent/rules_engine.rb +5 -4
- data/lib/new_relic/agent/sampler.rb +3 -4
- data/lib/new_relic/agent/sampler_collection.rb +3 -4
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +3 -2
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +12 -9
- data/lib/new_relic/agent/samplers/memory_sampler.rb +24 -13
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +21 -19
- data/lib/new_relic/agent/span_event_aggregator.rb +12 -12
- data/lib/new_relic/agent/span_event_primitive.rb +62 -56
- data/lib/new_relic/agent/sql_sampler.rb +18 -18
- data/lib/new_relic/agent/stats.rb +78 -41
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +9 -11
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +12 -13
- data/lib/new_relic/agent/stats_engine.rb +8 -8
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +7 -8
- data/lib/new_relic/agent/system_info.rb +85 -65
- data/lib/new_relic/agent/threading/agent_thread.rb +18 -14
- data/lib/new_relic/agent/threading/backtrace_node.rb +12 -13
- data/lib/new_relic/agent/threading/backtrace_service.rb +14 -14
- data/lib/new_relic/agent/threading/thread_profile.rb +23 -23
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +76 -85
- data/lib/new_relic/agent/transaction/abstract_segment.rb +103 -40
- data/lib/new_relic/agent/transaction/datastore_segment.rb +21 -17
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +63 -56
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +43 -44
- data/lib/new_relic/agent/transaction/external_request_segment.rb +44 -34
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +31 -36
- data/lib/new_relic/agent/transaction/request_attributes.rb +35 -35
- data/lib/new_relic/agent/transaction/segment.rb +14 -10
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -3
- data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction/trace.rb +15 -11
- data/lib/new_relic/agent/transaction/trace_builder.rb +10 -10
- data/lib/new_relic/agent/transaction/trace_context.rb +35 -35
- data/lib/new_relic/agent/transaction/trace_node.rb +25 -24
- data/lib/new_relic/agent/transaction/tracing.rb +14 -11
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +4 -4
- data/lib/new_relic/agent/transaction.rb +164 -145
- data/lib/new_relic/agent/transaction_error_primitive.rb +27 -25
- data/lib/new_relic/agent/transaction_event_aggregator.rb +12 -12
- data/lib/new_relic/agent/transaction_event_primitive.rb +32 -33
- data/lib/new_relic/agent/transaction_event_recorder.rb +16 -15
- data/lib/new_relic/agent/transaction_metrics.rb +10 -9
- data/lib/new_relic/agent/transaction_sampler.rb +5 -6
- data/lib/new_relic/agent/transaction_time_aggregator.rb +26 -25
- data/lib/new_relic/agent/utilization/aws.rb +33 -3
- data/lib/new_relic/agent/utilization/azure.rb +3 -3
- data/lib/new_relic/agent/utilization/gcp.rb +7 -7
- data/lib/new_relic/agent/utilization/pcf.rb +5 -4
- data/lib/new_relic/agent/utilization/vendor.rb +43 -28
- data/lib/new_relic/agent/utilization_data.rb +7 -5
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +2 -2
- data/lib/new_relic/agent/vm/mri_vm.rb +40 -15
- data/lib/new_relic/agent/vm/snapshot.rb +5 -5
- data/lib/new_relic/agent/vm.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +10 -12
- data/lib/new_relic/agent.rb +64 -75
- data/lib/new_relic/cli/command.rb +20 -22
- data/lib/new_relic/cli/commands/deployments.rb +92 -42
- data/lib/new_relic/cli/commands/install.rb +12 -15
- data/lib/new_relic/coerce.rb +15 -13
- data/lib/new_relic/collection_helper.rb +50 -48
- data/lib/new_relic/constants.rb +1 -4
- data/lib/new_relic/control/class_methods.rb +3 -3
- data/lib/new_relic/control/frameworks/external.rb +2 -2
- data/lib/new_relic/control/frameworks/rails.rb +23 -17
- data/lib/new_relic/control/frameworks/rails3.rb +3 -4
- data/lib/new_relic/control/frameworks/rails4.rb +1 -1
- data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
- data/lib/new_relic/control/frameworks/ruby.rb +3 -3
- data/lib/new_relic/control/frameworks/sinatra.rb +7 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/instance_methods.rb +23 -45
- data/lib/new_relic/control/instrumentation.rb +39 -11
- data/lib/new_relic/control/private_instance_methods.rb +48 -0
- data/lib/new_relic/control/server_methods.rb +3 -4
- data/lib/new_relic/control.rb +1 -2
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +126 -19
- data/lib/new_relic/environment_report.rb +40 -32
- data/lib/new_relic/helper.rb +48 -7
- data/lib/new_relic/language_support.rb +29 -5
- data/lib/new_relic/latest_changes.rb +7 -6
- data/lib/new_relic/local_environment.rb +24 -18
- data/lib/new_relic/metric_data.rb +31 -26
- data/lib/new_relic/metric_spec.rb +8 -6
- data/lib/new_relic/noticed_error.rb +22 -30
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +5 -3
- data/lib/new_relic/rack/browser_monitoring.rb +133 -123
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +3 -61
- data/lib/new_relic/recipes/capistrano_legacy.rb +23 -26
- data/lib/new_relic/recipes/helpers/send_deployment.rb +69 -0
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +9 -10
- data/lib/new_relic/traced_thread.rb +35 -0
- data/lib/new_relic/version.rb +6 -17
- data/lib/newrelic_rpm.rb +11 -35
- data/lib/sequel/extensions/newrelic_instrumentation.rb +12 -15
- data/lib/sequel/plugins/newrelic_instrumentation.rb +4 -10
- data/lib/tasks/all.rb +3 -3
- data/lib/tasks/config.rake +22 -117
- data/lib/tasks/coverage_report.rake +28 -0
- data/lib/tasks/helpers/config.html.erb +21 -0
- data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
- data/lib/tasks/helpers/format.rb +123 -0
- data/lib/tasks/helpers/matches.rb +12 -0
- data/lib/tasks/helpers/prompt.rb +24 -0
- data/lib/tasks/helpers/removers.rb +33 -0
- data/lib/tasks/install.rake +4 -0
- data/lib/tasks/instrumentation_generator/README.md +63 -0
- data/lib/tasks/instrumentation_generator/TODO.md +33 -0
- data/lib/tasks/instrumentation_generator/instrumentation.thor +124 -0
- data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
- data/lib/tasks/instrumentation_generator/templates/chain.tt +22 -0
- data/lib/tasks/instrumentation_generator/templates/chain_method.tt +8 -0
- data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
- data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
- data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
- data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
- data/lib/tasks/multiverse.rake +4 -0
- data/lib/tasks/multiverse.rb +5 -32
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +10 -15
- data/newrelic.yml +648 -3
- data/newrelic_rpm.gemspec +25 -25
- data/recipes/newrelic.rb +2 -2
- data/test/agent_helper.rb +219 -178
- metadata +164 -122
- data/ROADMAP.md +0 -24
- data/bin/mongrel_rpm +0 -33
- data/cert/cacert.pem +0 -1177
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +0 -53
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +0 -49
- data/lib/new_relic/agent/instrumentation/http.rb +0 -49
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -44
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +0 -33
- data/lib/new_relic/agent/instrumentation/net.rb +0 -70
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -125
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +0 -46
- data/lib/new_relic/agent/supported_versions.rb +0 -275
- data/lib/new_relic/control/frameworks/merb.rb +0 -29
- data/lib/tasks/config.html.erb +0 -32
@@ -1,4 +1,3 @@
|
|
1
|
-
# encoding: utf-8
|
2
1
|
# This file is distributed under New Relic's license terms.
|
3
2
|
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
3
|
# frozen_string_literal: true
|
@@ -24,33 +23,32 @@ module NewRelic
|
|
24
23
|
include Tracing
|
25
24
|
|
26
25
|
# for nested transactions
|
27
|
-
NESTED_TRANSACTION_PREFIX
|
28
|
-
CONTROLLER_PREFIX
|
29
|
-
MIDDLEWARE_PREFIX
|
30
|
-
OTHER_TRANSACTION_PREFIX
|
31
|
-
TASK_PREFIX
|
32
|
-
RAKE_PREFIX
|
33
|
-
MESSAGE_PREFIX
|
34
|
-
RACK_PREFIX
|
35
|
-
SINATRA_PREFIX
|
36
|
-
GRAPE_PREFIX
|
37
|
-
ACTION_CABLE_PREFIX
|
38
|
-
|
39
|
-
WEB_TRANSACTION_CATEGORIES
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
APDEX_TXN_METRIC_PREFIX = "Apdex/"
|
26
|
+
NESTED_TRANSACTION_PREFIX = "Nested/"
|
27
|
+
CONTROLLER_PREFIX = "Controller/"
|
28
|
+
MIDDLEWARE_PREFIX = "Middleware/Rack/"
|
29
|
+
OTHER_TRANSACTION_PREFIX = "OtherTransaction/"
|
30
|
+
TASK_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Background/"
|
31
|
+
RAKE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Rake/"
|
32
|
+
MESSAGE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Message/"
|
33
|
+
RACK_PREFIX = "#{CONTROLLER_PREFIX}Rack/"
|
34
|
+
SINATRA_PREFIX = "#{CONTROLLER_PREFIX}Sinatra/"
|
35
|
+
GRAPE_PREFIX = "#{CONTROLLER_PREFIX}Grape/"
|
36
|
+
ACTION_CABLE_PREFIX = "#{CONTROLLER_PREFIX}ActionCable/"
|
37
|
+
|
38
|
+
WEB_TRANSACTION_CATEGORIES = [:web, :controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
|
39
|
+
|
40
|
+
MIDDLEWARE_SUMMARY_METRICS = ["Middleware/all"].freeze
|
41
|
+
WEB_SUMMARY_METRIC = "HttpDispatcher"
|
42
|
+
OTHER_SUMMARY_METRIC = "#{OTHER_TRANSACTION_PREFIX}all"
|
43
|
+
QUEUE_TIME_METRIC = "WebFrontend/QueueTime"
|
44
|
+
|
45
|
+
APDEX_S = "S"
|
46
|
+
APDEX_T = "T"
|
47
|
+
APDEX_F = "F"
|
48
|
+
APDEX_ALL_METRIC = "ApdexAll"
|
49
|
+
APDEX_METRIC = "Apdex"
|
50
|
+
APDEX_OTHER_METRIC = "ApdexOther"
|
51
|
+
APDEX_TXN_METRIC_PREFIX = "Apdex/"
|
54
52
|
APDEX_OTHER_TXN_METRIC_PREFIX = "ApdexOther/Transaction/"
|
55
53
|
|
56
54
|
JRUBY_CPU_TIME_ERROR = "Error calculating JRuby CPU Time"
|
@@ -67,27 +65,28 @@ module NewRelic
|
|
67
65
|
attr_accessor :apdex_start
|
68
66
|
|
69
67
|
attr_accessor :exceptions,
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
68
|
+
:filtered_params,
|
69
|
+
:jruby_cpu_start,
|
70
|
+
:process_cpu_start,
|
71
|
+
:http_response_code,
|
72
|
+
:response_content_length,
|
73
|
+
:response_content_type,
|
74
|
+
:parent_span_id
|
77
75
|
|
78
76
|
attr_reader :guid,
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
77
|
+
:metrics,
|
78
|
+
:logs,
|
79
|
+
:gc_start_snapshot,
|
80
|
+
:category,
|
81
|
+
:attributes,
|
82
|
+
:payload,
|
83
|
+
:nesting_max_depth,
|
84
|
+
:segments,
|
85
|
+
:end_time,
|
86
|
+
:duration
|
88
87
|
|
89
88
|
attr_writer :sampled,
|
90
|
-
|
89
|
+
:priority
|
91
90
|
|
92
91
|
# Populated with the trace sample once this transaction is completed.
|
93
92
|
attr_reader :transaction_trace
|
@@ -100,13 +99,13 @@ module NewRelic
|
|
100
99
|
Tracer.current_transaction
|
101
100
|
end
|
102
101
|
|
103
|
-
def self.set_default_transaction_name(partial_name, category = nil) #THREAD_LOCAL_ACCESS
|
104
|
-
txn
|
102
|
+
def self.set_default_transaction_name(partial_name, category = nil) # THREAD_LOCAL_ACCESS
|
103
|
+
txn = tl_current
|
105
104
|
name = name_from_partial(partial_name, category || txn.category)
|
106
105
|
txn.set_default_transaction_name(name, category)
|
107
106
|
end
|
108
107
|
|
109
|
-
def self.set_overriding_transaction_name(partial_name, category = nil) #THREAD_LOCAL_ACCESS
|
108
|
+
def self.set_overriding_transaction_name(partial_name, category = nil) # THREAD_LOCAL_ACCESS
|
110
109
|
txn = tl_current
|
111
110
|
return unless txn
|
112
111
|
|
@@ -119,38 +118,16 @@ module NewRelic
|
|
119
118
|
"#{namer.prefix_for_category(self, category)}#{partial_name}"
|
120
119
|
end
|
121
120
|
|
122
|
-
def self.wrap(state, name, category, options = {})
|
123
|
-
Deprecator.deprecate 'Transaction.wrap',
|
124
|
-
'Tracer#in_transaction'
|
125
|
-
|
126
|
-
finishable = Tracer.start_transaction_or_segment(
|
127
|
-
name: name,
|
128
|
-
category: category,
|
129
|
-
options: options
|
130
|
-
)
|
131
|
-
|
132
|
-
begin
|
133
|
-
# We shouldn't raise from Transaction.start, but only wrap the yield
|
134
|
-
# to be absolutely sure we don't report agent problems as app errors
|
135
|
-
yield
|
136
|
-
rescue => e
|
137
|
-
Transaction.notice_error(e)
|
138
|
-
raise e
|
139
|
-
ensure
|
140
|
-
finishable.finish if finishable
|
141
|
-
end
|
142
|
-
end
|
143
|
-
|
144
121
|
def self.start_new_transaction(state, category, options)
|
145
122
|
txn = Transaction.new(category, options)
|
146
123
|
state.reset(txn)
|
147
124
|
txn.state = state
|
148
|
-
txn.start
|
125
|
+
txn.start(options)
|
149
126
|
txn
|
150
127
|
end
|
151
128
|
|
152
129
|
def self.nested_transaction_name(name)
|
153
|
-
if name.start_with?(CONTROLLER_PREFIX
|
130
|
+
if name.start_with?(CONTROLLER_PREFIX, OTHER_TRANSACTION_PREFIX)
|
154
131
|
"#{NESTED_TRANSACTION_PREFIX}#{name}"
|
155
132
|
else
|
156
133
|
name
|
@@ -165,7 +142,7 @@ module NewRelic
|
|
165
142
|
end
|
166
143
|
|
167
144
|
# See NewRelic::Agent.notice_error for options and commentary
|
168
|
-
def self.notice_error(e, options={})
|
145
|
+
def self.notice_error(e, options = {})
|
169
146
|
if txn = Tracer.current_transaction
|
170
147
|
txn.notice_error(e, options)
|
171
148
|
elsif NewRelic::Agent.instance
|
@@ -178,7 +155,7 @@ module NewRelic
|
|
178
155
|
#
|
179
156
|
# @api public
|
180
157
|
#
|
181
|
-
def self.recording_web_transaction? #THREAD_LOCAL_ACCESS
|
158
|
+
def self.recording_web_transaction? # THREAD_LOCAL_ACCESS
|
182
159
|
NewRelic::Agent.record_api_supportability_metric(:recording_web_transaction?)
|
183
160
|
|
184
161
|
txn = tl_current
|
@@ -202,7 +179,7 @@ module NewRelic
|
|
202
179
|
if txn = tl_current
|
203
180
|
txn.add_agent_attribute(key, value, default_destinations)
|
204
181
|
else
|
205
|
-
NewRelic::Agent.logger.debug
|
182
|
+
NewRelic::Agent.logger.debug("Attempted to add agent attribute: #{key} without transaction")
|
206
183
|
end
|
207
184
|
end
|
208
185
|
|
@@ -215,7 +192,7 @@ module NewRelic
|
|
215
192
|
if txn = tl_current
|
216
193
|
txn.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
|
217
194
|
else
|
218
|
-
NewRelic::Agent.logger.debug
|
195
|
+
NewRelic::Agent.logger.debug("Attempted to merge untrusted attributes without transaction")
|
219
196
|
end
|
220
197
|
end
|
221
198
|
|
@@ -229,8 +206,8 @@ module NewRelic
|
|
229
206
|
if defined? JRuby
|
230
207
|
begin
|
231
208
|
require 'java'
|
232
|
-
java_import
|
233
|
-
java_import
|
209
|
+
java_import('java.lang.management.ManagementFactory')
|
210
|
+
java_import('com.sun.management.OperatingSystemMXBean')
|
234
211
|
@@java_classes_loaded = true
|
235
212
|
rescue
|
236
213
|
end
|
@@ -238,17 +215,19 @@ module NewRelic
|
|
238
215
|
|
239
216
|
def initialize(category, options)
|
240
217
|
@nesting_max_depth = 0
|
241
|
-
@
|
218
|
+
@current_segment_by_thread = {}
|
219
|
+
@current_segment_lock = Mutex.new
|
242
220
|
@segments = []
|
243
221
|
|
244
222
|
self.default_name = options[:transaction_name]
|
245
|
-
@overridden_name
|
246
|
-
@frozen_name
|
223
|
+
@overridden_name = nil
|
224
|
+
@frozen_name = nil
|
247
225
|
|
248
226
|
@category = category
|
249
|
-
@start_time =
|
227
|
+
@start_time = Process.clock_gettime(Process::CLOCK_REALTIME)
|
250
228
|
@end_time = nil
|
251
229
|
@duration = nil
|
230
|
+
|
252
231
|
@apdex_start = options[:apdex_start_time] || @start_time
|
253
232
|
@jruby_cpu_start = jruby_cpu_time
|
254
233
|
@process_cpu_start = process_cpu
|
@@ -257,6 +236,7 @@ module NewRelic
|
|
257
236
|
|
258
237
|
@exceptions = {}
|
259
238
|
@metrics = TransactionMetrics.new
|
239
|
+
@logs = PrioritySampledBuffer.new(NewRelic::Agent.instance.log_event_aggregator.capacity)
|
260
240
|
@guid = NewRelic::Agent::GuidGenerator.generate_guid
|
261
241
|
|
262
242
|
@ignore_this_transaction = false
|
@@ -274,18 +254,39 @@ module NewRelic
|
|
274
254
|
merge_request_parameters(@filtered_params)
|
275
255
|
|
276
256
|
if request = options[:request]
|
277
|
-
@request_attributes = RequestAttributes.new
|
257
|
+
@request_attributes = RequestAttributes.new(request)
|
278
258
|
else
|
279
259
|
@request_attributes = nil
|
280
260
|
end
|
281
261
|
end
|
282
262
|
|
263
|
+
def parent_thread_id
|
264
|
+
::Thread.current.nr_parent_thread_id if ::Thread.current.respond_to?(:nr_parent_thread_id)
|
265
|
+
end
|
266
|
+
|
267
|
+
def current_segment
|
268
|
+
current_thread_id = ::Thread.current.object_id
|
269
|
+
return current_segment_by_thread[current_thread_id] if current_segment_by_thread[current_thread_id]
|
270
|
+
return current_segment_by_thread[parent_thread_id] if current_segment_by_thread[parent_thread_id]
|
271
|
+
|
272
|
+
current_segment_by_thread[@starting_thread_id]
|
273
|
+
end
|
274
|
+
|
275
|
+
def set_current_segment(new_segment)
|
276
|
+
@current_segment_lock.synchronize { current_segment_by_thread[::Thread.current.object_id] = new_segment }
|
277
|
+
end
|
278
|
+
|
279
|
+
def remove_current_segment_by_thread_id(id)
|
280
|
+
@current_segment_lock.synchronize { current_segment_by_thread.delete(id) }
|
281
|
+
end
|
282
|
+
|
283
283
|
def distributed_tracer
|
284
284
|
@distributed_tracer ||= DistributedTracer.new(self)
|
285
285
|
end
|
286
286
|
|
287
287
|
def sampled?
|
288
288
|
return unless Agent.config[:'distributed_tracing.enabled']
|
289
|
+
|
289
290
|
if @sampled.nil?
|
290
291
|
@sampled = NewRelic::Agent.instance.adaptive_sampler.sampled?
|
291
292
|
end
|
@@ -293,7 +294,7 @@ module NewRelic
|
|
293
294
|
end
|
294
295
|
|
295
296
|
def trace_id
|
296
|
-
@trace_id ||= NewRelic::Agent::GuidGenerator.generate_guid
|
297
|
+
@trace_id ||= NewRelic::Agent::GuidGenerator.generate_guid(32)
|
297
298
|
end
|
298
299
|
|
299
300
|
def trace_id=(value)
|
@@ -316,7 +317,7 @@ module NewRelic
|
|
316
317
|
@request_attributes && @request_attributes.port
|
317
318
|
end
|
318
319
|
|
319
|
-
# This transaction-local hash may be used as
|
320
|
+
# This transaction-local hash may be used as temporary storage by
|
320
321
|
# instrumentation that needs to pass data from one instrumentation point
|
321
322
|
# to another.
|
322
323
|
#
|
@@ -348,6 +349,7 @@ module NewRelic
|
|
348
349
|
|
349
350
|
def set_default_transaction_name(name, category)
|
350
351
|
return log_frozen_name(name) if name_frozen?
|
352
|
+
|
351
353
|
if influences_transaction_name?(category)
|
352
354
|
self.default_name = name
|
353
355
|
@category = category if category
|
@@ -356,6 +358,7 @@ module NewRelic
|
|
356
358
|
|
357
359
|
def set_overriding_transaction_name(name, category)
|
358
360
|
return log_frozen_name(name) if name_frozen?
|
361
|
+
|
359
362
|
if influences_transaction_name?(category)
|
360
363
|
self.overridden_name = name
|
361
364
|
@category = category if category
|
@@ -373,9 +376,9 @@ module NewRelic
|
|
373
376
|
|
374
377
|
def best_name
|
375
378
|
@frozen_name ||
|
376
|
-
|
377
|
-
|
378
|
-
|
379
|
+
@overridden_name ||
|
380
|
+
@default_name ||
|
381
|
+
NewRelic::Agent::UNKNOWN_METRIC
|
379
382
|
end
|
380
383
|
|
381
384
|
# For common interface with Trace
|
@@ -413,32 +416,33 @@ module NewRelic
|
|
413
416
|
@frozen_name ? true : false
|
414
417
|
end
|
415
418
|
|
416
|
-
def start
|
419
|
+
def start(options = {})
|
417
420
|
return if !state.is_execution_traced?
|
418
421
|
|
419
|
-
sql_sampler.on_start_transaction(state,
|
422
|
+
sql_sampler.on_start_transaction(state, request_path)
|
420
423
|
NewRelic::Agent.instance.events.notify(:start_transaction)
|
421
424
|
NewRelic::Agent::TransactionTimeAggregator.transaction_start(start_time)
|
422
425
|
|
423
426
|
ignore! if user_defined_rules_ignore?
|
424
427
|
|
425
|
-
create_initial_segment
|
426
|
-
Segment.merge_untrusted_agent_attributes \
|
428
|
+
create_initial_segment(options)
|
429
|
+
Segment.merge_untrusted_agent_attributes( \
|
427
430
|
@filtered_params,
|
428
431
|
:'request.parameters',
|
429
432
|
AttributeFilter::DST_SPAN_EVENTS
|
433
|
+
)
|
430
434
|
end
|
431
435
|
|
432
436
|
def initial_segment
|
433
437
|
segments.first
|
434
438
|
end
|
435
439
|
|
436
|
-
def create_initial_segment
|
437
|
-
segment = create_segment
|
440
|
+
def create_initial_segment(options = {})
|
441
|
+
segment = create_segment(@default_name, options)
|
438
442
|
segment.record_scoped_metric = false
|
439
443
|
end
|
440
444
|
|
441
|
-
def create_segment(name)
|
445
|
+
def create_segment(name, options = {})
|
442
446
|
summary_metrics = nil
|
443
447
|
|
444
448
|
if name.start_with?(MIDDLEWARE_PREFIX)
|
@@ -452,6 +456,10 @@ module NewRelic
|
|
452
456
|
unscoped_metrics: summary_metrics
|
453
457
|
)
|
454
458
|
|
459
|
+
# #code_information will glean the code info out of the options hash
|
460
|
+
# if it exists or noop otherwise
|
461
|
+
segment.code_information = options
|
462
|
+
|
455
463
|
segment
|
456
464
|
end
|
457
465
|
|
@@ -461,18 +469,19 @@ module NewRelic
|
|
461
469
|
merge_request_parameters(options[:filtered_params])
|
462
470
|
end
|
463
471
|
|
464
|
-
@ignore_apdex = options[:ignore_apdex] if options.key?
|
465
|
-
@ignore_enduser = options[:ignore_enduser] if options.key?
|
472
|
+
@ignore_apdex = options[:ignore_apdex] if options.key?(:ignore_apdex)
|
473
|
+
@ignore_enduser = options[:ignore_enduser] if options.key?(:ignore_enduser)
|
466
474
|
|
467
|
-
nest_initial_segment if
|
468
|
-
nested_name = self.class.nested_transaction_name
|
469
|
-
|
475
|
+
nest_initial_segment if segments.length == 1
|
476
|
+
nested_name = self.class.nested_transaction_name(options[:transaction_name])
|
477
|
+
|
478
|
+
segment = create_segment(nested_name, options)
|
470
479
|
set_default_transaction_name(options[:transaction_name], category)
|
471
480
|
segment
|
472
481
|
end
|
473
482
|
|
474
483
|
def nest_initial_segment
|
475
|
-
self.initial_segment.name = self.class.nested_transaction_name
|
484
|
+
self.initial_segment.name = self.class.nested_transaction_name(initial_segment.name)
|
476
485
|
initial_segment.record_scoped_metric = true
|
477
486
|
end
|
478
487
|
|
@@ -505,8 +514,9 @@ module NewRelic
|
|
505
514
|
|
506
515
|
def finish
|
507
516
|
return unless state.is_execution_traced?
|
508
|
-
|
509
|
-
@
|
517
|
+
|
518
|
+
@end_time = Process.clock_gettime(Process::CLOCK_REALTIME)
|
519
|
+
@duration = @end_time - @start_time
|
510
520
|
freeze_name_and_execute_if_not_ignored
|
511
521
|
|
512
522
|
if nesting_max_depth == 1
|
@@ -554,6 +564,7 @@ module NewRelic
|
|
554
564
|
|
555
565
|
record_exceptions
|
556
566
|
record_transaction_event
|
567
|
+
record_log_events
|
557
568
|
merge_metrics
|
558
569
|
send_transaction_finished_event
|
559
570
|
end
|
@@ -561,19 +572,16 @@ module NewRelic
|
|
561
572
|
def assign_segment_dt_attributes
|
562
573
|
dt_payload = distributed_tracer.trace_state_payload || distributed_tracer.distributed_trace_payload
|
563
574
|
parent_attributes = {}
|
564
|
-
DistributedTraceAttributes.copy_parent_attributes
|
565
|
-
parent_attributes.each { |k, v| initial_segment.add_agent_attribute
|
575
|
+
DistributedTraceAttributes.copy_parent_attributes(self, dt_payload, parent_attributes)
|
576
|
+
parent_attributes.each { |k, v| initial_segment.add_agent_attribute(k, v) }
|
566
577
|
end
|
567
578
|
|
568
579
|
def assign_agent_attributes
|
569
580
|
default_destinations = AttributeFilter::DST_TRANSACTION_TRACER |
|
570
|
-
|
571
|
-
|
581
|
+
AttributeFilter::DST_TRANSACTION_EVENTS |
|
582
|
+
AttributeFilter::DST_ERROR_COLLECTOR
|
572
583
|
|
573
584
|
if http_response_code
|
574
|
-
add_agent_attribute(:httpResponseCode, http_response_code.to_s, default_destinations)
|
575
|
-
# Sending status code as an int with http.statusCode key is correct
|
576
|
-
# The above attribute is deprecated and should be removed in agent version 7.0.0
|
577
585
|
add_agent_attribute(:'http.statusCode', http_response_code, default_destinations)
|
578
586
|
end
|
579
587
|
|
@@ -586,7 +594,7 @@ module NewRelic
|
|
586
594
|
end
|
587
595
|
|
588
596
|
if @request_attributes
|
589
|
-
@request_attributes.assign_agent_attributes
|
597
|
+
@request_attributes.assign_agent_attributes(self)
|
590
598
|
end
|
591
599
|
|
592
600
|
display_host = Agent.config[:'process_host.display_name']
|
@@ -623,10 +631,10 @@ module NewRelic
|
|
623
631
|
# This method returns transport_duration in seconds. Transport duration
|
624
632
|
# is stored in milliseconds on the payload, but it's needed in seconds
|
625
633
|
# for metrics and intrinsics.
|
626
|
-
def calculate_transport_duration
|
634
|
+
def calculate_transport_duration(distributed_trace_payload)
|
627
635
|
return unless distributed_trace_payload
|
628
636
|
|
629
|
-
duration =
|
637
|
+
duration = start_time - (distributed_trace_payload.timestamp / 1000.0)
|
630
638
|
duration < 0 ? 0 : duration
|
631
639
|
end
|
632
640
|
|
@@ -646,14 +654,14 @@ module NewRelic
|
|
646
654
|
|
647
655
|
def generate_payload
|
648
656
|
@payload = {
|
649
|
-
:name
|
650
|
-
:bucket
|
651
|
-
:start_timestamp
|
652
|
-
:duration
|
653
|
-
:metrics
|
654
|
-
:attributes
|
655
|
-
:error
|
656
|
-
:priority
|
657
|
+
:name => @frozen_name,
|
658
|
+
:bucket => recording_web_transaction? ? :request : :background,
|
659
|
+
:start_timestamp => start_time,
|
660
|
+
:duration => duration,
|
661
|
+
:metrics => @metrics,
|
662
|
+
:attributes => @attributes,
|
663
|
+
:error => false,
|
664
|
+
:priority => priority
|
657
665
|
}
|
658
666
|
|
659
667
|
distributed_tracer.append_payload(@payload)
|
@@ -666,7 +674,7 @@ module NewRelic
|
|
666
674
|
end
|
667
675
|
|
668
676
|
def is_synthetics_request?
|
669
|
-
synthetics_payload
|
677
|
+
!synthetics_payload.nil? && !raw_synthetics_header.nil?
|
670
678
|
end
|
671
679
|
|
672
680
|
def synthetics_version
|
@@ -707,7 +715,6 @@ module NewRelic
|
|
707
715
|
when :apdex_s then APDEX_S
|
708
716
|
when :apdex_t then APDEX_T
|
709
717
|
when :apdex_f then APDEX_F
|
710
|
-
else nil
|
711
718
|
end
|
712
719
|
payload[:apdex_perf_zone] = bucket_str if bucket_str
|
713
720
|
end
|
@@ -716,8 +723,8 @@ module NewRelic
|
|
716
723
|
return unless is_synthetics_request?
|
717
724
|
|
718
725
|
payload[:synthetics_resource_id] = synthetics_resource_id
|
719
|
-
payload[:synthetics_job_id]
|
720
|
-
payload[:synthetics_monitor_id]
|
726
|
+
payload[:synthetics_job_id] = synthetics_job_id
|
727
|
+
payload[:synthetics_monitor_id] = synthetics_monitor_id
|
721
728
|
end
|
722
729
|
|
723
730
|
def merge_metrics
|
@@ -727,35 +734,38 @@ module NewRelic
|
|
727
734
|
def record_exceptions
|
728
735
|
error_recorded = false
|
729
736
|
@exceptions.each do |exception, options|
|
730
|
-
options[:uri]
|
731
|
-
options[:port]
|
732
|
-
options[:metric]
|
737
|
+
options[:uri] ||= request_path if request_path
|
738
|
+
options[:port] = request_port if request_port
|
739
|
+
options[:metric] = best_name
|
733
740
|
options[:attributes] = @attributes
|
734
741
|
|
735
|
-
span_id = options.delete
|
742
|
+
span_id = options.delete(:span_id)
|
736
743
|
error_recorded = !!agent.error_collector.notice_error(exception, options, span_id) || error_recorded
|
737
744
|
end
|
738
745
|
payload[:error] = error_recorded if payload
|
739
746
|
end
|
740
747
|
|
741
748
|
# Do not call this. Invoke the class method instead.
|
742
|
-
def notice_error(error, options={}) # :nodoc:
|
743
|
-
|
749
|
+
def notice_error(error, options = {}) # :nodoc:
|
744
750
|
# Only the last error is kept
|
745
|
-
if
|
746
|
-
|
747
|
-
options[:span_id] =
|
751
|
+
if current_segment
|
752
|
+
current_segment.notice_error(error, expected: options[:expected])
|
753
|
+
options[:span_id] = current_segment.guid
|
748
754
|
end
|
749
755
|
|
750
756
|
if @exceptions[error]
|
751
|
-
@exceptions[error].merge!
|
757
|
+
@exceptions[error].merge!(options)
|
752
758
|
else
|
753
759
|
@exceptions[error] = options
|
754
760
|
end
|
755
761
|
end
|
756
762
|
|
757
763
|
def record_transaction_event
|
758
|
-
agent.transaction_event_recorder.record
|
764
|
+
agent.transaction_event_recorder.record(payload)
|
765
|
+
end
|
766
|
+
|
767
|
+
def record_log_events
|
768
|
+
agent.log_event_aggregator.record_batch(self, @logs.to_a)
|
759
769
|
end
|
760
770
|
|
761
771
|
def queue_time
|
@@ -795,8 +805,8 @@ module NewRelic
|
|
795
805
|
record_apdex_metrics(APDEX_METRIC, APDEX_TXN_METRIC_PREFIX, apdex_t)
|
796
806
|
else
|
797
807
|
record_apdex_metrics(APDEX_OTHER_METRIC,
|
798
|
-
|
799
|
-
|
808
|
+
APDEX_OTHER_TXN_METRIC_PREFIX,
|
809
|
+
transaction_specific_apdex_t)
|
800
810
|
end
|
801
811
|
end
|
802
812
|
end
|
@@ -804,9 +814,9 @@ module NewRelic
|
|
804
814
|
def record_apdex_metrics(rollup_metric, transaction_prefix, current_apdex_t)
|
805
815
|
return unless current_apdex_t
|
806
816
|
|
807
|
-
total_duration
|
817
|
+
total_duration = end_time - apdex_start
|
808
818
|
apdex_bucket_global = apdex_bucket(total_duration, current_apdex_t)
|
809
|
-
apdex_bucket_txn
|
819
|
+
apdex_bucket_txn = apdex_bucket(duration, current_apdex_t)
|
810
820
|
|
811
821
|
@metrics.record_unscoped(rollup_metric, apdex_bucket_global, current_apdex_t)
|
812
822
|
@metrics.record_unscoped(APDEX_ALL_METRIC, apdex_bucket_global, current_apdex_t)
|
@@ -824,7 +834,7 @@ module NewRelic
|
|
824
834
|
end
|
825
835
|
|
826
836
|
def threshold
|
827
|
-
|
837
|
+
source_class = Agent.config.source(:'transaction_tracer.transaction_threshold').class
|
828
838
|
if source_class == Configuration::DefaultSource
|
829
839
|
apdex_t * 4
|
830
840
|
else
|
@@ -832,7 +842,7 @@ module NewRelic
|
|
832
842
|
end
|
833
843
|
end
|
834
844
|
|
835
|
-
def with_database_metric_name(model, method, product=nil)
|
845
|
+
def with_database_metric_name(model, method, product = nil)
|
836
846
|
previous = self.instrumentation_state[:datastore_override]
|
837
847
|
model_name = case model
|
838
848
|
when Class
|
@@ -841,7 +851,7 @@ module NewRelic
|
|
841
851
|
model
|
842
852
|
else
|
843
853
|
model.to_s
|
844
|
-
|
854
|
+
end
|
845
855
|
self.instrumentation_state[:datastore_override] = [method, model_name, product]
|
846
856
|
yield
|
847
857
|
ensure
|
@@ -852,6 +862,10 @@ module NewRelic
|
|
852
862
|
attributes.merge_custom_attributes(p)
|
853
863
|
end
|
854
864
|
|
865
|
+
def add_log_event(event)
|
866
|
+
logs.append(event: event)
|
867
|
+
end
|
868
|
+
|
855
869
|
def recording_web_transaction?
|
856
870
|
web_category?(@category)
|
857
871
|
end
|
@@ -870,11 +884,13 @@ module NewRelic
|
|
870
884
|
|
871
885
|
def normal_cpu_burn
|
872
886
|
return unless @process_cpu_start
|
887
|
+
|
873
888
|
process_cpu - @process_cpu_start
|
874
889
|
end
|
875
890
|
|
876
891
|
def jruby_cpu_burn
|
877
892
|
return unless @jruby_cpu_start
|
893
|
+
|
878
894
|
jruby_cpu_time - @jruby_cpu_start
|
879
895
|
end
|
880
896
|
|
@@ -910,18 +926,21 @@ module NewRelic
|
|
910
926
|
|
911
927
|
def process_cpu
|
912
928
|
return nil if defined? JRuby
|
929
|
+
|
913
930
|
p = Process.times
|
914
931
|
p.stime + p.utime
|
915
932
|
end
|
916
933
|
|
917
934
|
def jruby_cpu_time
|
918
935
|
return nil unless @@java_classes_loaded
|
936
|
+
|
919
937
|
threadMBean = Java::JavaLangManagement::ManagementFactory.getThreadMXBean()
|
920
938
|
|
921
939
|
return nil unless threadMBean.isCurrentThreadCpuTimeSupported
|
922
|
-
java_utime = threadMBean.getCurrentThreadUserTime() # ns
|
923
940
|
|
924
|
-
|
941
|
+
java_utime = threadMBean.getCurrentThreadUserTime() # ns
|
942
|
+
|
943
|
+
-1 == java_utime ? 0.0 : java_utime / 1e9
|
925
944
|
rescue => e
|
926
945
|
::NewRelic::Agent.logger.log_once(:warn, :jruby_cpu_time, JRUBY_CPU_TIME_ERROR, e)
|
927
946
|
::NewRelic::Agent.logger.debug(JRUBY_CPU_TIME_ERROR, e)
|