newrelic_rpm 6.7.0.359 → 6.15.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +8 -0
- data/CHANGELOG.md +493 -4
- data/CONTRIBUTING.md +106 -19
- data/Gemfile +6 -2
- data/Guardfile +18 -1
- data/LICENSE +208 -38
- data/README.md +81 -85
- data/ROADMAP.md +24 -0
- data/Rakefile +2 -0
- data/THIRD_PARTY_NOTICES.md +213 -0
- data/bin/nrdebug +1 -1
- data/init.rb +1 -1
- data/install.rb +1 -1
- data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
- data/lib/new_relic/agent/agent.rb +63 -44
- data/lib/new_relic/agent/agent_logger.rb +5 -1
- data/lib/new_relic/agent/attribute_filter.rb +8 -8
- data/lib/new_relic/agent/attribute_processing.rb +1 -1
- data/lib/new_relic/agent/attributes.rb +152 -0
- data/lib/new_relic/agent/audit_logger.rb +11 -1
- data/lib/new_relic/agent/autostart.rb +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 +1 -1
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +138 -17
- data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
- data/lib/new_relic/agent/configuration/environment_source.rb +1 -1
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -1
- data/lib/new_relic/agent/configuration/high_security_source.rb +1 -1
- data/lib/new_relic/agent/configuration/manager.rb +1 -1
- data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
- data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
- data/lib/new_relic/agent/configuration/security_policy_source.rb +1 -1
- data/lib/new_relic/agent/configuration/server_source.rb +2 -2
- data/lib/new_relic/agent/configuration/yaml_source.rb +12 -7
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +4 -12
- data/lib/new_relic/agent/connect/response_handler.rb +1 -1
- data/lib/new_relic/agent/custom_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
- data/lib/new_relic/agent/database/obfuscator.rb +1 -1
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
- data/lib/new_relic/agent/database.rb +2 -3
- data/lib/new_relic/agent/database_adapter.rb +33 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +3 -3
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +9 -9
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo.rb +2 -2
- data/lib/new_relic/agent/datastores/redis.rb +1 -1
- data/lib/new_relic/agent/datastores.rb +1 -1
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +3 -2
- data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +61 -46
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +84 -0
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +75 -0
- data/lib/new_relic/agent/{distributed_trace_payload.rb → distributed_tracing/distributed_trace_payload.rb} +25 -102
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +39 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +246 -0
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +126 -0
- data/lib/new_relic/agent/distributed_tracing.rb +156 -7
- data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
- data/lib/new_relic/agent/error_collector.rb +34 -17
- data/lib/new_relic/agent/error_event_aggregator.rb +8 -6
- data/lib/new_relic/agent/error_trace_aggregator.rb +1 -1
- data/lib/new_relic/agent/event_aggregator.rb +1 -1
- 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 +8 -8
- 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 +8 -2
- data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +25 -20
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +29 -14
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -22
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +11 -12
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +17 -5
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -7
- data/lib/new_relic/agent/http_clients/uri_util.rb +12 -11
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +6 -8
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +5 -1
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +12 -4
- data/lib/new_relic/agent/instrumentation/active_job.rb +1 -1
- 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 +1 -1
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +35 -11
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +8 -3
- data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +9 -5
- 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 +48 -29
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/curb.rb +66 -19
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +4 -2
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +3 -1
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +7 -4
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
- data/lib/new_relic/agent/instrumentation/excon.rb +2 -2
- data/lib/new_relic/agent/instrumentation/grape.rb +6 -11
- data/lib/new_relic/agent/instrumentation/http.rb +7 -4
- data/lib/new_relic/agent/instrumentation/httpclient.rb +6 -4
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +7 -3
- data/lib/new_relic/agent/instrumentation/memcache.rb +4 -2
- 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 +1 -1
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +9 -7
- data/lib/new_relic/agent/instrumentation/mongo.rb +10 -4
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +36 -3
- data/lib/new_relic/agent/instrumentation/net.rb +48 -28
- data/lib/new_relic/agent/instrumentation/net_prepend.rb +40 -0
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +26 -2
- data/lib/new_relic/agent/instrumentation/padrino.rb +3 -1
- 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 +3 -1
- 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/rails_notifications/action_cable.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rake.rb +2 -1
- data/lib/new_relic/agent/instrumentation/redis.rb +12 -6
- data/lib/new_relic/agent/instrumentation/resque.rb +4 -1
- data/lib/new_relic/agent/instrumentation/sequel.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +48 -24
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra.rb +1 -2
- data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +24 -7
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +1 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +1 -1
- data/lib/new_relic/agent/log_once.rb +1 -1
- data/lib/new_relic/agent/logging.rb +19 -5
- data/lib/new_relic/agent/memory_logger.rb +1 -1
- data/lib/new_relic/agent/messaging.rb +6 -74
- data/lib/new_relic/agent/method_tracer.rb +10 -8
- data/lib/new_relic/agent/method_tracer_helpers.rb +3 -3
- 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} +2 -2
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +3 -5
- data/lib/new_relic/agent/monitors.rb +27 -0
- data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -1
- data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -1
- data/lib/new_relic/agent/new_relic_service.rb +34 -10
- 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 +1 -1
- 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 +8 -5
- data/lib/new_relic/agent/range_extensions.rb +1 -1
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine.rb +1 -1
- data/lib/new_relic/agent/sampler.rb +1 -1
- data/lib/new_relic/agent/sampler_collection.rb +1 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/memory_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +2 -1
- data/lib/new_relic/agent/span_event_primitive.rb +108 -54
- data/lib/new_relic/agent/sql_sampler.rb +6 -6
- data/lib/new_relic/agent/stats.rb +1 -1
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +2 -2
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
- data/lib/new_relic/agent/stats_engine.rb +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 +13 -4
- data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
- data/lib/new_relic/agent/threading/backtrace_node.rb +1 -1
- data/lib/new_relic/agent/threading/backtrace_service.rb +1 -1
- data/lib/new_relic/agent/threading/thread_profile.rb +1 -1
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +34 -19
- data/lib/new_relic/agent/transaction/abstract_segment.rb +32 -5
- data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +177 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +58 -147
- 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 +3 -5
- data/lib/new_relic/agent/transaction/trace_builder.rb +1 -1
- data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
- data/lib/new_relic/agent/transaction/trace_node.rb +11 -9
- data/lib/new_relic/agent/transaction/tracing.rb +1 -1
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction.rb +104 -82
- 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 +1 -1
- data/lib/new_relic/agent/transaction_metrics.rb +1 -1
- data/lib/new_relic/agent/transaction_sampler.rb +1 -1
- data/lib/new_relic/agent/transaction_time_aggregator.rb +1 -1
- 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 +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/vm.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +1 -1
- data/lib/new_relic/agent.rb +49 -8
- data/lib/new_relic/cli/command.rb +1 -1
- data/lib/new_relic/cli/commands/deployments.rb +1 -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 +42 -0
- data/lib/new_relic/control/class_methods.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/rails_notifications.rb +1 -1
- data/lib/new_relic/control/frameworks/ruby.rb +1 -1
- data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/instance_methods.rb +11 -2
- data/lib/new_relic/control/instrumentation.rb +1 -1
- data/lib/new_relic/control/server_methods.rb +1 -1
- data/lib/new_relic/control.rb +1 -1
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +9 -5
- data/lib/new_relic/environment_report.rb +2 -4
- data/lib/new_relic/helper.rb +1 -1
- data/lib/new_relic/language_support.rb +1 -1
- data/lib/new_relic/latest_changes.rb +2 -2
- data/lib/new_relic/local_environment.rb +1 -1
- data/lib/new_relic/metric_data.rb +1 -1
- data/lib/new_relic/metric_spec.rb +1 -1
- data/lib/new_relic/noticed_error.rb +39 -18
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +1 -1
- data/lib/new_relic/rack/browser_monitoring.rb +6 -1
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +1 -1
- data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +17 -1
- data/lib/new_relic/version.rb +2 -2
- 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/multiverse.rb +35 -1
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +6 -1
- data/newrelic_rpm.gemspec +18 -13
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +339 -72
- metadata +104 -41
- data/.travis.yml +0 -175
- data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -40
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/agent/transaction/attributes.rb +0 -154
- 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,12 +1,13 @@
|
|
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
|
# This module builds the data structures necessary to create a Span
|
6
7
|
# event for a segment.
|
7
8
|
|
8
9
|
require 'new_relic/agent/payload_metric_mapping'
|
9
|
-
require 'new_relic/agent/distributed_trace_payload'
|
10
|
+
require 'new_relic/agent/distributed_tracing/distributed_trace_payload'
|
10
11
|
|
11
12
|
module NewRelic
|
12
13
|
module Agent
|
@@ -15,70 +16,81 @@ module NewRelic
|
|
15
16
|
extend self
|
16
17
|
|
17
18
|
# Strings for static keys of the event structure
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
19
|
+
ELLIPSIS = '...'
|
20
|
+
TYPE_KEY = 'type'
|
21
|
+
TRACE_ID_KEY = 'traceId'
|
22
|
+
GUID_KEY = 'guid'
|
23
|
+
PARENT_ID_KEY = 'parentId'
|
24
|
+
GRANDPARENT_ID_KEY = 'grandparentId'
|
25
|
+
TRANSACTION_ID_KEY = 'transactionId'
|
26
|
+
SAMPLED_KEY = 'sampled'
|
27
|
+
PRIORITY_KEY = 'priority'
|
28
|
+
TIMESTAMP_KEY = 'timestamp'
|
29
|
+
DURATION_KEY = 'duration'
|
30
|
+
NAME_KEY = 'name'
|
31
|
+
CATEGORY_KEY = 'category'
|
32
|
+
HTTP_URL_KEY = 'http.url'
|
33
|
+
HTTP_METHOD_KEY = 'http.method'
|
34
|
+
HTTP_STATUS_CODE_KEY = 'http.statusCode'
|
35
|
+
COMPONENT_KEY = 'component'
|
36
|
+
DB_INSTANCE_KEY = 'db.instance'
|
37
|
+
DB_STATEMENT_KEY = 'db.statement'
|
38
|
+
PEER_ADDRESS_KEY = 'peer.address'
|
39
|
+
PEER_HOSTNAME_KEY = 'peer.hostname'
|
40
|
+
SPAN_KIND_KEY = 'span.kind'
|
41
|
+
ENTRY_POINT_KEY = 'nr.entryPoint'
|
42
|
+
TRUSTED_PARENT_KEY = "trustedParentId"
|
43
|
+
TRACING_VENDORS_KEY = "tracingVendors"
|
44
|
+
TRANSACTION_NAME_KEY = 'transaction.name'
|
39
45
|
|
40
46
|
# Strings for static values of the event structure
|
41
|
-
EVENT_TYPE = 'Span'
|
42
|
-
GENERIC_CATEGORY = 'generic'
|
43
|
-
HTTP_CATEGORY = 'http'
|
44
|
-
DATASTORE_CATEGORY = 'datastore'
|
45
|
-
CLIENT = 'client'
|
46
|
-
|
47
|
-
#
|
48
|
-
|
47
|
+
EVENT_TYPE = 'Span'
|
48
|
+
GENERIC_CATEGORY = 'generic'
|
49
|
+
HTTP_CATEGORY = 'http'
|
50
|
+
DATASTORE_CATEGORY = 'datastore'
|
51
|
+
CLIENT = 'client'
|
52
|
+
|
53
|
+
# Builds a Hash of error attributes as well as the Span ID when
|
54
|
+
# an error is present. Otherwise, returns nil when no error present.
|
55
|
+
def error_attributes segment
|
56
|
+
return if Agent.config[:high_security] || !segment.noticed_error
|
57
|
+
segment.noticed_error.build_error_attributes
|
58
|
+
segment.noticed_error_attributes
|
59
|
+
end
|
49
60
|
|
50
|
-
def for_segment
|
61
|
+
def for_segment segment
|
51
62
|
intrinsics = intrinsics_for(segment)
|
52
63
|
intrinsics[CATEGORY_KEY] = GENERIC_CATEGORY
|
53
64
|
|
54
|
-
[intrinsics,
|
65
|
+
[intrinsics, custom_attributes(segment), agent_attributes(segment)]
|
55
66
|
end
|
56
67
|
|
57
|
-
def for_external_request_segment
|
68
|
+
def for_external_request_segment segment
|
58
69
|
intrinsics = intrinsics_for(segment)
|
59
70
|
|
60
71
|
intrinsics[COMPONENT_KEY] = segment.library
|
61
72
|
intrinsics[HTTP_METHOD_KEY] = segment.procedure
|
73
|
+
intrinsics[HTTP_STATUS_CODE_KEY] = segment.http_status_code if segment.http_status_code
|
62
74
|
intrinsics[CATEGORY_KEY] = HTTP_CATEGORY
|
63
75
|
intrinsics[SPAN_KIND_KEY] = CLIENT
|
64
76
|
|
65
|
-
agent_attributes = {}
|
77
|
+
agent_attributes = error_attributes(segment) || {}
|
66
78
|
|
67
79
|
if allowed?(HTTP_URL_KEY)
|
68
80
|
agent_attributes[HTTP_URL_KEY] = truncate(segment.uri)
|
69
81
|
end
|
70
82
|
|
71
|
-
[intrinsics,
|
83
|
+
[intrinsics, custom_attributes(segment), agent_attributes]
|
72
84
|
end
|
73
85
|
|
74
|
-
def for_datastore_segment
|
86
|
+
def for_datastore_segment segment
|
75
87
|
intrinsics = intrinsics_for(segment)
|
76
88
|
|
77
89
|
intrinsics[COMPONENT_KEY] = segment.product
|
78
90
|
intrinsics[SPAN_KIND_KEY] = CLIENT
|
79
91
|
intrinsics[CATEGORY_KEY] = DATASTORE_CATEGORY
|
80
92
|
|
81
|
-
agent_attributes = {}
|
93
|
+
agent_attributes = error_attributes(segment) || {}
|
82
94
|
|
83
95
|
if segment.database_name && allowed?(DB_INSTANCE_KEY)
|
84
96
|
agent_attributes[DB_INSTANCE_KEY] = truncate(segment.database_name)
|
@@ -96,48 +108,90 @@ module NewRelic
|
|
96
108
|
agent_attributes[DB_STATEMENT_KEY] = truncate(segment.nosql_statement, 2000)
|
97
109
|
end
|
98
110
|
|
99
|
-
[intrinsics,
|
111
|
+
[intrinsics, custom_attributes(segment), agent_attributes]
|
100
112
|
end
|
101
113
|
|
102
114
|
private
|
103
115
|
|
104
|
-
def intrinsics_for
|
105
|
-
intrinsics =
|
106
|
-
{
|
116
|
+
def intrinsics_for segment
|
117
|
+
intrinsics = {
|
107
118
|
TYPE_KEY => EVENT_TYPE,
|
108
119
|
TRACE_ID_KEY => segment.transaction.trace_id,
|
109
120
|
GUID_KEY => segment.guid,
|
110
121
|
TRANSACTION_ID_KEY => segment.transaction.guid,
|
111
|
-
SAMPLED_KEY => segment.transaction.sampled?,
|
112
122
|
PRIORITY_KEY => segment.transaction.priority,
|
113
123
|
TIMESTAMP_KEY => milliseconds_since_epoch(segment),
|
114
124
|
DURATION_KEY => segment.duration,
|
115
125
|
NAME_KEY => segment.name
|
116
126
|
}
|
117
127
|
|
118
|
-
|
119
|
-
|
128
|
+
# with infinite-tracing, transactions may or may not be sampled!
|
129
|
+
if segment.transaction.sampled?
|
130
|
+
intrinsics[SAMPLED_KEY] = true
|
131
|
+
end
|
120
132
|
|
121
|
-
|
133
|
+
if segment.parent.nil?
|
134
|
+
intrinsics[ENTRY_POINT_KEY] = true
|
135
|
+
if txn = segment.transaction
|
136
|
+
if header_data = txn.distributed_tracer.trace_context_header_data
|
137
|
+
if trace_state_vendors = header_data.trace_state_vendors
|
138
|
+
intrinsics[TRACING_VENDORS_KEY] = trace_state_vendors unless trace_state_vendors == NewRelic::EMPTY_STR
|
139
|
+
end
|
140
|
+
end
|
141
|
+
if trace_state_payload = txn.distributed_tracer.trace_state_payload
|
142
|
+
intrinsics[TRUSTED_PARENT_KEY] = trace_state_payload.id if trace_state_payload.id
|
143
|
+
end
|
144
|
+
end
|
145
|
+
end
|
146
|
+
|
147
|
+
if parent_id = parent_guid(segment)
|
148
|
+
intrinsics[PARENT_ID_KEY] = parent_id
|
149
|
+
end
|
150
|
+
|
151
|
+
if segment.transaction_name
|
152
|
+
intrinsics[TRANSACTION_NAME_KEY] = segment.transaction_name
|
153
|
+
end
|
122
154
|
|
123
155
|
intrinsics
|
124
156
|
end
|
125
157
|
|
126
|
-
def
|
158
|
+
def custom_attributes segment
|
159
|
+
attributes = segment.attributes
|
160
|
+
if attributes
|
161
|
+
result = attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_SPAN_EVENTS)
|
162
|
+
result.freeze
|
163
|
+
else
|
164
|
+
NewRelic::EMPTY_HASH
|
165
|
+
end
|
166
|
+
end
|
167
|
+
|
168
|
+
def merge_and_freeze_attributes agent_attributes, error_attributes
|
169
|
+
return agent_attributes.freeze unless error_attributes
|
170
|
+
return error_attributes.freeze if agent_attributes.equal?(NewRelic::EMPTY_HASH)
|
171
|
+
agent_attributes.merge!(error_attributes).freeze
|
172
|
+
end
|
173
|
+
|
174
|
+
def agent_attributes segment
|
175
|
+
agent_attributes = segment.attributes
|
176
|
+
.agent_attributes_for(NewRelic::Agent::AttributeFilter::DST_SPAN_EVENTS)
|
177
|
+
error_attributes = error_attributes(segment)
|
178
|
+
return NewRelic::EMPTY_HASH unless agent_attributes || error_attributes
|
179
|
+
merge_and_freeze_attributes(agent_attributes, error_attributes)
|
180
|
+
end
|
181
|
+
|
182
|
+
def parent_guid segment
|
127
183
|
if segment.parent
|
128
184
|
segment.parent.guid
|
129
|
-
elsif
|
130
|
-
|
185
|
+
elsif txn = segment.transaction
|
186
|
+
txn.distributed_tracer.parent_guid
|
131
187
|
end
|
132
188
|
end
|
133
189
|
|
134
|
-
def milliseconds_since_epoch
|
190
|
+
def milliseconds_since_epoch segment
|
135
191
|
Integer(segment.start_time.to_f * 1000.0)
|
136
192
|
end
|
137
193
|
|
138
|
-
|
139
|
-
|
140
|
-
def truncate(value, max_size=255)
|
194
|
+
def truncate value, max_size=255
|
141
195
|
value = value.to_s
|
142
196
|
if value.bytesize > max_size
|
143
197
|
value.byteslice(0, max_size - 2).chop! << ELLIPSIS
|
@@ -146,7 +200,7 @@ module NewRelic
|
|
146
200
|
end
|
147
201
|
end
|
148
202
|
|
149
|
-
def allowed?
|
203
|
+
def allowed? key
|
150
204
|
NewRelic::Agent.instance.attribute_filter.allows_key?(key, AttributeFilter::DST_SPAN_EVENTS)
|
151
205
|
end
|
152
206
|
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 'zlib'
|
6
6
|
require 'base64'
|
@@ -156,13 +156,13 @@ module NewRelic
|
|
156
156
|
|
157
157
|
PRIORITY = "priority".freeze
|
158
158
|
|
159
|
-
def
|
159
|
+
def distributed_trace_attributes(state)
|
160
160
|
transaction = state.current_transaction
|
161
161
|
params = nil
|
162
|
-
if transaction && transaction.distributed_trace_payload
|
162
|
+
if transaction && transaction.distributed_tracer.distributed_trace_payload
|
163
163
|
params = {}
|
164
|
-
payload = transaction.distributed_trace_payload
|
165
|
-
|
164
|
+
payload = transaction.distributed_tracer.distributed_trace_payload
|
165
|
+
DistributedTraceAttributes.copy_from_transaction transaction, payload, params
|
166
166
|
params[PRIORITY] = transaction.priority
|
167
167
|
end
|
168
168
|
params
|
@@ -176,7 +176,7 @@ module NewRelic
|
|
176
176
|
if state.is_sql_recorded?
|
177
177
|
if duration > Agent.config[:'slow_sql.explain_threshold']
|
178
178
|
backtrace = caller.join("\n")
|
179
|
-
params =
|
179
|
+
params = distributed_trace_attributes state
|
180
180
|
data.sql_data << SlowSql.new(statement, metric_name, duration, backtrace, params)
|
181
181
|
end
|
182
182
|
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
|
module NewRelic
|
5
5
|
module Agent
|
6
6
|
class Stats
|
@@ -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
|
# -*- coding: utf-8 -*-
|
6
6
|
module NewRelic
|
@@ -99,7 +99,7 @@ module NewRelic
|
|
99
99
|
|
100
100
|
# When using GC::Profiler, it's important to periodically call
|
101
101
|
# GC::Profiler.clear in order to avoid unbounded growth in the number
|
102
|
-
# of GC
|
102
|
+
# of GC records that are stored. However, we actually do this
|
103
103
|
# internally within MonotonicGCProfiler on calls to #total_time_s,
|
104
104
|
# so the reset here is a no-op.
|
105
105
|
def reset; 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
|
# A Hash-like class for storing metric data.
|
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
|
require 'new_relic/agent/stats_engine/gc_profiler'
|
6
6
|
require 'new_relic/agent/stats_engine/stats_hash'
|
@@ -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
|
@@ -11,7 +11,7 @@ module NewRelic
|
|
11
11
|
{
|
12
12
|
:type => :ruby,
|
13
13
|
:name => "MRI",
|
14
|
-
:supported => ["2.0.0", "~>2.1.0", "~>2.2.0", "~>2.3.0", "~>2.4.0", "~>2.5.0"],
|
14
|
+
:supported => ["2.0.0", "~>2.1.0", "~>2.2.0", "~>2.3.0", "~>2.4.0", "~>2.5.0", "~>2.6.0", "~>2.7.0"],
|
15
15
|
:deprecated => ["1.8.6", "1.8.7", "1.9.2", "1.9.3"],
|
16
16
|
:url => "https://www.ruby-lang.org",
|
17
17
|
:feed => "https://www.ruby-lang.org/en/feeds/news.rss",
|
@@ -119,7 +119,7 @@ module NewRelic
|
|
119
119
|
:activerecord =>
|
120
120
|
{
|
121
121
|
:type => :database,
|
122
|
-
:supported => ["~>3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0", "~>5.0.0", "~>5.1.0"],
|
122
|
+
:supported => ["~>3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0", "~>5.0.0", "~>5.1.0", "~>6.0.0"],
|
123
123
|
:deprecated => ["~>2.0.0", "~>2.1.0", "~>2.2.0", "~>2.3.0",],
|
124
124
|
:url => "https://rubygems.org/gems/activerecord",
|
125
125
|
:feed => "https://rubygems.org/gems/activerecord/versions.atom",
|
@@ -1,7 +1,7 @@
|
|
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
5
|
|
6
6
|
require 'new_relic/agent/event_aggregator'
|
7
7
|
require 'new_relic/agent/timestamp_sampled_buffer'
|
@@ -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
|
# This module is intended to provide access to information about the host OS and
|
6
6
|
# [virtual] machine. It intentionally does no caching and maintains no state -
|
@@ -170,11 +170,20 @@ module NewRelic
|
|
170
170
|
|
171
171
|
container_id = case cpu_cgroup
|
172
172
|
# docker native driver w/out systemd (fs)
|
173
|
-
when /[0-9a-f]{64}/
|
173
|
+
when /[0-9a-f]{64,}/
|
174
|
+
if $&.length == 64
|
175
|
+
$&
|
176
|
+
else # container ID is too long
|
177
|
+
::NewRelic::Agent.logger.debug("Ignoring docker ID of invalid length: '#{cpu_cgroup}'")
|
178
|
+
return
|
179
|
+
end
|
174
180
|
# docker native driver with systemd
|
175
|
-
when '/'
|
181
|
+
when '/' then nil
|
176
182
|
# in a cgroup, but we don't recognize its format
|
177
|
-
when /docker/
|
183
|
+
when /docker\/.*[^0-9a-f]/ then
|
184
|
+
::NewRelic::Agent.logger.debug("Cgroup indicates docker but container_id has invalid characters: '#{cpu_cgroup}'")
|
185
|
+
return
|
186
|
+
when /docker/ then
|
178
187
|
::NewRelic::Agent.logger.debug("Cgroup indicates docker but container_id unrecognized: '#{cpu_cgroup}'")
|
179
188
|
::NewRelic::Agent.increment_metric "Supportability/utilization/docker/error"
|
180
189
|
return
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
module NewRelic
|
6
6
|
module Agent
|
@@ -1,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
|
require 'new_relic/agent/worker_loop'
|
@@ -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/heap'
|
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
|
require 'new_relic/agent/transaction'
|
6
6
|
require 'new_relic/agent/transaction/segment'
|
@@ -102,9 +102,9 @@ module NewRelic
|
|
102
102
|
# only wrap the yield to be absolutely sure we don't report agent
|
103
103
|
# problems as app errors
|
104
104
|
yield
|
105
|
-
rescue =>
|
106
|
-
current_transaction.notice_error(
|
107
|
-
raise
|
105
|
+
rescue => exception
|
106
|
+
current_transaction.notice_error(exception)
|
107
|
+
raise
|
108
108
|
ensure
|
109
109
|
finishable.finish if finishable
|
110
110
|
end
|
@@ -120,7 +120,7 @@ module NewRelic
|
|
120
120
|
# New-Relic-specific prefix
|
121
121
|
#
|
122
122
|
# @param [Symbol] category +:web+ for web transactions or
|
123
|
-
# +:
|
123
|
+
# +:task+ for background transactions
|
124
124
|
#
|
125
125
|
# @param [Hash] options reserved for New Relic internal use
|
126
126
|
#
|
@@ -157,8 +157,8 @@ module NewRelic
|
|
157
157
|
|
158
158
|
rescue ArgumentError
|
159
159
|
raise
|
160
|
-
rescue =>
|
161
|
-
log_error('start_transaction_or_segment',
|
160
|
+
rescue => exception
|
161
|
+
log_error('start_transaction_or_segment', exception)
|
162
162
|
end
|
163
163
|
|
164
164
|
# Takes name or partial_name and a category.
|
@@ -190,18 +190,18 @@ module NewRelic
|
|
190
190
|
options)
|
191
191
|
rescue ArgumentError
|
192
192
|
raise
|
193
|
-
rescue =>
|
194
|
-
log_error('start_transaction',
|
193
|
+
rescue => exception
|
194
|
+
log_error('start_transaction', exception)
|
195
195
|
end
|
196
196
|
|
197
197
|
def create_distributed_trace_payload
|
198
198
|
return unless txn = current_transaction
|
199
|
-
txn.create_distributed_trace_payload
|
199
|
+
txn.distributed_tracer.create_distributed_trace_payload
|
200
200
|
end
|
201
201
|
|
202
202
|
def accept_distributed_trace_payload(payload)
|
203
203
|
return unless txn = current_transaction
|
204
|
-
txn.accept_distributed_trace_payload(payload)
|
204
|
+
txn.distributed_tracer.accept_distributed_trace_payload(payload)
|
205
205
|
end
|
206
206
|
|
207
207
|
# Returns the currently active segment in the transaction in
|
@@ -251,8 +251,8 @@ module NewRelic
|
|
251
251
|
|
252
252
|
rescue ArgumentError
|
253
253
|
raise
|
254
|
-
rescue =>
|
255
|
-
log_error('start_segment',
|
254
|
+
rescue => exception
|
255
|
+
log_error('start_segment', exception)
|
256
256
|
end
|
257
257
|
|
258
258
|
UNKNOWN = "Unknown".freeze
|
@@ -310,8 +310,8 @@ module NewRelic
|
|
310
310
|
|
311
311
|
rescue ArgumentError
|
312
312
|
raise
|
313
|
-
rescue =>
|
314
|
-
log_error('start_datastore_segment',
|
313
|
+
rescue => exception
|
314
|
+
log_error('start_datastore_segment', exception)
|
315
315
|
end
|
316
316
|
|
317
317
|
# Creates and starts an external request segment using the
|
@@ -357,8 +357,23 @@ module NewRelic
|
|
357
357
|
|
358
358
|
rescue ArgumentError
|
359
359
|
raise
|
360
|
-
rescue =>
|
361
|
-
log_error('start_external_request_segment',
|
360
|
+
rescue => exception
|
361
|
+
log_error('start_external_request_segment', exception)
|
362
|
+
end
|
363
|
+
|
364
|
+
# Will potentially capture and notice an error at the
|
365
|
+
# segment that was executing when error occurred.
|
366
|
+
# if passed +segment+ is something that doesn't
|
367
|
+
# respond to +notice_segment_error+ then this method
|
368
|
+
# is effectively just a yield to the given &block
|
369
|
+
def capture_segment_error segment
|
370
|
+
return unless block_given?
|
371
|
+
yield
|
372
|
+
rescue => exception
|
373
|
+
if segment && segment.is_a?(Transaction::AbstractSegment)
|
374
|
+
segment.notice_error exception
|
375
|
+
end
|
376
|
+
raise
|
362
377
|
end
|
363
378
|
|
364
379
|
# For New Relic internal use only.
|
@@ -390,8 +405,8 @@ module NewRelic
|
|
390
405
|
|
391
406
|
rescue ArgumentError
|
392
407
|
raise
|
393
|
-
rescue =>
|
394
|
-
log_error('start_datastore_segment',
|
408
|
+
rescue => exception
|
409
|
+
log_error('start_datastore_segment', exception)
|
395
410
|
end
|
396
411
|
|
397
412
|
# This method should only be used by Tracer for access to the
|
@@ -1,9 +1,9 @@
|
|
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/range_extensions'
|
6
|
-
require '
|
6
|
+
require 'new_relic/agent/guid_generator'
|
7
7
|
|
8
8
|
module NewRelic
|
9
9
|
module Agent
|
@@ -21,13 +21,15 @@ module NewRelic
|
|
21
21
|
# calculation in all other cases.
|
22
22
|
#
|
23
23
|
attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid
|
24
|
-
attr_accessor :name, :parent, :children_time, :transaction
|
24
|
+
attr_accessor :name, :parent, :children_time, :transaction, :transaction_name
|
25
25
|
attr_writer :record_metrics, :record_scoped_metric, :record_on_finish
|
26
|
+
attr_reader :noticed_error
|
26
27
|
|
27
28
|
def initialize name=nil, start_time=nil
|
28
29
|
@name = name
|
30
|
+
@transaction_name = nil
|
29
31
|
@transaction = nil
|
30
|
-
@guid =
|
32
|
+
@guid = NewRelic::Agent::GuidGenerator.generate_guid
|
31
33
|
@parent = nil
|
32
34
|
@params = nil
|
33
35
|
@start_time = start_time if start_time
|
@@ -42,6 +44,7 @@ module NewRelic
|
|
42
44
|
@record_metrics = true
|
43
45
|
@record_scoped_metric = true
|
44
46
|
@record_on_finish = false
|
47
|
+
@noticed_error = nil
|
45
48
|
end
|
46
49
|
|
47
50
|
def start
|
@@ -119,6 +122,30 @@ module NewRelic
|
|
119
122
|
def transaction_assigned
|
120
123
|
end
|
121
124
|
|
125
|
+
def set_noticed_error noticed_error
|
126
|
+
if @noticed_error
|
127
|
+
NewRelic::Agent.logger.debug \
|
128
|
+
"Segment: #{name} overwriting previously noticed " \
|
129
|
+
"error: #{@noticed_error.inspect} with: #{noticed_error.inspect}"
|
130
|
+
end
|
131
|
+
@noticed_error = noticed_error
|
132
|
+
end
|
133
|
+
|
134
|
+
def notice_error exception, options={}
|
135
|
+
if Agent.config[:high_security]
|
136
|
+
NewRelic::Agent.logger.debug \
|
137
|
+
"Segment: #{name} ignores notice_error for " \
|
138
|
+
"error: #{exception.inspect} because :high_security is enabled"
|
139
|
+
else
|
140
|
+
NewRelic::Agent.instance.error_collector.notice_segment_error self, exception, options
|
141
|
+
end
|
142
|
+
end
|
143
|
+
|
144
|
+
def noticed_error_attributes
|
145
|
+
return unless @noticed_error
|
146
|
+
@noticed_error.attributes_from_notice_error
|
147
|
+
end
|
148
|
+
|
122
149
|
protected
|
123
150
|
|
124
151
|
attr_writer :range_recorded
|
@@ -140,7 +167,7 @@ module NewRelic
|
|
140
167
|
|
141
168
|
if finished?
|
142
169
|
transaction.async = true
|
143
|
-
parent.descendant_complete
|
170
|
+
parent.descendant_complete(self, segment) if parent
|
144
171
|
end
|
145
172
|
end
|
146
173
|
|
@@ -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/transaction/segment'
|
6
6
|
require 'new_relic/agent/datastores/metric_helper'
|