newrelic_rpm 6.2.0.354 → 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 +646 -6
- 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 +168 -185
- 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 +3 -22
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +234 -51
- data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
- data/lib/new_relic/agent/configuration/environment_source.rb +5 -3
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +45 -0
- data/lib/new_relic/agent/configuration/high_security_source.rb +2 -1
- data/lib/new_relic/agent/configuration/manager.rb +14 -10
- 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 +37 -3
- data/lib/new_relic/agent/configuration/yaml_source.rb +12 -7
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/connect/request_builder.rb +61 -0
- data/lib/new_relic/agent/connect/response_handler.rb +61 -0
- data/lib/new_relic/agent/custom_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
- data/lib/new_relic/agent/database/obfuscator.rb +1 -1
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
- data/lib/new_relic/agent/database.rb +2 -3
- data/lib/new_relic/agent/database_adapter.rb +33 -0
- data/lib/new_relic/agent/datastores/metric_helper.rb +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 +36 -19
- data/lib/new_relic/agent/error_event_aggregator.rb +10 -7
- data/lib/new_relic/agent/error_trace_aggregator.rb +2 -1
- data/lib/new_relic/agent/event_aggregator.rb +27 -33
- data/lib/new_relic/agent/event_buffer.rb +1 -1
- data/lib/new_relic/agent/event_listener.rb +1 -1
- data/lib/new_relic/agent/event_loop.rb +1 -1
- data/lib/new_relic/agent/external.rb +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 +9 -3
- data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +25 -20
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +29 -14
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -22
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +11 -12
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +17 -5
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -7
- data/lib/new_relic/agent/http_clients/uri_util.rb +12 -11
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +26 -46
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +51 -75
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +81 -56
- 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 +168 -0
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +35 -11
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +46 -48
- data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +12 -8
- 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 +8 -14
- 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 +100 -0
- 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/{rails5 → rails_notifications}/action_cable.rb +6 -7
- data/lib/new_relic/agent/instrumentation/{rails5 → rails_notifications}/action_controller.rb +4 -4
- data/lib/new_relic/agent/instrumentation/{rails5 → 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 +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 +2 -2
- 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 +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} +4 -4
- 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 -14
- data/lib/new_relic/agent/noticible_error.rb +22 -0
- data/lib/new_relic/agent/null_logger.rb +1 -1
- data/lib/new_relic/agent/obfuscator.rb +1 -1
- data/lib/new_relic/agent/parameter_filtering.rb +19 -6
- data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
- data/lib/new_relic/agent/pipe_channel_manager.rb +1 -1
- data/lib/new_relic/agent/pipe_service.rb +1 -1
- data/lib/new_relic/agent/prepend_supportability.rb +1 -1
- data/lib/new_relic/agent/priority_sampled_buffer.rb +9 -4
- data/lib/new_relic/agent/range_extensions.rb +1 -1
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine.rb +1 -1
- data/lib/new_relic/agent/sampler.rb +1 -1
- data/lib/new_relic/agent/sampler_collection.rb +1 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/memory_sampler.rb +2 -2
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +3 -5
- data/lib/new_relic/agent/span_event_primitive.rb +108 -54
- data/lib/new_relic/agent/sql_sampler.rb +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 +4 -4
- data/lib/new_relic/agent/threading/thread_profile.rb +10 -24
- data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
- data/lib/new_relic/agent/tracer.rb +66 -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 +6 -13
- data/lib/new_relic/agent/transaction/trace_builder.rb +1 -2
- data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
- data/lib/new_relic/agent/transaction/trace_node.rb +11 -9
- data/lib/new_relic/agent/transaction/tracing.rb +1 -1
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
- data/lib/new_relic/agent/transaction.rb +104 -84
- data/lib/new_relic/agent/transaction_error_primitive.rb +11 -16
- data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/transaction_event_primitive.rb +29 -40
- data/lib/new_relic/agent/transaction_event_recorder.rb +4 -4
- data/lib/new_relic/agent/transaction_metrics.rb +1 -1
- data/lib/new_relic/agent/transaction_sampler.rb +2 -6
- data/lib/new_relic/agent/transaction_time_aggregator.rb +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 +98 -8
- data/lib/new_relic/cli/command.rb +1 -1
- data/lib/new_relic/cli/commands/deployments.rb +2 -3
- data/lib/new_relic/cli/commands/install.rb +4 -3
- data/lib/new_relic/coerce.rb +32 -7
- data/lib/new_relic/collection_helper.rb +1 -1
- data/lib/new_relic/constants.rb +42 -0
- data/lib/new_relic/control/class_methods.rb +8 -2
- data/lib/new_relic/control/frameworks/external.rb +1 -1
- data/lib/new_relic/control/frameworks/merb.rb +1 -1
- data/lib/new_relic/control/frameworks/rails.rb +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/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 +16 -9
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/recipes/capistrano3.rb +1 -1
- data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
- data/lib/new_relic/recipes.rb +1 -1
- data/lib/new_relic/supportability_helper.rb +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/config.rake +1 -2
- data/lib/tasks/multiverse.rb +35 -1
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +6 -1
- data/newrelic_rpm.gemspec +22 -10
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +356 -76
- metadata +116 -52
- data/.travis.yml +0 -153
- data/lib/new_relic/agent/commands/xray_session.rb +0 -55
- data/lib/new_relic/agent/commands/xray_session_collection.rb +0 -161
- data/lib/new_relic/agent/cross_app_monitor.rb +0 -110
- data/lib/new_relic/agent/distributed_trace_monitor.rb +0 -40
- data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
- data/lib/new_relic/agent/instrumentation/active_record_4.rb +0 -42
- data/lib/new_relic/agent/instrumentation/active_record_5.rb +0 -41
- data/lib/new_relic/agent/instrumentation/evented_subscriber.rb +0 -104
- data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb +0 -32
- data/lib/new_relic/agent/instrumentation/rails4/action_view.rb +0 -27
- data/lib/new_relic/agent/transaction/attributes.rb +0 -154
- data/lib/new_relic/agent/transaction/xray_sample_buffer.rb +0 -64
- data/lib/new_relic/build.rb +0 -2
- data/lib/new_relic/control/frameworks/rails6.rb +0 -14
- 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
|
# This module was introduced and largely extracted from the transaction event aggregator
|
6
6
|
# when the synthetics container was extracted from it. Its purpose is to create the data
|
@@ -8,7 +8,8 @@
|
|
8
8
|
# the transaction event aggregator and the synthetics container.
|
9
9
|
|
10
10
|
require 'new_relic/agent/payload_metric_mapping'
|
11
|
-
require 'new_relic/agent/distributed_trace_payload'
|
11
|
+
require 'new_relic/agent/distributed_tracing/distributed_trace_payload'
|
12
|
+
require 'new_relic/agent/distributed_tracing/distributed_trace_attributes'
|
12
13
|
|
13
14
|
module NewRelic
|
14
15
|
module Agent
|
@@ -31,16 +32,17 @@ module NewRelic
|
|
31
32
|
SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId".freeze
|
32
33
|
SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId".freeze
|
33
34
|
PRIORITY_KEY = "priority".freeze
|
35
|
+
SPAN_ID_KEY = "spanId".freeze
|
34
36
|
|
35
|
-
def create noticed_error, payload
|
37
|
+
def create noticed_error, payload, span_id
|
36
38
|
[
|
37
|
-
intrinsic_attributes_for(noticed_error, payload),
|
39
|
+
intrinsic_attributes_for(noticed_error, payload, span_id),
|
38
40
|
noticed_error.custom_attributes,
|
39
41
|
noticed_error.agent_attributes
|
40
42
|
]
|
41
43
|
end
|
42
44
|
|
43
|
-
def intrinsic_attributes_for noticed_error, payload
|
45
|
+
def intrinsic_attributes_for noticed_error, payload, span_id
|
44
46
|
attrs = {
|
45
47
|
TYPE_KEY => SAMPLE_TYPE,
|
46
48
|
ERROR_CLASS_KEY => noticed_error.exception_class_name,
|
@@ -49,16 +51,17 @@ module NewRelic
|
|
49
51
|
TIMESTAMP_KEY => noticed_error.timestamp.to_f
|
50
52
|
}
|
51
53
|
|
54
|
+
attrs[SPAN_ID_KEY] = span_id if span_id
|
52
55
|
attrs[PORT_KEY] = noticed_error.request_port if noticed_error.request_port
|
53
56
|
|
54
57
|
if payload
|
55
58
|
attrs[NAME_KEY] = payload[:name]
|
56
59
|
attrs[DURATION_KEY] = payload[:duration]
|
57
|
-
attrs[SAMPLED_KEY] = payload[:
|
58
|
-
attrs[PRIORITY_KEY] = payload[:
|
60
|
+
attrs[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
|
61
|
+
attrs[PRIORITY_KEY] = payload[:priority]
|
59
62
|
append_synthetics payload, attrs
|
60
63
|
append_cat payload, attrs
|
61
|
-
|
64
|
+
DistributedTraceAttributes.copy_to_hash payload, attrs
|
62
65
|
PayloadMetricMapping.append_mapped_metrics payload[:metrics], attrs
|
63
66
|
end
|
64
67
|
|
@@ -75,14 +78,6 @@ module NewRelic
|
|
75
78
|
sample[GUID_KEY] = payload[:guid] if payload[:guid]
|
76
79
|
sample[REFERRING_TRANSACTION_GUID_KEY] = payload[:referring_transaction_guid] if payload[:referring_transaction_guid]
|
77
80
|
end
|
78
|
-
|
79
|
-
def append_distributed_trace_intrinsics payload, sample
|
80
|
-
return unless Agent.config[:'distributed_tracing.enabled']
|
81
|
-
DistributedTracePayload::INTRINSIC_KEYS.each do |key|
|
82
|
-
value = payload[key]
|
83
|
-
sample[key] = value unless value.nil?
|
84
|
-
end
|
85
|
-
end
|
86
81
|
end
|
87
82
|
end
|
88
83
|
end
|
@@ -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 'newrelic_rpm' unless defined?( NewRelic )
|
7
7
|
require 'new_relic/agent' unless defined?( NewRelic::Agent )
|
@@ -1,6 +1,7 @@
|
|
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 was introduced and largely extracted from the transaction event aggregator
|
6
7
|
# when the synthetics container was extracted from it. Its purpose is to create the data
|
@@ -8,7 +9,7 @@
|
|
8
9
|
# the transaction event aggregator and the synthetics container.
|
9
10
|
|
10
11
|
require 'new_relic/agent/payload_metric_mapping'
|
11
|
-
require 'new_relic/agent/
|
12
|
+
require 'new_relic/agent/distributed_tracing/distributed_trace_attributes'
|
12
13
|
|
13
14
|
module NewRelic
|
14
15
|
module Agent
|
@@ -16,30 +17,28 @@ module NewRelic
|
|
16
17
|
include NewRelic::Coerce
|
17
18
|
extend self
|
18
19
|
|
20
|
+
COMMA = ','
|
21
|
+
|
19
22
|
# The type field of the sample
|
20
|
-
SAMPLE_TYPE = 'Transaction'
|
23
|
+
SAMPLE_TYPE = 'Transaction'
|
21
24
|
|
22
25
|
# Strings for static keys of the sample structure
|
23
|
-
TYPE_KEY = 'type'
|
24
|
-
TIMESTAMP_KEY = 'timestamp'
|
25
|
-
NAME_KEY = 'name'
|
26
|
-
DURATION_KEY = 'duration'
|
27
|
-
ERROR_KEY = 'error'
|
28
|
-
SAMPLED_KEY = 'sampled'
|
29
|
-
PRIORITY_KEY = 'priority'
|
30
|
-
GUID_KEY = 'nr.guid'
|
31
|
-
REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'
|
32
|
-
CAT_PATH_HASH_KEY = 'nr.pathHash'
|
33
|
-
CAT_REFERRING_PATH_HASH_KEY = 'nr.referringPathHash'
|
34
|
-
CAT_ALTERNATE_PATH_HASHES_KEY = 'nr.alternatePathHashes'
|
35
|
-
APDEX_PERF_ZONE_KEY = 'nr.apdexPerfZone'
|
36
|
-
SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId"
|
37
|
-
SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId"
|
38
|
-
SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId"
|
39
|
-
|
40
|
-
|
41
|
-
# To avoid allocations when we have empty custom or agent attributes
|
42
|
-
EMPTY_HASH = {}.freeze
|
26
|
+
TYPE_KEY = 'type'
|
27
|
+
TIMESTAMP_KEY = 'timestamp'
|
28
|
+
NAME_KEY = 'name'
|
29
|
+
DURATION_KEY = 'duration'
|
30
|
+
ERROR_KEY = 'error'
|
31
|
+
SAMPLED_KEY = 'sampled'
|
32
|
+
PRIORITY_KEY = 'priority'
|
33
|
+
GUID_KEY = 'nr.guid'
|
34
|
+
REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'
|
35
|
+
CAT_PATH_HASH_KEY = 'nr.pathHash'
|
36
|
+
CAT_REFERRING_PATH_HASH_KEY = 'nr.referringPathHash'
|
37
|
+
CAT_ALTERNATE_PATH_HASHES_KEY = 'nr.alternatePathHashes'
|
38
|
+
APDEX_PERF_ZONE_KEY = 'nr.apdexPerfZone'
|
39
|
+
SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId"
|
40
|
+
SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId"
|
41
|
+
SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId"
|
43
42
|
|
44
43
|
def create(payload)
|
45
44
|
intrinsics = {
|
@@ -51,11 +50,11 @@ module NewRelic
|
|
51
50
|
PRIORITY_KEY => payload[:priority]
|
52
51
|
}
|
53
52
|
|
54
|
-
intrinsics[SAMPLED_KEY] = payload[:
|
53
|
+
intrinsics[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
|
55
54
|
|
56
|
-
|
55
|
+
PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
|
57
56
|
append_optional_attributes(intrinsics, payload)
|
58
|
-
|
57
|
+
DistributedTraceAttributes.copy_to_hash payload, intrinsics
|
59
58
|
|
60
59
|
attributes = payload[:attributes]
|
61
60
|
|
@@ -76,22 +75,12 @@ module NewRelic
|
|
76
75
|
append_cat_alternate_path_hashes(sample, payload)
|
77
76
|
end
|
78
77
|
|
79
|
-
COMMA = ','.freeze
|
80
|
-
|
81
78
|
def append_cat_alternate_path_hashes(sample, payload)
|
82
79
|
if payload.include?(:cat_alternate_path_hashes)
|
83
80
|
sample[CAT_ALTERNATE_PATH_HASHES_KEY] = payload[:cat_alternate_path_hashes].sort.join(COMMA)
|
84
81
|
end
|
85
82
|
end
|
86
83
|
|
87
|
-
def append_distributed_trace_intrinsics(sample, payload)
|
88
|
-
return unless Agent.config[:'distributed_tracing.enabled']
|
89
|
-
DistributedTracePayload::INTRINSIC_KEYS.each do |key|
|
90
|
-
value = payload[key]
|
91
|
-
sample[key] = value unless value.nil?
|
92
|
-
end
|
93
|
-
end
|
94
|
-
|
95
84
|
def optionally_append(sample_key, payload_key, sample, payload)
|
96
85
|
if payload.include?(payload_key)
|
97
86
|
sample[sample_key] = string(payload[payload_key])
|
@@ -100,19 +89,19 @@ module NewRelic
|
|
100
89
|
|
101
90
|
def custom_attributes attributes
|
102
91
|
if attributes
|
103
|
-
result = attributes.custom_attributes_for(
|
92
|
+
result = attributes.custom_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
|
104
93
|
result.freeze
|
105
94
|
else
|
106
|
-
EMPTY_HASH
|
95
|
+
NewRelic::EMPTY_HASH
|
107
96
|
end
|
108
97
|
end
|
109
98
|
|
110
99
|
def agent_attributes attributes
|
111
100
|
if attributes
|
112
|
-
result = attributes.agent_attributes_for(
|
101
|
+
result = attributes.agent_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
|
113
102
|
result.freeze
|
114
103
|
else
|
115
|
-
EMPTY_HASH
|
104
|
+
NewRelic::EMPTY_HASH
|
116
105
|
end
|
117
106
|
end
|
118
107
|
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
|
require 'new_relic/agent/transaction_event_aggregator'
|
5
5
|
require 'new_relic/agent/synthetics_event_aggregator'
|
6
6
|
require 'new_relic/agent/transaction_event_primitive'
|
@@ -14,9 +14,9 @@ module NewRelic
|
|
14
14
|
attr_reader :transaction_event_aggregator
|
15
15
|
attr_reader :synthetics_event_aggregator
|
16
16
|
|
17
|
-
def initialize
|
18
|
-
@transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new
|
19
|
-
@synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new
|
17
|
+
def initialize events
|
18
|
+
@transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new events
|
19
|
+
@synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new events
|
20
20
|
end
|
21
21
|
|
22
22
|
def record payload
|
@@ -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 class represents a set of metrics that were recorded during a single
|
6
6
|
# transaction. Since the name of the transaction is not known until its end, we
|
@@ -1,10 +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/transaction/slowest_sample_buffer'
|
6
6
|
require 'new_relic/agent/transaction/synthetics_sample_buffer'
|
7
|
-
require 'new_relic/agent/transaction/xray_sample_buffer'
|
8
7
|
require 'new_relic/agent/transaction/trace_builder'
|
9
8
|
|
10
9
|
module NewRelic
|
@@ -19,13 +18,10 @@ module NewRelic
|
|
19
18
|
#
|
20
19
|
# @api public
|
21
20
|
class TransactionSampler
|
22
|
-
attr_reader :last_sample
|
21
|
+
attr_reader :last_sample
|
23
22
|
|
24
23
|
def initialize
|
25
|
-
@xray_sample_buffer = NewRelic::Agent::Transaction::XraySampleBuffer.new
|
26
|
-
|
27
24
|
@sample_buffers = []
|
28
|
-
@sample_buffers << @xray_sample_buffer
|
29
25
|
@sample_buffers << NewRelic::Agent::Transaction::SlowestSampleBuffer.new
|
30
26
|
@sample_buffers << NewRelic::Agent::Transaction::SyntheticsSampleBuffer.new
|
31
27
|
|
@@ -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 powers the Busy calculation for the Capacity report in
|
6
6
|
# APM (https://rpm.newrelic.com/accounts/.../applications/.../optimize/capacity_analysis).
|
@@ -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/utilization/vendor'
|
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
|
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 'new_relic/agent/utilization/vendor'
|
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/utilization/vendor'
|
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 'net/http'
|
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/utilization/aws'
|
6
6
|
require 'new_relic/agent/utilization/gcp'
|
@@ -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 'thread'
|
6
6
|
require 'new_relic/agent/vm/snapshot'
|
@@ -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
|
# The GC::Profiler class available on MRI has to be reset periodically to avoid
|
6
6
|
# memory "leaking" in the underlying implementation. However, it's a major
|
@@ -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 'thread'
|
6
6
|
require 'new_relic/agent/vm/snapshot'
|
@@ -45,9 +45,11 @@ module NewRelic
|
|
45
45
|
|
46
46
|
def gather_ruby_vm_stats(snap)
|
47
47
|
if supports?(:method_cache_invalidations)
|
48
|
-
|
49
|
-
|
50
|
-
|
48
|
+
snap.method_cache_invalidations = RubyVM.stat[:global_method_state]
|
49
|
+
end
|
50
|
+
|
51
|
+
if supports?(:constant_cache_invalidations)
|
52
|
+
snap.constant_cache_invalidations = RubyVM.stat[:global_constant_state]
|
51
53
|
end
|
52
54
|
end
|
53
55
|
|
@@ -66,7 +68,7 @@ module NewRelic
|
|
66
68
|
when :minor_gc_count
|
67
69
|
RUBY_VERSION >= '2.1.0'
|
68
70
|
when :method_cache_invalidations
|
69
|
-
RUBY_VERSION >= '2.1.0'
|
71
|
+
RUBY_VERSION >= '2.1.0' && RUBY_VERSION < '3.0.0'
|
70
72
|
when :constant_cache_invalidations
|
71
73
|
RUBY_VERSION >= '2.1.0'
|
72
74
|
else
|
@@ -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
|
data/lib/new_relic/agent/vm.rb
CHANGED
@@ -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/language_support'
|
6
6
|
require 'new_relic/agent/vm/mri_vm'
|
@@ -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 'thread'
|
6
6
|
|
data/lib/new_relic/agent.rb
CHANGED
@@ -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 'forwardable'
|
6
6
|
|
@@ -26,16 +26,15 @@ module NewRelic
|
|
26
26
|
|
27
27
|
require 'new_relic/version'
|
28
28
|
require 'new_relic/local_environment'
|
29
|
-
require 'new_relic/metrics'
|
30
29
|
require 'new_relic/metric_spec'
|
31
30
|
require 'new_relic/metric_data'
|
32
31
|
require 'new_relic/noticed_error'
|
32
|
+
require 'new_relic/agent/noticible_error'
|
33
33
|
require 'new_relic/supportability_helper'
|
34
34
|
|
35
35
|
require 'new_relic/agent/encoding_normalizer'
|
36
36
|
require 'new_relic/agent/stats'
|
37
37
|
require 'new_relic/agent/chained_call'
|
38
|
-
require 'new_relic/agent/cross_app_monitor'
|
39
38
|
require 'new_relic/agent/agent'
|
40
39
|
require 'new_relic/agent/method_tracer'
|
41
40
|
require 'new_relic/agent/worker_loop'
|
@@ -47,6 +46,7 @@ module NewRelic
|
|
47
46
|
require 'new_relic/agent/error_collector'
|
48
47
|
require 'new_relic/agent/sampler'
|
49
48
|
require 'new_relic/agent/database'
|
49
|
+
require 'new_relic/agent/database_adapter'
|
50
50
|
require 'new_relic/agent/datastores'
|
51
51
|
require 'new_relic/agent/pipe_channel_manager'
|
52
52
|
require 'new_relic/agent/configuration'
|
@@ -55,6 +55,9 @@ module NewRelic
|
|
55
55
|
require 'new_relic/agent/system_info'
|
56
56
|
require 'new_relic/agent/external'
|
57
57
|
require 'new_relic/agent/deprecator'
|
58
|
+
require 'new_relic/agent/logging'
|
59
|
+
require 'new_relic/agent/distributed_tracing'
|
60
|
+
require 'new_relic/agent/attribute_processing'
|
58
61
|
|
59
62
|
require 'new_relic/agent/instrumentation/controller_instrumentation'
|
60
63
|
|
@@ -350,10 +353,9 @@ module NewRelic
|
|
350
353
|
# @api public
|
351
354
|
#
|
352
355
|
def manual_start(options={})
|
353
|
-
record_api_supportability_metric(:manual_start)
|
354
|
-
|
355
356
|
raise "Options must be a hash" unless Hash === options
|
356
357
|
NewRelic::Control.instance.init_plugin({ :agent_enabled => true, :sync_startup => true }.merge(options))
|
358
|
+
record_api_supportability_metric(:manual_start)
|
357
359
|
end
|
358
360
|
|
359
361
|
# Register this method as a callback for processes that fork
|
@@ -567,6 +569,12 @@ module NewRelic
|
|
567
569
|
# these custom attributes will also be present in the script injected into
|
568
570
|
# the response body, making them available on Insights PageView events.
|
569
571
|
#
|
572
|
+
#
|
573
|
+
# @param [Hash] params A Hash of attributes to be attached to the transaction event.
|
574
|
+
# Keys should be strings or symbols, and values
|
575
|
+
# may be strings, symbols, numeric values or
|
576
|
+
# booleans.
|
577
|
+
#
|
570
578
|
# @api public
|
571
579
|
#
|
572
580
|
def add_custom_attributes(params) #THREAD_LOCAL_ACCESS
|
@@ -575,11 +583,43 @@ module NewRelic
|
|
575
583
|
if params.is_a? Hash
|
576
584
|
txn = Transaction.tl_current
|
577
585
|
txn.add_custom_attributes(params) if txn
|
586
|
+
|
587
|
+
segment = ::NewRelic::Agent::Tracer.current_segment
|
588
|
+
if segment
|
589
|
+
# Make sure not to override existing segment-level custom attributes
|
590
|
+
segment_custom_keys = segment.attributes.custom_attributes.keys.map(&:to_sym)
|
591
|
+
segment.add_custom_attributes(params.reject { |k, _v| segment_custom_keys.include?(k.to_sym) })
|
592
|
+
end
|
578
593
|
else
|
579
594
|
::NewRelic::Agent.logger.warn("Bad argument passed to #add_custom_attributes. Expected Hash but got #{params.class}")
|
580
595
|
end
|
581
596
|
end
|
582
597
|
|
598
|
+
# Add custom attributes to the span event for the current span. Attributes will be visible on spans in the
|
599
|
+
# New Relic Distributed Tracing UI and on span events in New Relic Insights.
|
600
|
+
#
|
601
|
+
# Custom attributes will not be transmitted when +high_security+ setting is enabled or
|
602
|
+
# +custom_attributes+ setting is disabled.
|
603
|
+
#
|
604
|
+
# @param [Hash] params A Hash of attributes to be attached to the span event.
|
605
|
+
# Keys should be strings or symbols, and values
|
606
|
+
# may be strings, symbols, numeric values or
|
607
|
+
# booleans.
|
608
|
+
#
|
609
|
+
# @see https://docs.newrelic.com/docs/using-new-relic/welcome-new-relic/get-started/glossary#span
|
610
|
+
# @api public
|
611
|
+
def add_custom_span_attributes params
|
612
|
+
record_api_supportability_metric :add_custom_span_attributes
|
613
|
+
|
614
|
+
if params.is_a? Hash
|
615
|
+
if segment = NewRelic::Agent::Tracer.current_segment
|
616
|
+
segment.add_custom_attributes params
|
617
|
+
end
|
618
|
+
else
|
619
|
+
::NewRelic::Agent.logger.warn "Bad argument passed to #add_custom_span_attributes. Expected Hash but got #{params.class}"
|
620
|
+
end
|
621
|
+
end
|
622
|
+
|
583
623
|
# @!endgroup
|
584
624
|
|
585
625
|
# @!group Transaction naming
|
@@ -588,7 +628,9 @@ module NewRelic
|
|
588
628
|
# apply a reasonable default based on framework routing, but in
|
589
629
|
# cases where this is insufficient, this can be used to manually
|
590
630
|
# control the name of the transaction.
|
591
|
-
#
|
631
|
+
#
|
632
|
+
# The category of transaction can be specified via the +:category+ option.
|
633
|
+
# The following are the only valid categories:
|
592
634
|
#
|
593
635
|
# * <tt>:category => :controller</tt> indicates that this is a
|
594
636
|
# controller action and will appear with all the other actions.
|
@@ -638,8 +680,8 @@ module NewRelic
|
|
638
680
|
# @param [String] method the name of the finder method or other method to
|
639
681
|
# identify the operation with.
|
640
682
|
#
|
641
|
-
def with_database_metric_name(model, method = nil, product = nil, &block)
|
642
|
-
if txn =
|
683
|
+
def with_database_metric_name(model, method = nil, product = nil, &block)
|
684
|
+
if txn = Tracer.current_transaction
|
643
685
|
txn.with_database_metric_name(model, method, product, &block)
|
644
686
|
else
|
645
687
|
yield
|
@@ -660,6 +702,54 @@ module NewRelic
|
|
660
702
|
NewRelic::Agent.logger.debug "Ignoring exception during %p event notification" % [event_type]
|
661
703
|
end
|
662
704
|
|
705
|
+
# @!group Trace and Entity metadata
|
706
|
+
|
707
|
+
TRACE_ID_KEY = 'trace.id'.freeze
|
708
|
+
SPAN_ID_KEY = 'span.id'.freeze
|
709
|
+
ENTITY_NAME_KEY = 'entity.name'.freeze
|
710
|
+
ENTITY_TYPE_KEY = 'entity.type'.freeze
|
711
|
+
ENTITY_GUID_KEY = 'entity.guid'.freeze
|
712
|
+
HOSTNAME_KEY = 'hostname'.freeze
|
713
|
+
|
714
|
+
ENTITY_TYPE = 'SERVICE'.freeze
|
715
|
+
|
716
|
+
# Returns a new hash containing trace and entity metadata that can be used
|
717
|
+
# to relate data to a trace or to an entity in APM.
|
718
|
+
#
|
719
|
+
# This hash includes:
|
720
|
+
# * trace.id - The current trace id, if there is a current trace id. This
|
721
|
+
# value may be omitted.
|
722
|
+
# * span.id - The current span id, if there is a current span. This
|
723
|
+
# value may be omitted.
|
724
|
+
# * entity.name - The name of the current application. This is read from
|
725
|
+
# the +app_name+ key in your config. If there are multiple application
|
726
|
+
# names, the first one is used.
|
727
|
+
# * entity.type - The entity type is hardcoded to the string +'SERVICE'+.
|
728
|
+
# * entity.guid - The guid of the current entity.
|
729
|
+
# * hostname - The fully qualified hostname.
|
730
|
+
#
|
731
|
+
# @api public
|
732
|
+
def linking_metadata
|
733
|
+
metadata = Hash.new
|
734
|
+
metadata[ENTITY_NAME_KEY] = config[:app_name][0]
|
735
|
+
metadata[ENTITY_TYPE_KEY] = ENTITY_TYPE
|
736
|
+
metadata[HOSTNAME_KEY] = Hostname.get
|
737
|
+
|
738
|
+
if entity_guid = config[:entity_guid]
|
739
|
+
metadata[ENTITY_GUID_KEY] = entity_guid
|
740
|
+
end
|
741
|
+
|
742
|
+
if trace_id = Tracer.current_trace_id
|
743
|
+
metadata[TRACE_ID_KEY] = trace_id
|
744
|
+
end
|
745
|
+
if span_id = Tracer.current_span_id
|
746
|
+
metadata[SPAN_ID_KEY] = span_id
|
747
|
+
end
|
748
|
+
metadata
|
749
|
+
end
|
750
|
+
|
751
|
+
#@!endgroup
|
752
|
+
|
663
753
|
# @!group Manual browser monitoring configuration
|
664
754
|
|
665
755
|
# This method returns a string suitable for inclusion in a page - known as
|