newrelic_rpm 6.7.0.359 → 6.12.0.367
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +4 -0
- data/.travis.yml +72 -7
- data/CHANGELOG.md +306 -4
- data/CODE_OF_CONDUCT.md +46 -0
- data/CONTRIBUTING.md +56 -12
- data/Gemfile +6 -2
- data/Guardfile +18 -1
- data/LICENSE +208 -38
- data/README.md +61 -89
- 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.rb +49 -7
- data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
- data/lib/new_relic/agent/agent.rb +57 -40
- 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 +1 -1
- data/lib/new_relic/agent/autostart.rb +20 -15
- data/lib/new_relic/agent/chained_call.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command.rb +1 -1
- data/lib/new_relic/agent/commands/agent_command_router.rb +1 -1
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
- data/lib/new_relic/agent/configuration.rb +1 -1
- data/lib/new_relic/agent/configuration/default_source.rb +111 -16
- 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/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.rb +2 -3
- 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/datastores.rb +1 -1
- data/lib/new_relic/agent/datastores/metric_helper.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo.rb +2 -2
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +3 -3
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +9 -9
- data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
- data/lib/new_relic/agent/datastores/redis.rb +1 -1
- data/lib/new_relic/agent/deprecator.rb +1 -1
- data/lib/new_relic/agent/distributed_tracing.rb +156 -7
- 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/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 +4 -3
- data/lib/new_relic/agent/instrumentation.rb +1 -1
- 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 -3
- 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 +82 -24
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +92 -34
- 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 +24 -8
- data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
- data/lib/new_relic/agent/instrumentation/bunny.rb +115 -52
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/curb.rb +93 -28
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +4 -2
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +61 -25
- data/lib/new_relic/agent/instrumentation/excon.rb +2 -2
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +7 -4
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -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.rb +4 -2
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +7 -3
- 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 +12 -4
- 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 +60 -23
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +26 -2
- data/lib/new_relic/agent/instrumentation/padrino.rb +40 -16
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rack.rb +36 -13
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
- data/lib/new_relic/agent/instrumentation/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 +54 -20
- data/lib/new_relic/agent/instrumentation/redis.rb +141 -56
- 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.rb +62 -23
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +24 -7
- 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 +19 -7
- data/lib/new_relic/agent/method_tracer_helpers.rb +3 -3
- data/lib/new_relic/agent/monitors.rb +27 -0
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +110 -0
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +27 -0
- data/lib/new_relic/agent/{inbound_request_monitor.rb → monitors/inbound_request_monitor.rb} +2 -2
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +3 -5
- data/lib/new_relic/agent/new_relic_service.rb +8 -7
- 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/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.rb +1 -1
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
- data/lib/new_relic/agent/sampler.rb +1 -1
- data/lib/new_relic/agent/sampler_collection.rb +1 -1
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/memory_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
- data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
- data/lib/new_relic/agent/span_event_aggregator.rb +2 -1
- data/lib/new_relic/agent/span_event_primitive.rb +106 -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.rb +1 -1
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -1
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
- data/lib/new_relic/agent/supported_versions.rb +3 -3
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +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.rb +104 -82
- data/lib/new_relic/agent/transaction/abstract_segment.rb +31 -4
- data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +171 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +58 -147
- data/lib/new_relic/agent/transaction/external_request_segment.rb +30 -37
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +4 -12
- data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
- data/lib/new_relic/agent/transaction/segment.rb +24 -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_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.rb +1 -1
- data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
- data/lib/new_relic/agent/vm/mri_vm.rb +1 -1
- data/lib/new_relic/agent/vm/snapshot.rb +1 -1
- data/lib/new_relic/agent/worker_loop.rb +1 -1
- data/lib/new_relic/cli/command.rb +1 -1
- data/lib/new_relic/cli/commands/deployments.rb +1 -1
- data/lib/new_relic/cli/commands/install.rb +4 -3
- data/lib/new_relic/coerce.rb +32 -7
- data/lib/new_relic/collection_helper.rb +1 -1
- data/lib/new_relic/constants.rb +38 -0
- data/lib/new_relic/control.rb +1 -1
- data/lib/new_relic/control/class_methods.rb +1 -1
- data/lib/new_relic/control/frameworks.rb +1 -1
- data/lib/new_relic/control/frameworks/external.rb +1 -1
- data/lib/new_relic/control/frameworks/merb.rb +1 -1
- data/lib/new_relic/control/frameworks/rails.rb +1 -1
- data/lib/new_relic/control/frameworks/rails3.rb +1 -1
- data/lib/new_relic/control/frameworks/rails4.rb +1 -1
- data/lib/new_relic/control/frameworks/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/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/delayed_job_injection.rb +1 -1
- data/lib/new_relic/dependency_detection.rb +5 -5
- data/lib/new_relic/environment_report.rb +6 -2
- data/lib/new_relic/helper.rb +1 -1
- data/lib/new_relic/language_support.rb +1 -1
- data/lib/new_relic/latest_changes.rb +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/metrics.rb +1 -1
- data/lib/new_relic/noticed_error.rb +39 -18
- data/lib/new_relic/rack.rb +1 -1
- data/lib/new_relic/rack/agent_hooks.rb +1 -1
- data/lib/new_relic/rack/agent_middleware.rb +1 -1
- data/lib/new_relic/rack/browser_monitoring.rb +6 -1
- data/lib/new_relic/recipes.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/supportability_helper.rb +15 -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 +26 -1
- data/lib/tasks/newrelic.rb +1 -1
- data/lib/tasks/tests.rake +6 -1
- data/newrelic_rpm.gemspec +19 -13
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +332 -72
- metadata +103 -38
- 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/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,40 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
-
|
5
|
-
require 'new_relic/agent/inbound_request_monitor'
|
6
|
-
require 'new_relic/agent/cross_app_tracing'
|
7
|
-
|
8
|
-
module NewRelic
|
9
|
-
module Agent
|
10
|
-
class DistributedTraceMonitor < InboundRequestMonitor
|
11
|
-
def on_finished_configuring(events)
|
12
|
-
return unless NewRelic::Agent.config[:'distributed_tracing.enabled']
|
13
|
-
events.subscribe(:before_call, &method(:on_before_call))
|
14
|
-
end
|
15
|
-
|
16
|
-
NEWRELIC_TRACE_KEY = 'HTTP_NEWRELIC'
|
17
|
-
|
18
|
-
def on_before_call(request)
|
19
|
-
return unless NewRelic::Agent.config[:'distributed_tracing.enabled']
|
20
|
-
return unless payload = request[NEWRELIC_TRACE_KEY]
|
21
|
-
return unless txn = Tracer.current_transaction
|
22
|
-
|
23
|
-
if txn.accept_distributed_trace_payload payload
|
24
|
-
txn.distributed_trace_payload.caller_transport_type = transport_type(request)
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
URL_SCHEMES = {
|
29
|
-
'http' => 'HTTP'.freeze,
|
30
|
-
'https' => 'HTTPS'.freeze
|
31
|
-
}
|
32
|
-
|
33
|
-
RACK_URL_SCHEME = 'rack.url_scheme'.freeze
|
34
|
-
|
35
|
-
def transport_type(request)
|
36
|
-
URL_SCHEMES[request[RACK_URL_SCHEME]]
|
37
|
-
end
|
38
|
-
end
|
39
|
-
end
|
40
|
-
end
|
@@ -1,31 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
-
|
5
|
-
module NewRelic
|
6
|
-
module Agent
|
7
|
-
module HTTPClients
|
8
|
-
|
9
|
-
# This class provides a public interface for wrapping HTTP requests. This
|
10
|
-
# may be used to create wrappers that are compatible with New Relic's
|
11
|
-
# external request API.
|
12
|
-
#
|
13
|
-
# @api public
|
14
|
-
class AbstractRequest
|
15
|
-
ERROR_MESSAGE = 'Subclasses of NewRelic::Agent::HTTPClients::AbstractRequest must implement a '.freeze
|
16
|
-
|
17
|
-
def []
|
18
|
-
raise NotImplementedError, ERROR_MESSAGE + ':[] method'
|
19
|
-
end
|
20
|
-
|
21
|
-
def []=
|
22
|
-
raise NotImplementedError, ERROR_MESSAGE + ':[]= method'
|
23
|
-
end
|
24
|
-
|
25
|
-
def host_from_header
|
26
|
-
raise NotImplementedError, ERROR_MESSAGE + ':host_from_header method'
|
27
|
-
end
|
28
|
-
end
|
29
|
-
end
|
30
|
-
end
|
31
|
-
end
|
@@ -1,154 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
# This file is distributed under New Relic's license terms.
|
3
|
-
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
-
|
5
|
-
require 'new_relic/agent/attribute_processing'
|
6
|
-
|
7
|
-
module NewRelic
|
8
|
-
module Agent
|
9
|
-
class Transaction
|
10
|
-
class Attributes
|
11
|
-
KEY_LIMIT = 255
|
12
|
-
VALUE_LIMIT = 255
|
13
|
-
COUNT_LIMIT = 64
|
14
|
-
|
15
|
-
EMPTY_HASH = {}.freeze
|
16
|
-
|
17
|
-
def initialize(filter)
|
18
|
-
@filter = filter
|
19
|
-
|
20
|
-
@custom_attributes = {}
|
21
|
-
@agent_attributes = {}
|
22
|
-
@intrinsic_attributes = {}
|
23
|
-
|
24
|
-
@custom_destinations = {}
|
25
|
-
@agent_destinations = {}
|
26
|
-
@already_warned_count_limit = nil
|
27
|
-
end
|
28
|
-
|
29
|
-
def add_agent_attribute(key, value, default_destinations)
|
30
|
-
destinations = @filter.apply(key, default_destinations)
|
31
|
-
return if destinations == AttributeFilter::DST_NONE
|
32
|
-
|
33
|
-
@agent_destinations[key] = destinations
|
34
|
-
add(@agent_attributes, key, value)
|
35
|
-
end
|
36
|
-
|
37
|
-
def add_agent_attribute_with_key_check(key, value, default_destinations)
|
38
|
-
if exceeds_bytesize_limit? key, KEY_LIMIT
|
39
|
-
NewRelic::Agent.logger.debug("Agent attribute #{key} was dropped for exceeding key length limit #{KEY_LIMIT}")
|
40
|
-
return
|
41
|
-
end
|
42
|
-
|
43
|
-
add_agent_attribute(key, value, default_destinations)
|
44
|
-
end
|
45
|
-
|
46
|
-
def add_intrinsic_attribute(key, value)
|
47
|
-
add(@intrinsic_attributes, key, value)
|
48
|
-
end
|
49
|
-
|
50
|
-
def merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
|
51
|
-
return if @filter.high_security?
|
52
|
-
return if !@filter.might_allow_prefix?(prefix)
|
53
|
-
|
54
|
-
AttributeProcessing.flatten_and_coerce(attributes, prefix) do |k, v|
|
55
|
-
add_agent_attribute_with_key_check(k, v, AttributeFilter::DST_NONE)
|
56
|
-
end
|
57
|
-
end
|
58
|
-
|
59
|
-
def merge_custom_attributes(other)
|
60
|
-
return unless Agent.config[:'custom_attributes.enabled']
|
61
|
-
return if other.empty?
|
62
|
-
AttributeProcessing.flatten_and_coerce(other) do |k, v|
|
63
|
-
add_custom_attribute(k, v)
|
64
|
-
end
|
65
|
-
end
|
66
|
-
|
67
|
-
def custom_attributes_for(destination)
|
68
|
-
for_destination(@custom_attributes, @custom_destinations, destination)
|
69
|
-
end
|
70
|
-
|
71
|
-
def agent_attributes_for(destination)
|
72
|
-
for_destination(@agent_attributes, @agent_destinations, destination)
|
73
|
-
end
|
74
|
-
|
75
|
-
def intrinsic_attributes_for(destination)
|
76
|
-
if destination == NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER ||
|
77
|
-
destination == NewRelic::Agent::AttributeFilter::DST_ERROR_COLLECTOR
|
78
|
-
@intrinsic_attributes
|
79
|
-
else
|
80
|
-
EMPTY_HASH
|
81
|
-
end
|
82
|
-
end
|
83
|
-
|
84
|
-
private
|
85
|
-
|
86
|
-
def add_custom_attribute(key, value)
|
87
|
-
if @custom_attributes.size >= COUNT_LIMIT
|
88
|
-
unless @already_warned_count_limit
|
89
|
-
NewRelic::Agent.logger.warn("Custom attributes count exceeded limit of #{COUNT_LIMIT}. Any additional custom attributes during this transaction will be dropped.")
|
90
|
-
@already_warned_count_limit = true
|
91
|
-
end
|
92
|
-
return
|
93
|
-
end
|
94
|
-
|
95
|
-
if @filter.high_security?
|
96
|
-
NewRelic::Agent.logger.debug("Unable to add custom attribute #{key} while in high security mode.")
|
97
|
-
return
|
98
|
-
end
|
99
|
-
|
100
|
-
if exceeds_bytesize_limit?(key, KEY_LIMIT)
|
101
|
-
NewRelic::Agent.logger.warn("Custom attribute key '#{key}' was longer than limit of #{KEY_LIMIT} bytes. This attribute will be dropped.")
|
102
|
-
return
|
103
|
-
end
|
104
|
-
|
105
|
-
destinations = @filter.apply(key, AttributeFilter::DST_ALL)
|
106
|
-
return if destinations == AttributeFilter::DST_NONE
|
107
|
-
|
108
|
-
@custom_destinations[key] = destinations
|
109
|
-
add(@custom_attributes, key, value)
|
110
|
-
end
|
111
|
-
|
112
|
-
def add(attributes, key, value)
|
113
|
-
return if value.nil?
|
114
|
-
|
115
|
-
if exceeds_bytesize_limit?(value, VALUE_LIMIT)
|
116
|
-
value = slice(value)
|
117
|
-
end
|
118
|
-
|
119
|
-
attributes[key] = value
|
120
|
-
end
|
121
|
-
|
122
|
-
def for_destination(attributes, calculated_destinations, destination)
|
123
|
-
# Avoid allocating anything if there are no attrs at all
|
124
|
-
return EMPTY_HASH if attributes.empty?
|
125
|
-
|
126
|
-
attributes.inject({}) do |memo, (key, value)|
|
127
|
-
if @filter.allows?(calculated_destinations[key], destination)
|
128
|
-
memo[key] = value
|
129
|
-
end
|
130
|
-
memo
|
131
|
-
end
|
132
|
-
end
|
133
|
-
|
134
|
-
def exceeds_bytesize_limit?(value, limit)
|
135
|
-
if value.respond_to?(:bytesize)
|
136
|
-
value.bytesize > limit
|
137
|
-
elsif value.is_a?(Symbol)
|
138
|
-
value.to_s.bytesize > limit
|
139
|
-
else
|
140
|
-
false
|
141
|
-
end
|
142
|
-
end
|
143
|
-
|
144
|
-
# Take one byte past our limit. Why? This lets us unconditionally chop!
|
145
|
-
# the end. It'll either remove the one-character-too-many we have, or
|
146
|
-
# peel off the partial, mangled character left by the byteslice.
|
147
|
-
def slice(incoming)
|
148
|
-
result = incoming.to_s.byteslice(0, VALUE_LIMIT + 1)
|
149
|
-
result.chop!
|
150
|
-
end
|
151
|
-
end
|
152
|
-
end
|
153
|
-
end
|
154
|
-
end
|
data/lib/tasks/versions.html.erb
DELETED
@@ -1,28 +0,0 @@
|
|
1
|
-
<h2 id="<%= anchor %>"><%= title %></h2>
|
2
|
-
<table>
|
3
|
-
<thead>
|
4
|
-
<tr>
|
5
|
-
<th>Name</th>
|
6
|
-
<th>Supported</th>
|
7
|
-
<th>Deprecated</th>
|
8
|
-
<th>Experimental</th>
|
9
|
-
</tr>
|
10
|
-
</thead>
|
11
|
-
<tbody>
|
12
|
-
<% for version in versions %>
|
13
|
-
<tr>
|
14
|
-
<td rowspan=<%= if version.notes; 2; else; 1; end %>><b><%= version.name %></b></td>
|
15
|
-
<td><%= CGI.escapeHTML(version_list(version.supported)) %></td>
|
16
|
-
<td><%= CGI.escapeHTML(version_list(version.deprecated)) %></td>
|
17
|
-
<td><%= CGI.escapeHTML(version_list(version.experimental)) %></td>
|
18
|
-
</tr>
|
19
|
-
<% if version.notes %>
|
20
|
-
<tr>
|
21
|
-
<td colspan="3">
|
22
|
-
<%= version.notes.join("<br />") %>
|
23
|
-
</td>
|
24
|
-
</tr>
|
25
|
-
<% end %>
|
26
|
-
<% end %>
|
27
|
-
</tbody>
|
28
|
-
</table>
|
@@ -1,8 +0,0 @@
|
|
1
|
-
<h2 id="more_help">For more help</h2>
|
2
|
-
|
3
|
-
<p>Additional documentation resources include:
|
4
|
-
<ul>
|
5
|
-
<li><a href="/docs/agents/ruby-agent/getting-started/new-relic-ruby">New Relic for Ruby</a> (compatibility and requirements, general information about installation, configuration, troubleshooting, and known issues)</li>
|
6
|
-
<li><a href="/docs/agents/ruby-agent/installation-and-configuration/ruby-agent-installation">Ruby agent installation</a> (using the New Relic Ruby gem and configuration file)</li>
|
7
|
-
</ul>
|
8
|
-
</p>
|
@@ -1,9 +0,0 @@
|
|
1
|
-
<p>This document lists compatible operating systems, security requirements, and supported frameworks for the New Relic Ruby Agent.</p>
|
2
|
-
|
3
|
-
<h2 id="qiklinks">Contents</h2>
|
4
|
-
|
5
|
-
<h2 id="os">Operating systems</h2>
|
6
|
-
<p>The Ruby Agent is supported on UNIX-like operating systems such as Linux, Solaris, and Mac OS X.</p>
|
7
|
-
|
8
|
-
<h2 id="security">Security requirements</h2>
|
9
|
-
<p>As a standard <a href="/docs/accounts-partnerships/accounts/security/data-security">security measure for data collection</a>, your app server must support SHA-2 (256-bit). SHA-1 is not supported.</p>
|
data/lib/tasks/versions.rake
DELETED
@@ -1,65 +0,0 @@
|
|
1
|
-
namespace :newrelic do
|
2
|
-
desc "Lists information on supported versions of frameworks for this agent"
|
3
|
-
|
4
|
-
require File.join(File.dirname(__FILE__), '..', 'new_relic', 'agent', 'supported_versions')
|
5
|
-
|
6
|
-
task :supported_versions, [:format] => [] do |t, args|
|
7
|
-
require 'cgi'
|
8
|
-
|
9
|
-
def version_list(list)
|
10
|
-
return "-" if list.nil? || list.empty?
|
11
|
-
list.join(", ")
|
12
|
-
end
|
13
|
-
|
14
|
-
def versions_for_type(type)
|
15
|
-
NewRelic::Agent::SUPPORTED_VERSIONS.
|
16
|
-
select {|key, values| values[:type] == type}.
|
17
|
-
sort_by {|key, values| (values[:name] || key).to_s }.
|
18
|
-
map do |key,values|
|
19
|
-
VersionStruct.new(
|
20
|
-
values[:name] || key,
|
21
|
-
values[:supported],
|
22
|
-
values[:deprecated],
|
23
|
-
values[:experimental],
|
24
|
-
values[:notes])
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
def build_versions_erb(format)
|
29
|
-
require 'erb'
|
30
|
-
path = File.join(File.dirname(__FILE__), "versions.#{format}.erb")
|
31
|
-
template = File.read(File.expand_path(path))
|
32
|
-
ERB.new(template)
|
33
|
-
end
|
34
|
-
|
35
|
-
def write_versions(title, type, erb)
|
36
|
-
anchor = title.downcase.gsub(" ", "_")
|
37
|
-
versions = versions_for_type(type)
|
38
|
-
puts erb.result(binding).gsub(/^ *$/, '')
|
39
|
-
|
40
|
-
"#{anchor} #{versions}" # silences unused warnings
|
41
|
-
end
|
42
|
-
|
43
|
-
def include_if_exists(filename)
|
44
|
-
path = File.join(File.dirname(__FILE__), filename)
|
45
|
-
puts File.read(path) if File.exist?(path)
|
46
|
-
end
|
47
|
-
|
48
|
-
VersionStruct = Struct.new(:name, :supported, :deprecated, :experimental, :notes)
|
49
|
-
|
50
|
-
format = args[:format] || "txt"
|
51
|
-
erb = build_versions_erb(format)
|
52
|
-
|
53
|
-
include_if_exists("versions.preface.#{format}")
|
54
|
-
|
55
|
-
write_versions("Ruby versions", :ruby, erb)
|
56
|
-
write_versions("Web servers", :app_server, erb)
|
57
|
-
write_versions("Web frameworks", :web, erb)
|
58
|
-
write_versions("Databases", :database, erb)
|
59
|
-
write_versions("Background jobs", :background, erb)
|
60
|
-
write_versions("HTTP clients", :http, erb)
|
61
|
-
write_versions("Other", :other, erb)
|
62
|
-
|
63
|
-
include_if_exists("versions.postface.#{format}")
|
64
|
-
end
|
65
|
-
end
|
data/lib/tasks/versions.txt.erb
DELETED
@@ -1,14 +0,0 @@
|
|
1
|
-
=========================================
|
2
|
-
<%= title %>
|
3
|
-
=========================================
|
4
|
-
<% for version in versions %>
|
5
|
-
<%= version.name %>
|
6
|
-
|
7
|
-
Supported: <%= version_list(version.supported) %>
|
8
|
-
Deprecated: <%= version_list(version.deprecated) %>
|
9
|
-
Experimental: <%= version_list(version.experimental) %>
|
10
|
-
<% if version.notes %>Notes:<% for note in version.notes %>
|
11
|
-
<%= note %><% end %>
|
12
|
-
<% end %>
|
13
|
-
------------------------------------
|
14
|
-
<% end %>
|