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,7 +1,8 @@
|
|
1
1
|
# -*- ruby -*-
|
2
2
|
# encoding: utf-8
|
3
3
|
# This file is distributed under New Relic's license terms.
|
4
|
-
# See https://github.com/newrelic/
|
4
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
5
|
+
# frozen_string_literal: true
|
5
6
|
|
6
7
|
require 'new_relic/agent/event_aggregator'
|
7
8
|
require 'new_relic/agent/transaction_error_primitive'
|
@@ -10,20 +11,22 @@ require 'new_relic/agent/priority_sampled_buffer'
|
|
10
11
|
module NewRelic
|
11
12
|
module Agent
|
12
13
|
class ErrorEventAggregator < EventAggregator
|
14
|
+
include NewRelic::Coerce
|
13
15
|
|
14
16
|
named :ErrorEventAggregator
|
15
17
|
capacity_key :'error_collector.max_event_samples_stored'
|
16
|
-
|
18
|
+
enabled_keys :'error_collector.enabled',
|
19
|
+
:'error_collector.capture_events'
|
17
20
|
buffer_class PrioritySampledBuffer
|
18
21
|
|
19
|
-
def record noticed_error, transaction_payload = nil
|
22
|
+
def record noticed_error, transaction_payload = nil, span_id = nil
|
20
23
|
return unless enabled?
|
21
24
|
|
22
|
-
priority = (transaction_payload && transaction_payload[:priority]) || rand
|
25
|
+
priority = float!((transaction_payload && transaction_payload[:priority]) || rand)
|
23
26
|
|
24
27
|
@lock.synchronize do
|
25
28
|
@buffer.append(priority: priority) do
|
26
|
-
create_event(noticed_error, transaction_payload)
|
29
|
+
create_event(noticed_error, transaction_payload, span_id)
|
27
30
|
end
|
28
31
|
notify_if_full
|
29
32
|
end
|
@@ -31,8 +34,8 @@ module NewRelic
|
|
31
34
|
|
32
35
|
private
|
33
36
|
|
34
|
-
def create_event noticed_error, transaction_payload
|
35
|
-
TransactionErrorPrimitive.create noticed_error, transaction_payload
|
37
|
+
def create_event noticed_error, transaction_payload, span_id
|
38
|
+
TransactionErrorPrimitive.create noticed_error, transaction_payload, span_id
|
36
39
|
end
|
37
40
|
end
|
38
41
|
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
|
module NewRelic
|
7
7
|
module Agent
|
@@ -91,6 +91,7 @@ module NewRelic
|
|
91
91
|
|
92
92
|
def register_config_callbacks
|
93
93
|
Agent.config.register_callback(:'error_collector.enabled') do |enabled|
|
94
|
+
reset! if enabled == false
|
94
95
|
::NewRelic::Agent.logger.debug "Error traces will #{enabled ? '' : 'not '}be sent to the New Relic service."
|
95
96
|
end
|
96
97
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/priority_sampled_buffer'
|
6
6
|
|
@@ -8,20 +8,6 @@ module NewRelic
|
|
8
8
|
module Agent
|
9
9
|
class EventAggregator
|
10
10
|
class << self
|
11
|
-
# This architecture requires that every aggregator
|
12
|
-
# implementation provide its own `named`, `capacity_key`, and
|
13
|
-
# `enabled_...` settings. In particular, we do not allow
|
14
|
-
# subclasses to share these values from an intermediate
|
15
|
-
# superclass.
|
16
|
-
|
17
|
-
def inherited(subclass)
|
18
|
-
# Prevent uninitialized variable warnings; we have to do
|
19
|
-
# this as soon as the subclass is defined, before its
|
20
|
-
# implementor calls enabled_key() or enabled_fn().
|
21
|
-
subclass.instance_variable_set(:@enabled_key, nil)
|
22
|
-
subclass.instance_variable_set(:@enabled_fn, nil)
|
23
|
-
end
|
24
|
-
|
25
11
|
def named named = nil
|
26
12
|
named ? @named = named.to_s.freeze : @named
|
27
13
|
end
|
@@ -30,10 +16,25 @@ module NewRelic
|
|
30
16
|
key ? @capacity_key = key : @capacity_key
|
31
17
|
end
|
32
18
|
|
33
|
-
|
34
|
-
|
19
|
+
# An aggregator can specify one or more keys to check to see if it is
|
20
|
+
# enabled. Multiple keys will be &&'d and the enabled status of the
|
21
|
+
# aggregator will be reset when agent configuration changes.
|
22
|
+
|
23
|
+
def enabled_keys *keys
|
24
|
+
if keys.empty?
|
25
|
+
@enabled_keys ||= []
|
26
|
+
else
|
27
|
+
@enabled_keys = Array(keys)
|
28
|
+
@enabled_fn = ->(){ @enabled_keys.all? { |k| Agent.config[k] } }
|
29
|
+
end
|
35
30
|
end
|
36
31
|
|
32
|
+
alias_method :enabled_key, :enabled_keys
|
33
|
+
|
34
|
+
# This can be used instead of `enabled_key(s)` for more fine grained
|
35
|
+
# control over whether an aggregator should be enabled. The enabled fn
|
36
|
+
# will be reevaluated after configuration changes
|
37
|
+
|
37
38
|
def enabled_fn fn = nil
|
38
39
|
fn ? @enabled_fn = fn : @enabled_fn
|
39
40
|
end
|
@@ -47,13 +48,13 @@ module NewRelic
|
|
47
48
|
end
|
48
49
|
end
|
49
50
|
|
50
|
-
def initialize
|
51
|
+
def initialize events
|
51
52
|
@lock = Mutex.new
|
52
53
|
@buffer = self.class.buffer_class.new NewRelic::Agent.config[self.class.capacity_key]
|
53
|
-
@enabled = false
|
54
|
+
@enabled = self.class.enabled_fn ? self.class.enabled_fn.call : false
|
54
55
|
@notified_full = false
|
55
56
|
register_capacity_callback
|
56
|
-
register_enabled_callback
|
57
|
+
register_enabled_callback events
|
57
58
|
after_initialize
|
58
59
|
end
|
59
60
|
|
@@ -66,7 +67,6 @@ module NewRelic
|
|
66
67
|
end
|
67
68
|
|
68
69
|
def enabled?
|
69
|
-
return self.class.enabled_fn.call if self.class.enabled_fn
|
70
70
|
@enabled
|
71
71
|
end
|
72
72
|
|
@@ -126,18 +126,12 @@ module NewRelic
|
|
126
126
|
end
|
127
127
|
end
|
128
128
|
|
129
|
-
def register_enabled_callback
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
NewRelic::Agent.config.register_callback(self.class.enabled_key) do |enabled|
|
137
|
-
# intentionally unsynchronized for liveness
|
138
|
-
@enabled = enabled
|
139
|
-
::NewRelic::Agent.logger.debug "#{self.class.named} will #{enabled ? '' : 'not '}be sent to the New Relic service."
|
140
|
-
end
|
129
|
+
def register_enabled_callback events
|
130
|
+
events.subscribe(:server_source_configuration_added) {
|
131
|
+
@enabled = self.class.enabled_fn.call
|
132
|
+
reset! if @enabled == false
|
133
|
+
::NewRelic::Agent.logger.debug "#{self.class.named} will #{@enabled ? '' : 'not '}be sent to the New Relic service."
|
134
|
+
}
|
141
135
|
end
|
142
136
|
|
143
137
|
def notify_if_full
|
@@ -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
|
# EventBuffer is intended to be an abstract base class. It should not be
|
6
6
|
# instantiated directly. Subclasses should define an `append_event` method
|
@@ -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::Agent
|
6
6
|
# Basic mechanism for the agent instance to provide agent-wide eventing.
|
@@ -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
|
|
@@ -1,10 +1,10 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
4
|
|
5
5
|
require 'new_relic/agent/transaction/tracing'
|
6
|
-
require 'new_relic/agent/cross_app_tracing'
|
7
|
-
require 'new_relic/agent/cross_app_payload'
|
6
|
+
require 'new_relic/agent/distributed_tracing/cross_app_tracing'
|
7
|
+
require 'new_relic/agent/distributed_tracing/cross_app_payload'
|
8
8
|
|
9
9
|
module NewRelic
|
10
10
|
module Agent
|
@@ -78,7 +78,7 @@ module NewRelic
|
|
78
78
|
#
|
79
79
|
if txn_info = rmd[NON_HTTP_CAT_TXN_HEADER]
|
80
80
|
payload = CrossAppPayload.new(id, transaction, txn_info)
|
81
|
-
transaction.cross_app_payload = payload
|
81
|
+
transaction.distributed_tracer.cross_app_payload = payload
|
82
82
|
|
83
83
|
CrossAppTracing.assign_intrinsic_transaction_attributes state
|
84
84
|
end
|
@@ -112,16 +112,16 @@ module NewRelic
|
|
112
112
|
NewRelic::Agent.record_api_supportability_metric(:get_response_metadata)
|
113
113
|
return unless CrossAppTracing.cross_app_enabled?
|
114
114
|
|
115
|
-
return unless (
|
116
|
-
return unless (
|
115
|
+
return unless (txn = Tracer.current_transaction)
|
116
|
+
return unless (payload = txn.distributed_tracer.cross_app_payload)
|
117
117
|
|
118
118
|
# must freeze the name since we're responding with it
|
119
119
|
#
|
120
|
-
|
120
|
+
txn.freeze_name_and_execute_if_not_ignored do
|
121
121
|
# build response payload
|
122
122
|
#
|
123
123
|
rmd = {
|
124
|
-
NewRelicAppData:
|
124
|
+
NewRelicAppData: payload.as_json_array(NON_HTTP_CAT_CONTENT_LENGTH)
|
125
125
|
}
|
126
126
|
|
127
127
|
# obfuscate the generated response metadata JSON
|
@@ -0,0 +1,28 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
|
5
|
+
module NewRelic
|
6
|
+
module Agent
|
7
|
+
module GuidGenerator
|
8
|
+
|
9
|
+
HEX_DIGITS = (0..15).map{|i| i.to_s(16)}
|
10
|
+
|
11
|
+
module_function
|
12
|
+
|
13
|
+
# This method intentionally does not use SecureRandom, because it relies
|
14
|
+
# on urandom, which raises an exception in MRI when the interpreter runs
|
15
|
+
# out of allocated file descriptors.
|
16
|
+
# The guids generated by this method may not be _secure_, but they are
|
17
|
+
# random enough for our purposes.
|
18
|
+
def generate_guid length = 16
|
19
|
+
guid = ''
|
20
|
+
length.times do |a|
|
21
|
+
guid << HEX_DIGITS[rand(16)]
|
22
|
+
end
|
23
|
+
guid
|
24
|
+
end
|
25
|
+
|
26
|
+
end
|
27
|
+
end
|
28
|
+
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
|
module NewRelic
|
6
6
|
module Agent
|
data/lib/new_relic/agent/heap.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
|
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
|
require 'socket'
|
5
5
|
|
6
6
|
module NewRelic
|
@@ -13,12 +13,18 @@ module NewRelic
|
|
13
13
|
dyno_name = "#{matching_prefix}.*" if matching_prefix
|
14
14
|
dyno_name
|
15
15
|
else
|
16
|
-
Socket.gethostname
|
16
|
+
Socket.gethostname.force_encoding(Encoding::UTF_8)
|
17
17
|
end
|
18
18
|
end
|
19
19
|
|
20
|
+
# calling hostname with -f on some OS's (NetBSD, FreeBSD, Solaris)
|
21
|
+
# produces invalid option error, but doesn't raise exception. Instead,
|
22
|
+
# we get back empty string. So, solution here is to check for non-zero
|
23
|
+
# exit status and retry the command without the -f flag.
|
20
24
|
def self.get_fqdn
|
21
|
-
%x[hostname -f].chomp!
|
25
|
+
fqdn = %x[hostname -f].chomp!
|
26
|
+
fqdn = %x[hostname].chomp! unless $?.exitstatus.zero?
|
27
|
+
fqdn
|
22
28
|
rescue => e
|
23
29
|
NewRelic::Agent.logger.debug "Unable to determine fqdn #{e}"
|
24
30
|
nil
|
@@ -0,0 +1,82 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
5
|
+
|
6
|
+
module NewRelic
|
7
|
+
module Agent
|
8
|
+
module HTTPClients
|
9
|
+
MUST_IMPLEMENT_ERROR = "Subclasses of %s must implement a :%s method"
|
10
|
+
WHINY_NIL_ERROR = "%s cannot initialize with a nil wrapped_response object."
|
11
|
+
|
12
|
+
# This class provides a public interface for wrapping HTTP requests. This
|
13
|
+
# may be used to create wrappers that are compatible with New Relic's
|
14
|
+
# external request API.
|
15
|
+
#
|
16
|
+
# @api public
|
17
|
+
class AbstractRequest
|
18
|
+
|
19
|
+
def []
|
20
|
+
raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
|
21
|
+
end
|
22
|
+
|
23
|
+
def []=
|
24
|
+
raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
|
25
|
+
end
|
26
|
+
|
27
|
+
def type
|
28
|
+
raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
|
29
|
+
end
|
30
|
+
|
31
|
+
def host_from_header
|
32
|
+
raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
|
33
|
+
end
|
34
|
+
|
35
|
+
def host
|
36
|
+
raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
|
37
|
+
end
|
38
|
+
|
39
|
+
def method
|
40
|
+
raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
|
41
|
+
end
|
42
|
+
end
|
43
|
+
|
44
|
+
# This class implements the adaptor pattern and is used internally provide
|
45
|
+
# uniform access to the underlying HTTP Client's response object
|
46
|
+
# NOTE: response_object should be non-nil!
|
47
|
+
class AbstractResponse # :nodoc:
|
48
|
+
|
49
|
+
def initialize wrapped_response
|
50
|
+
if wrapped_response.nil?
|
51
|
+
raise ArgumentError, WHINY_NIL_ERROR % self.class
|
52
|
+
end
|
53
|
+
@wrapped_response = wrapped_response
|
54
|
+
end
|
55
|
+
|
56
|
+
def has_status_code?
|
57
|
+
!!status_code
|
58
|
+
end
|
59
|
+
|
60
|
+
# most HTTP client libraries report the HTTP status code as an integer, so
|
61
|
+
# we expect status_code to be set only if a non-zero value is present
|
62
|
+
def status_code
|
63
|
+
@status_code ||= get_status_code
|
64
|
+
end
|
65
|
+
|
66
|
+
private
|
67
|
+
|
68
|
+
def get_status_code_using method_name
|
69
|
+
return unless @wrapped_response.respond_to?(method_name)
|
70
|
+
code = @wrapped_response.send(method_name).to_i
|
71
|
+
code == 0 ? nil : code
|
72
|
+
end
|
73
|
+
|
74
|
+
# Override this method to memoize a non-zero Integer representation
|
75
|
+
# of HTTP status code from the response object
|
76
|
+
def get_status_code
|
77
|
+
get_status_code_using :code
|
78
|
+
end
|
79
|
+
end
|
80
|
+
end
|
81
|
+
end
|
82
|
+
end
|
@@ -1,19 +1,20 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/
|
3
|
+
# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
|
-
|
6
|
+
require_relative 'abstract'
|
6
7
|
|
7
8
|
module NewRelic
|
8
9
|
module Agent
|
9
10
|
module HTTPClients
|
10
11
|
|
11
12
|
class CurbRequest
|
12
|
-
CURB = 'Curb'
|
13
|
-
LHOST = 'host'
|
14
|
-
UHOST = 'Host'
|
13
|
+
CURB = 'Curb'
|
14
|
+
LHOST = 'host'
|
15
|
+
UHOST = 'Host'
|
15
16
|
|
16
|
-
def initialize
|
17
|
+
def initialize curlobj
|
17
18
|
@curlobj = curlobj
|
18
19
|
end
|
19
20
|
|
@@ -34,41 +35,45 @@ module NewRelic
|
|
34
35
|
end
|
35
36
|
|
36
37
|
def []( key )
|
37
|
-
@curlobj.headers[
|
38
|
+
@curlobj.headers[key]
|
38
39
|
end
|
39
40
|
|
40
|
-
def []=(
|
41
|
-
@curlobj.headers[
|
41
|
+
def []=(key, value)
|
42
|
+
@curlobj.headers[key] = value
|
42
43
|
end
|
43
44
|
|
44
45
|
def uri
|
45
|
-
@uri ||=
|
46
|
+
@uri ||= URIUtil.parse_and_normalize_url(@curlobj.url)
|
46
47
|
end
|
47
48
|
end
|
48
49
|
|
50
|
+
class CurbResponse < AbstractResponse
|
49
51
|
|
50
|
-
|
51
|
-
|
52
|
-
def initialize(curlobj)
|
52
|
+
def initialize wrapped_response
|
53
|
+
super wrapped_response
|
53
54
|
@headers = {}
|
54
|
-
@curlobj = curlobj
|
55
55
|
end
|
56
56
|
|
57
57
|
def [](key)
|
58
|
-
@headers[
|
58
|
+
@headers[key.downcase]
|
59
59
|
end
|
60
60
|
|
61
61
|
def to_hash
|
62
62
|
@headers.dup
|
63
63
|
end
|
64
64
|
|
65
|
-
def append_header_data
|
66
|
-
key, value = data.split(
|
67
|
-
@headers[
|
68
|
-
@
|
69
|
-
@
|
65
|
+
def append_header_data data
|
66
|
+
key, value = data.split(/:\s*/, 2)
|
67
|
+
@headers[key.downcase] = value
|
68
|
+
@wrapped_response._nr_header_str ||= String.new
|
69
|
+
@wrapped_response._nr_header_str << data
|
70
70
|
end
|
71
71
|
|
72
|
+
private
|
73
|
+
|
74
|
+
def get_status_code
|
75
|
+
get_status_code_using :response_code
|
76
|
+
end
|
72
77
|
end
|
73
78
|
|
74
79
|
end
|