newrelic_rpm 8.2.0 → 8.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -1
- data/.rubocop.yml +1938 -0
- data/Brewfile +10 -0
- data/CHANGELOG.md +80 -2
- data/CONTRIBUTING.md +19 -3
- data/DOCKER.md +167 -0
- data/Dockerfile +10 -0
- data/Guardfile +8 -8
- data/Rakefile +14 -9
- data/bin/mongrel_rpm +8 -9
- data/bin/newrelic +1 -1
- data/bin/nrdebug +14 -14
- data/docker-compose.yml +85 -0
- data/init.rb +0 -2
- data/lefthook.yml +9 -0
- data/lib/new_relic/agent/adaptive_sampler.rb +7 -3
- data/lib/new_relic/agent/agent.rb +38 -40
- data/lib/new_relic/agent/agent_logger.rb +8 -9
- data/lib/new_relic/agent/attribute_filter.rb +31 -31
- data/lib/new_relic/agent/attributes.rb +2 -2
- data/lib/new_relic/agent/autostart.rb +6 -7
- data/lib/new_relic/agent/commands/agent_command.rb +2 -2
- data/lib/new_relic/agent/commands/agent_command_router.rb +6 -5
- data/lib/new_relic/agent/commands/thread_profiler_session.rb +0 -3
- data/lib/new_relic/agent/configuration/default_source.rb +347 -330
- data/lib/new_relic/agent/configuration/dotted_hash.rb +3 -3
- data/lib/new_relic/agent/configuration/environment_source.rb +3 -4
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +11 -6
- data/lib/new_relic/agent/configuration/high_security_source.rb +7 -7
- data/lib/new_relic/agent/configuration/manager.rb +74 -63
- data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
- data/lib/new_relic/agent/configuration/security_policy_source.rb +73 -73
- data/lib/new_relic/agent/configuration/server_source.rb +11 -11
- data/lib/new_relic/agent/configuration/yaml_source.rb +9 -9
- data/lib/new_relic/agent/connect/request_builder.rb +13 -16
- data/lib/new_relic/agent/connect/response_handler.rb +0 -3
- data/lib/new_relic/agent/custom_event_aggregator.rb +9 -10
- data/lib/new_relic/agent/database/explain_plan_helpers.rb +3 -4
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +12 -12
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +2 -2
- data/lib/new_relic/agent/database.rb +20 -24
- data/lib/new_relic/agent/datastores/metric_helper.rb +10 -10
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +2 -3
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +3 -5
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +1 -2
- data/lib/new_relic/agent/datastores/redis.rb +2 -4
- data/lib/new_relic/agent/datastores.rb +1 -3
- data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +5 -5
- data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +11 -10
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +10 -11
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +41 -42
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +3 -3
- data/lib/new_relic/agent/distributed_tracing/trace_context.rb +41 -43
- data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +23 -23
- data/lib/new_relic/agent/distributed_tracing.rb +17 -18
- data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
- data/lib/new_relic/agent/error_collector.rb +17 -17
- data/lib/new_relic/agent/error_event_aggregator.rb +1 -1
- data/lib/new_relic/agent/error_filter.rb +6 -8
- 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 +6 -7
- data/lib/new_relic/agent/event_listener.rb +0 -1
- data/lib/new_relic/agent/event_loop.rb +10 -10
- data/lib/new_relic/agent/external.rb +1 -2
- data/lib/new_relic/agent/guid_generator.rb +2 -9
- data/lib/new_relic/agent/harvester.rb +3 -4
- data/lib/new_relic/agent/heap.rb +1 -3
- data/lib/new_relic/agent/hostname.rb +3 -3
- data/lib/new_relic/agent/http_clients/abstract.rb +5 -7
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +1 -5
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +4 -4
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +3 -3
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +1 -2
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +2 -3
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +2 -3
- data/lib/new_relic/agent/http_clients/uri_util.rb +0 -1
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +2 -3
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +9 -10
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +5 -7
- data/lib/new_relic/agent/instrumentation/active_job.rb +4 -4
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +2 -2
- data/lib/new_relic/agent/instrumentation/active_record.rb +20 -18
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +36 -42
- data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +28 -25
- data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +3 -3
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +5 -6
- data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +8 -9
- data/lib/new_relic/agent/instrumentation/bunny/chain.rb +1 -1
- data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +7 -8
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +41 -41
- data/lib/new_relic/agent/instrumentation/curb/chain.rb +19 -20
- data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +34 -38
- data/lib/new_relic/agent/instrumentation/curb/prepend.rb +9 -10
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +10 -10
- data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +5 -7
- data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +2 -6
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +4 -4
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +2 -2
- data/lib/new_relic/agent/instrumentation/excon.rb +0 -1
- data/lib/new_relic/agent/instrumentation/grape/chain.rb +1 -2
- data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +6 -7
- data/lib/new_relic/agent/instrumentation/grape.rb +2 -3
- data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +2 -3
- data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +0 -2
- data/lib/new_relic/agent/instrumentation/httprb/chain.rb +2 -2
- data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +6 -6
- data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/ignore_actions.rb +2 -3
- data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/logger.rb +1 -1
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +2 -1
- data/lib/new_relic/agent/instrumentation/memcache/helper.rb +0 -1
- data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +1 -0
- data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +9 -10
- data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +5 -6
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +4 -4
- data/lib/new_relic/agent/instrumentation/net_http/chain.rb +3 -4
- data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +5 -5
- data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +4 -4
- data/lib/new_relic/agent/instrumentation/net_http.rb +1 -1
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +2 -3
- data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +3 -2
- data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/padrino.rb +0 -5
- data/lib/new_relic/agent/instrumentation/queue_time.rb +5 -5
- data/lib/new_relic/agent/instrumentation/rack/chain.rb +5 -5
- data/lib/new_relic/agent/instrumentation/rack/helpers.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +4 -5
- data/lib/new_relic/agent/instrumentation/rack/prepend.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rack.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +6 -6
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +2 -2
- data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +0 -1
- data/lib/new_relic/agent/instrumentation/rake/chain.rb +0 -5
- data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +6 -6
- data/lib/new_relic/agent/instrumentation/rake.rb +1 -1
- data/lib/new_relic/agent/instrumentation/redis/chain.rb +6 -6
- data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +2 -2
- data/lib/new_relic/agent/instrumentation/redis/prepend.rb +1 -1
- data/lib/new_relic/agent/instrumentation/redis.rb +1 -1
- data/lib/new_relic/agent/instrumentation/resque/chain.rb +2 -3
- data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +4 -4
- data/lib/new_relic/agent/instrumentation/resque/prepend.rb +1 -2
- data/lib/new_relic/agent/instrumentation/resque.rb +7 -7
- data/lib/new_relic/agent/instrumentation/sequel.rb +7 -9
- data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +5 -4
- data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +4 -3
- data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
- data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +0 -1
- data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +4 -4
- data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +3 -5
- data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +1 -1
- data/lib/new_relic/agent/javascript_instrumentor.rb +28 -28
- data/lib/new_relic/agent/logging.rb +8 -4
- data/lib/new_relic/agent/memory_logger.rb +1 -1
- data/lib/new_relic/agent/messaging.rb +42 -44
- data/lib/new_relic/agent/method_tracer.rb +11 -14
- data/lib/new_relic/agent/method_tracer_helpers.rb +2 -2
- data/lib/new_relic/agent/monitors/cross_app_monitor.rb +13 -12
- data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +2 -2
- data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +0 -1
- data/lib/new_relic/agent/monitors/synthetics_monitor.rb +4 -7
- data/lib/new_relic/agent/monitors.rb +1 -2
- data/lib/new_relic/agent/new_relic_service/encoders.rb +4 -4
- 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 +4 -3
- data/lib/new_relic/agent/new_relic_service.rb +20 -20
- data/lib/new_relic/agent/noticible_error.rb +0 -2
- data/lib/new_relic/agent/null_logger.rb +6 -2
- data/lib/new_relic/agent/obfuscator.rb +6 -8
- data/lib/new_relic/agent/parameter_filtering.rb +16 -8
- data/lib/new_relic/agent/payload_metric_mapping.rb +8 -9
- data/lib/new_relic/agent/pipe_channel_manager.rb +5 -6
- data/lib/new_relic/agent/pipe_service.rb +1 -1
- data/lib/new_relic/agent/priority_sampled_buffer.rb +4 -7
- data/lib/new_relic/agent/rules_engine/replacement_rule.rb +9 -9
- data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +12 -12
- data/lib/new_relic/agent/rules_engine.rb +2 -2
- data/lib/new_relic/agent/sampler.rb +2 -3
- data/lib/new_relic/agent/sampler_collection.rb +2 -3
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +3 -3
- data/lib/new_relic/agent/samplers/memory_sampler.rb +4 -3
- data/lib/new_relic/agent/samplers/vm_sampler.rb +18 -18
- data/lib/new_relic/agent/span_event_aggregator.rb +8 -8
- data/lib/new_relic/agent/span_event_primitive.rb +39 -39
- data/lib/new_relic/agent/sql_sampler.rb +9 -9
- data/lib/new_relic/agent/stats.rb +16 -16
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +7 -9
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +8 -9
- data/lib/new_relic/agent/stats_engine.rb +6 -6
- data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -2
- data/lib/new_relic/agent/system_info.rb +22 -20
- data/lib/new_relic/agent/threading/agent_thread.rb +4 -5
- data/lib/new_relic/agent/threading/backtrace_node.rb +6 -9
- data/lib/new_relic/agent/threading/backtrace_service.rb +8 -8
- data/lib/new_relic/agent/threading/thread_profile.rb +15 -18
- data/lib/new_relic/agent/tracer.rb +37 -43
- data/lib/new_relic/agent/transaction/abstract_segment.rb +6 -6
- data/lib/new_relic/agent/transaction/datastore_segment.rb +5 -7
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +7 -9
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +21 -22
- data/lib/new_relic/agent/transaction/external_request_segment.rb +3 -5
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +23 -23
- data/lib/new_relic/agent/transaction/request_attributes.rb +7 -7
- data/lib/new_relic/agent/transaction/segment.rb +3 -3
- data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +0 -2
- data/lib/new_relic/agent/transaction/trace.rb +8 -8
- data/lib/new_relic/agent/transaction/trace_context.rb +14 -16
- data/lib/new_relic/agent/transaction/trace_node.rb +16 -16
- data/lib/new_relic/agent/transaction/tracing.rb +1 -3
- data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -2
- data/lib/new_relic/agent/transaction.rb +79 -81
- data/lib/new_relic/agent/transaction_error_primitive.rb +16 -16
- data/lib/new_relic/agent/transaction_event_aggregator.rb +7 -8
- data/lib/new_relic/agent/transaction_event_primitive.rb +29 -29
- data/lib/new_relic/agent/transaction_event_recorder.rb +1 -1
- data/lib/new_relic/agent/transaction_metrics.rb +3 -3
- data/lib/new_relic/agent/transaction_sampler.rb +0 -1
- data/lib/new_relic/agent/transaction_time_aggregator.rb +6 -6
- data/lib/new_relic/agent/utilization/aws.rb +32 -2
- data/lib/new_relic/agent/utilization/azure.rb +1 -1
- data/lib/new_relic/agent/utilization/vendor.rb +15 -2
- data/lib/new_relic/agent/utilization_data.rb +3 -4
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
- data/lib/new_relic/agent/vm/snapshot.rb +3 -3
- data/lib/new_relic/agent/worker_loop.rb +3 -5
- data/lib/new_relic/agent.rb +22 -22
- data/lib/new_relic/cli/command.rb +15 -17
- data/lib/new_relic/cli/commands/deployments.rb +20 -22
- data/lib/new_relic/cli/commands/install.rb +6 -10
- data/lib/new_relic/coerce.rb +5 -8
- data/lib/new_relic/collection_helper.rb +48 -47
- data/lib/new_relic/control/class_methods.rb +2 -2
- data/lib/new_relic/control/frameworks/external.rb +1 -1
- data/lib/new_relic/control/frameworks/rails.rb +5 -6
- data/lib/new_relic/control/frameworks/rails3.rb +2 -3
- data/lib/new_relic/control/frameworks/ruby.rb +2 -2
- data/lib/new_relic/control/frameworks/sinatra.rb +6 -0
- data/lib/new_relic/control/instance_methods.rb +4 -5
- data/lib/new_relic/control/instrumentation.rb +4 -5
- data/lib/new_relic/control/server_methods.rb +2 -3
- data/lib/new_relic/control.rb +0 -1
- data/lib/new_relic/dependency_detection.rb +6 -8
- data/lib/new_relic/environment_report.rb +16 -18
- data/lib/new_relic/helper.rb +5 -5
- data/lib/new_relic/language_support.rb +3 -2
- data/lib/new_relic/latest_changes.rb +2 -2
- data/lib/new_relic/local_environment.rb +7 -7
- data/lib/new_relic/metric_data.rb +6 -7
- data/lib/new_relic/metric_spec.rb +3 -3
- data/lib/new_relic/noticed_error.rb +14 -15
- data/lib/new_relic/rack/agent_middleware.rb +2 -2
- data/lib/new_relic/rack/browser_monitoring.rb +9 -9
- data/lib/new_relic/recipes/capistrano3.rb +11 -13
- data/lib/new_relic/recipes/capistrano_legacy.rb +11 -14
- data/lib/new_relic/supportability_helper.rb +1 -2
- data/lib/new_relic/version.rb +4 -15
- data/lib/sequel/extensions/newrelic_instrumentation.rb +4 -7
- data/lib/sequel/plugins/newrelic_instrumentation.rb +3 -9
- data/lib/tasks/all.rb +1 -1
- data/lib/tasks/config.rake +21 -21
- data/lib/tasks/multiverse.rb +4 -6
- data/lib/tasks/tests.rake +3 -7
- data/newrelic.yml +3 -3
- data/newrelic_rpm.gemspec +13 -12
- data/recipes/newrelic.rb +1 -1
- data/test/agent_helper.rb +55 -55
- metadata +38 -4
@@ -18,7 +18,7 @@ module NewRelic
|
|
18
18
|
# The cross app transaction header for "outgoing" calls
|
19
19
|
NR_TXN_HEADER = 'X-NewRelic-Transaction'
|
20
20
|
|
21
|
-
NR_MESSAGE_BROKER_ID_HEADER
|
21
|
+
NR_MESSAGE_BROKER_ID_HEADER = 'NewRelicID'
|
22
22
|
NR_MESSAGE_BROKER_TXN_HEADER = 'NewRelicTransaction'
|
23
23
|
NR_MESSAGE_BROKER_SYNTHETICS_HEADER = 'NewRelicSynthetics'
|
24
24
|
|
@@ -56,8 +56,8 @@ module NewRelic
|
|
56
56
|
return unless CrossAppTracing.cross_app_enabled?
|
57
57
|
|
58
58
|
@is_cross_app_caller = true
|
59
|
-
txn_guid
|
60
|
-
trip_id
|
59
|
+
txn_guid = transaction.guid
|
60
|
+
trip_id = cat_trip_id
|
61
61
|
path_hash = cat_path_hash
|
62
62
|
|
63
63
|
insert_request_headers headers, txn_guid, trip_id, path_hash
|
@@ -91,7 +91,7 @@ module NewRelic
|
|
91
91
|
private
|
92
92
|
|
93
93
|
def insert_message_headers headers, txn_guid, trip_id, path_hash, synthetics_header
|
94
|
-
headers[NR_MESSAGE_BROKER_ID_HEADER]
|
94
|
+
headers[NR_MESSAGE_BROKER_ID_HEADER] = obfuscator.obfuscate(Agent.config[:cross_process_id])
|
95
95
|
headers[NR_MESSAGE_BROKER_TXN_HEADER] = obfuscator.obfuscate(::JSON.dump([txn_guid, false, trip_id, path_hash]))
|
96
96
|
headers[NR_MESSAGE_BROKER_SYNTHETICS_HEADER] = synthetics_header if synthetics_header
|
97
97
|
end
|
@@ -116,11 +116,11 @@ module NewRelic
|
|
116
116
|
payload[:guid] = transaction.guid
|
117
117
|
|
118
118
|
return unless is_cross_app?
|
119
|
-
trip_id
|
120
|
-
path_hash
|
119
|
+
trip_id = cat_trip_id
|
120
|
+
path_hash = cat_path_hash
|
121
121
|
referring_path_hash = cat_referring_path_hash
|
122
122
|
|
123
|
-
payload[:cat_trip_id]
|
123
|
+
payload[:cat_trip_id] = trip_id if trip_id
|
124
124
|
payload[:cat_referring_path_hash] = referring_path_hash if referring_path_hash
|
125
125
|
|
126
126
|
if path_hash
|
@@ -135,6 +135,7 @@ module NewRelic
|
|
135
135
|
|
136
136
|
###############
|
137
137
|
module_function
|
138
|
+
|
138
139
|
###############
|
139
140
|
|
140
141
|
def cross_app_enabled?
|
@@ -173,9 +174,9 @@ module NewRelic
|
|
173
174
|
|
174
175
|
def insert_request_headers request, txn_guid, trip_id, path_hash
|
175
176
|
cross_app_id = NewRelic::Agent.config[:cross_process_id]
|
176
|
-
txn_data
|
177
|
+
txn_data = ::JSON.dump([txn_guid, false, trip_id, path_hash])
|
177
178
|
|
178
|
-
request[NR_ID_HEADER]
|
179
|
+
request[NR_ID_HEADER] = obfuscator.obfuscate(cross_app_id)
|
179
180
|
request[NR_TXN_HEADER] = obfuscator.obfuscate(txn_data)
|
180
181
|
end
|
181
182
|
|
@@ -218,7 +219,7 @@ module NewRelic
|
|
218
219
|
end
|
219
220
|
|
220
221
|
def reject_messaging_cat_headers headers
|
221
|
-
headers.reject {|k,_| k == NR_MESSAGE_BROKER_ID_HEADER || k == NR_MESSAGE_BROKER_TXN_HEADER}
|
222
|
+
headers.reject { |k, _| k == NR_MESSAGE_BROKER_ID_HEADER || k == NR_MESSAGE_BROKER_TXN_HEADER }
|
222
223
|
end
|
223
224
|
|
224
225
|
def trusts? id
|
@@ -10,16 +10,16 @@ module NewRelic
|
|
10
10
|
|
11
11
|
# Intrinsic Keys
|
12
12
|
INTRINSIC_KEYS = [
|
13
|
-
PARENT_TYPE_KEY
|
14
|
-
PARENT_APP_KEY
|
15
|
-
PARENT_ACCOUNT_ID_KEY
|
16
|
-
PARENT_TRANSPORT_TYPE_KEY
|
17
|
-
PARENT_TRANSPORT_DURATION_KEY
|
18
|
-
GUID_KEY
|
19
|
-
TRACE_ID_KEY
|
20
|
-
PARENT_TRANSACTION_ID_KEY
|
21
|
-
PARENT_SPAN_ID_KEY
|
22
|
-
SAMPLED_KEY
|
13
|
+
PARENT_TYPE_KEY = "parent.type",
|
14
|
+
PARENT_APP_KEY = "parent.app",
|
15
|
+
PARENT_ACCOUNT_ID_KEY = "parent.account",
|
16
|
+
PARENT_TRANSPORT_TYPE_KEY = "parent.transportType",
|
17
|
+
PARENT_TRANSPORT_DURATION_KEY = "parent.transportDuration",
|
18
|
+
GUID_KEY = "guid",
|
19
|
+
TRACE_ID_KEY = "traceId",
|
20
|
+
PARENT_TRANSACTION_ID_KEY = "parentId",
|
21
|
+
PARENT_SPAN_ID_KEY = "parentSpanId",
|
22
|
+
SAMPLED_KEY = "sampled"
|
23
23
|
].freeze
|
24
24
|
|
25
25
|
# This method extracts intrinsics from the transaction_payload and
|
@@ -77,7 +77,6 @@ module NewRelic
|
|
77
77
|
def enabled?
|
78
78
|
return Agent.config[:'distributed_tracing.enabled']
|
79
79
|
end
|
80
|
-
|
81
80
|
end
|
82
81
|
end
|
83
82
|
end
|
@@ -17,26 +17,25 @@ module NewRelic
|
|
17
17
|
class DistributedTracePayload
|
18
18
|
extend Coerce
|
19
19
|
|
20
|
-
VERSION
|
20
|
+
VERSION = [0, 1].freeze
|
21
21
|
PARENT_TYPE = "App"
|
22
|
-
POUND
|
22
|
+
POUND = '#'
|
23
23
|
|
24
24
|
# Key names for serialization
|
25
|
-
VERSION_KEY
|
26
|
-
DATA_KEY
|
27
|
-
PARENT_TYPE_KEY
|
25
|
+
VERSION_KEY = 'v'
|
26
|
+
DATA_KEY = 'd'
|
27
|
+
PARENT_TYPE_KEY = 'ty'
|
28
28
|
PARENT_ACCOUNT_ID_KEY = 'ac'
|
29
|
-
PARENT_APP_KEY
|
30
|
-
TRUSTED_ACCOUNT_KEY
|
31
|
-
ID_KEY
|
32
|
-
TX_KEY
|
33
|
-
TRACE_ID_KEY
|
34
|
-
SAMPLED_KEY
|
35
|
-
TIMESTAMP_KEY
|
36
|
-
PRIORITY_KEY
|
29
|
+
PARENT_APP_KEY = 'ap'
|
30
|
+
TRUSTED_ACCOUNT_KEY = 'tk'
|
31
|
+
ID_KEY = 'id'
|
32
|
+
TX_KEY = 'tx'
|
33
|
+
TRACE_ID_KEY = 'tr'
|
34
|
+
SAMPLED_KEY = 'sa'
|
35
|
+
TIMESTAMP_KEY = 'ti'
|
36
|
+
PRIORITY_KEY = 'pr'
|
37
37
|
|
38
38
|
class << self
|
39
|
-
|
40
39
|
def for_transaction transaction
|
41
40
|
return nil unless connected?
|
42
41
|
|
@@ -64,17 +63,17 @@ module NewRelic
|
|
64
63
|
payload_data = raw_payload[DATA_KEY]
|
65
64
|
|
66
65
|
payload = new
|
67
|
-
payload.version
|
68
|
-
payload.parent_type
|
69
|
-
payload.parent_account_id
|
70
|
-
payload.parent_app_id
|
66
|
+
payload.version = raw_payload[VERSION_KEY]
|
67
|
+
payload.parent_type = payload_data[PARENT_TYPE_KEY]
|
68
|
+
payload.parent_account_id = payload_data[PARENT_ACCOUNT_ID_KEY]
|
69
|
+
payload.parent_app_id = payload_data[PARENT_APP_KEY]
|
71
70
|
payload.trusted_account_key = payload_data[TRUSTED_ACCOUNT_KEY]
|
72
|
-
payload.timestamp
|
73
|
-
payload.id
|
74
|
-
payload.transaction_id
|
75
|
-
payload.trace_id
|
76
|
-
payload.sampled
|
77
|
-
payload.priority
|
71
|
+
payload.timestamp = payload_data[TIMESTAMP_KEY]
|
72
|
+
payload.id = payload_data[ID_KEY]
|
73
|
+
payload.transaction_id = payload_data[TX_KEY]
|
74
|
+
payload.trace_id = payload_data[TRACE_ID_KEY]
|
75
|
+
payload.sampled = payload_data[SAMPLED_KEY]
|
76
|
+
payload.priority = payload_data[PRIORITY_KEY]
|
78
77
|
|
79
78
|
payload
|
80
79
|
end
|
@@ -110,16 +109,16 @@ module NewRelic
|
|
110
109
|
end
|
111
110
|
|
112
111
|
attr_accessor :version,
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
112
|
+
:parent_type,
|
113
|
+
:parent_account_id,
|
114
|
+
:parent_app_id,
|
115
|
+
:trusted_account_key,
|
116
|
+
:id,
|
117
|
+
:transaction_id,
|
118
|
+
:trace_id,
|
119
|
+
:sampled,
|
120
|
+
:priority,
|
121
|
+
:timestamp
|
123
122
|
|
124
123
|
alias_method :sampled?, :sampled
|
125
124
|
|
@@ -134,17 +133,17 @@ module NewRelic
|
|
134
133
|
}
|
135
134
|
|
136
135
|
result[DATA_KEY] = {
|
137
|
-
PARENT_TYPE_KEY
|
136
|
+
PARENT_TYPE_KEY => parent_type,
|
138
137
|
PARENT_ACCOUNT_ID_KEY => parent_account_id,
|
139
|
-
PARENT_APP_KEY
|
140
|
-
TX_KEY
|
141
|
-
TRACE_ID_KEY
|
142
|
-
SAMPLED_KEY
|
143
|
-
PRIORITY_KEY
|
144
|
-
TIMESTAMP_KEY
|
138
|
+
PARENT_APP_KEY => parent_app_id,
|
139
|
+
TX_KEY => transaction_id,
|
140
|
+
TRACE_ID_KEY => trace_id,
|
141
|
+
SAMPLED_KEY => sampled,
|
142
|
+
PRIORITY_KEY => priority,
|
143
|
+
TIMESTAMP_KEY => timestamp
|
145
144
|
}
|
146
145
|
|
147
|
-
result[DATA_KEY][ID_KEY]
|
146
|
+
result[DATA_KEY][ID_KEY] = id if id
|
148
147
|
result[DATA_KEY][TRUSTED_ACCOUNT_KEY] = trusted_account_key if trusted_account_key
|
149
148
|
|
150
149
|
JSON.dump(result)
|
@@ -17,12 +17,12 @@ module NewRelic
|
|
17
17
|
"IronMQ",
|
18
18
|
"AMQP",
|
19
19
|
"Queue",
|
20
|
-
"Other"
|
20
|
+
"Other"
|
21
21
|
].freeze
|
22
22
|
|
23
23
|
URL_SCHEMES = {
|
24
|
-
'http'
|
25
|
-
'https' => NewRelic::HTTPS
|
24
|
+
'http' => NewRelic::HTTP,
|
25
|
+
'https' => NewRelic::HTTPS
|
26
26
|
}.freeze
|
27
27
|
|
28
28
|
RACK_URL_SCHEME = 'rack.url_scheme'
|
@@ -11,24 +11,24 @@ module NewRelic
|
|
11
11
|
class TraceContext
|
12
12
|
VERSION = 0x0
|
13
13
|
|
14
|
-
COMMA
|
15
|
-
EQUALS
|
16
|
-
INVALID_TRACE_ID
|
14
|
+
COMMA = ','
|
15
|
+
EQUALS = '='
|
16
|
+
INVALID_TRACE_ID = ('0' * 32)
|
17
17
|
INVALID_PARENT_ID = ('0' * 16)
|
18
|
-
INVALID_VERSION
|
19
|
-
|
20
|
-
TRACE_ID_KEY
|
21
|
-
TRACE_FLAGS_KEY
|
22
|
-
PARENT_ID_KEY
|
23
|
-
VERSION_KEY
|
24
|
-
UNDEFINED_FIELDS_KEY
|
25
|
-
|
26
|
-
TP_VERSION
|
27
|
-
TP_TRACE_ID
|
28
|
-
TP_PARENT_ID
|
29
|
-
TP_TRACE_FLAGS
|
18
|
+
INVALID_VERSION = 'ff'
|
19
|
+
|
20
|
+
TRACE_ID_KEY = 'trace_id'
|
21
|
+
TRACE_FLAGS_KEY = 'trace_flags'
|
22
|
+
PARENT_ID_KEY = 'parent_id'
|
23
|
+
VERSION_KEY = 'version'
|
24
|
+
UNDEFINED_FIELDS_KEY = 'undefined_fields'
|
25
|
+
|
26
|
+
TP_VERSION = "(?<#{VERSION_KEY}>[a-f\\d]{2})"
|
27
|
+
TP_TRACE_ID = "(?<#{TRACE_ID_KEY}>[a-f\\d]{32})"
|
28
|
+
TP_PARENT_ID = "(?<#{PARENT_ID_KEY}>[a-f\\d]{16})"
|
29
|
+
TP_TRACE_FLAGS = "(?<#{TRACE_FLAGS_KEY}>\\d{2})"
|
30
30
|
TP_UNDEFINED_FIELDS = "(?<#{UNDEFINED_FIELDS_KEY}>-[a-zA-Z\\d-]*)"
|
31
|
-
TRACE_PARENT_REGEX
|
31
|
+
TRACE_PARENT_REGEX = /\A#{TP_VERSION}-#{TP_TRACE_ID}-#{TP_PARENT_ID}-#{TP_TRACE_FLAGS}#{TP_UNDEFINED_FIELDS}?\z/
|
32
32
|
|
33
33
|
TRACE_PARENT_FORMAT_STRING = "%02x-%s-%s-%02x"
|
34
34
|
|
@@ -36,16 +36,16 @@ module NewRelic
|
|
36
36
|
MAX_TRACE_STATE_ENTRY_SIZE = 128 # bytes
|
37
37
|
|
38
38
|
SUPPORTABILITY_TRACE_PARENT_PARSE_EXCEPTION = "Supportability/TraceContext/TraceParent/Parse/Exception"
|
39
|
-
SUPPORTABILITY_TRACE_STATE_PARSE_EXCEPTION
|
39
|
+
SUPPORTABILITY_TRACE_STATE_PARSE_EXCEPTION = "Supportability/TraceContext/TraceState/Parse/Exception"
|
40
40
|
SUPPORTABILITY_TRACE_STATE_INVALID_NR_ENTRY = "Supportability/TraceContext/TraceState/InvalidNrEntry"
|
41
41
|
|
42
42
|
class << self
|
43
43
|
def insert format: NewRelic::FORMAT_NON_RACK,
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
44
|
+
carrier: nil,
|
45
|
+
parent_id: nil,
|
46
|
+
trace_id: nil,
|
47
|
+
trace_flags: nil,
|
48
|
+
trace_state: nil
|
49
49
|
|
50
50
|
trace_parent_header = trace_parent_header_for_format format
|
51
51
|
carrier[trace_parent_header] = format_trace_parent \
|
@@ -58,8 +58,8 @@ module NewRelic
|
|
58
58
|
end
|
59
59
|
|
60
60
|
def parse format: NewRelic::FORMAT_NON_RACK,
|
61
|
-
|
62
|
-
|
61
|
+
carrier: nil,
|
62
|
+
trace_state_entry_key: nil
|
63
63
|
trace_parent = extract_traceparent(format, carrier)
|
64
64
|
unless trace_parent_valid? trace_parent
|
65
65
|
NewRelic::Agent.increment_metric SUPPORTABILITY_TRACE_PARENT_PARSE_EXCEPTION
|
@@ -84,13 +84,13 @@ module NewRelic
|
|
84
84
|
private
|
85
85
|
|
86
86
|
def format_trace_parent trace_id: nil,
|
87
|
-
|
88
|
-
|
87
|
+
parent_id: nil,
|
88
|
+
trace_flags: nil
|
89
89
|
sprintf TRACE_PARENT_FORMAT_STRING,
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
90
|
+
VERSION,
|
91
|
+
trace_id,
|
92
|
+
parent_id,
|
93
|
+
trace_flags
|
94
94
|
end
|
95
95
|
|
96
96
|
def extract_traceparent format, carrier
|
@@ -158,9 +158,9 @@ module NewRelic
|
|
158
158
|
trace_state_vendors.chomp! COMMA
|
159
159
|
|
160
160
|
HeaderData.create trace_state_payload: payload ? decode_payload(payload) : nil,
|
161
|
-
|
162
|
-
|
163
|
-
|
161
|
+
trace_state_entries: trace_state,
|
162
|
+
trace_state_size: trace_state_size,
|
163
|
+
trace_state_vendors: trace_state_vendors
|
164
164
|
end
|
165
165
|
|
166
166
|
def decode_payload payload
|
@@ -176,15 +176,15 @@ module NewRelic
|
|
176
176
|
class HeaderData
|
177
177
|
class << self
|
178
178
|
def create trace_parent: nil,
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
179
|
+
trace_state_payload: nil,
|
180
|
+
trace_state_entries: nil,
|
181
|
+
trace_state_size: 0,
|
182
|
+
trace_state_vendors: nil
|
183
183
|
new trace_parent, \
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
184
|
+
trace_state_payload, \
|
185
|
+
trace_state_entries, \
|
186
|
+
trace_state_size, \
|
187
|
+
trace_state_vendors
|
188
188
|
end
|
189
189
|
end
|
190
190
|
|
@@ -237,9 +237,7 @@ module NewRelic
|
|
237
237
|
|
238
238
|
joined_trace_state
|
239
239
|
end
|
240
|
-
|
241
240
|
end
|
242
|
-
|
243
241
|
end
|
244
242
|
end
|
245
243
|
end
|
@@ -15,21 +15,21 @@ module NewRelic
|
|
15
15
|
TRUE_CHAR = '1'.freeze
|
16
16
|
FALSE_CHAR = '0'.freeze
|
17
17
|
|
18
|
-
PARENT_TYPES = %w
|
18
|
+
PARENT_TYPES = %w[App Browser Mobile].map(&:freeze).freeze
|
19
19
|
|
20
20
|
class << self
|
21
21
|
def create version: VERSION,
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
22
|
+
parent_type: PARENT_TYPE,
|
23
|
+
parent_account_id: nil,
|
24
|
+
parent_app_id: nil,
|
25
|
+
id: nil,
|
26
|
+
transaction_id: nil,
|
27
|
+
sampled: nil,
|
28
|
+
priority: nil,
|
29
|
+
timestamp: now_ms
|
30
30
|
|
31
31
|
new version, parent_type, parent_account_id, parent_app_id, id,
|
32
|
-
|
32
|
+
transaction_id, sampled, priority, timestamp
|
33
33
|
end
|
34
34
|
|
35
35
|
include NewRelic::Coerce
|
@@ -71,19 +71,19 @@ module NewRelic
|
|
71
71
|
end
|
72
72
|
|
73
73
|
attr_accessor :version,
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
74
|
+
:parent_type_id,
|
75
|
+
:parent_account_id,
|
76
|
+
:parent_app_id,
|
77
|
+
:id,
|
78
|
+
:transaction_id,
|
79
|
+
:sampled,
|
80
|
+
:priority,
|
81
|
+
:timestamp
|
82
82
|
|
83
83
|
alias_method :sampled?, :sampled
|
84
84
|
|
85
85
|
def initialize version, parent_type_id, parent_account_id, parent_app_id,
|
86
|
-
|
86
|
+
id, transaction_id, sampled, priority, timestamp
|
87
87
|
@version = version
|
88
88
|
@parent_type_id = parent_type_id
|
89
89
|
@parent_account_id = parent_account_id
|
@@ -111,14 +111,14 @@ module NewRelic
|
|
111
111
|
|
112
112
|
def to_s
|
113
113
|
result = version.to_s # required
|
114
|
-
result << DELIMITER << parent_type_id.to_s # required
|
115
|
-
result << DELIMITER << parent_account_id # required
|
116
|
-
result << DELIMITER << parent_app_id # required
|
114
|
+
result << DELIMITER << parent_type_id.to_s # required
|
115
|
+
result << DELIMITER << parent_account_id # required
|
116
|
+
result << DELIMITER << parent_app_id # required
|
117
117
|
result << DELIMITER << (id || NewRelic::EMPTY_STR)
|
118
118
|
result << DELIMITER << (transaction_id || NewRelic::EMPTY_STR)
|
119
119
|
result << DELIMITER << (sampled ? TRUE_CHAR : FALSE_CHAR)
|
120
120
|
result << DELIMITER << sprintf("%.6f", priority)
|
121
|
-
result << DELIMITER << timestamp.to_s # required
|
121
|
+
result << DELIMITER << timestamp.to_s # required
|
122
122
|
result
|
123
123
|
end
|
124
124
|
end
|
@@ -23,7 +23,7 @@ module NewRelic
|
|
23
23
|
module DistributedTracing
|
24
24
|
extend NewRelic::SupportabilityHelper
|
25
25
|
extend self
|
26
|
-
|
26
|
+
|
27
27
|
# Adds the Distributed Trace headers so that the downstream service can participate in a
|
28
28
|
# distributed trace. This method should be called every time an outbound call is made
|
29
29
|
# since the header payload contains a timestamp.
|
@@ -34,7 +34,7 @@ module NewRelic
|
|
34
34
|
# New Relic distributed tracing header by default. New Relic headers may be suppressed by
|
35
35
|
# setting +exclude_new_relic_header+ to +true+ in your configuration file.
|
36
36
|
#
|
37
|
-
# @param headers [Hash] Is a Hash to which the distributed trace headers
|
37
|
+
# @param headers [Hash] Is a Hash to which the distributed trace headers
|
38
38
|
# will be inserted.
|
39
39
|
#
|
40
40
|
# @return {Transaction} The transaction the headers were inserted from,
|
@@ -42,7 +42,7 @@ module NewRelic
|
|
42
42
|
#
|
43
43
|
# @api public
|
44
44
|
#
|
45
|
-
def insert_distributed_trace_headers headers={}
|
45
|
+
def insert_distributed_trace_headers headers = {}
|
46
46
|
record_api_supportability_metric(:insert_distributed_trace_headers)
|
47
47
|
|
48
48
|
unless Agent.config[:'distributed_tracing.enabled']
|
@@ -61,11 +61,11 @@ module NewRelic
|
|
61
61
|
nil
|
62
62
|
end
|
63
63
|
|
64
|
-
# Accepts distributed tracing headers from any source that has been packaged
|
64
|
+
# Accepts distributed tracing headers from any source that has been packaged
|
65
65
|
# as a Ruby Hash, thereby allowing the user to manually inject distributed
|
66
|
-
# tracing headers. It is optimized to process +HTTP_TRACEPARENT+, +HTTP_TRACESTATE+,
|
67
|
-
# and +HTTP_NEWRELIC+ as the given Hash keys. which is the most common scenario
|
68
|
-
# from Rack middleware in most Ruby applications. However, the Hash keys are
|
66
|
+
# tracing headers. It is optimized to process +HTTP_TRACEPARENT+, +HTTP_TRACESTATE+,
|
67
|
+
# and +HTTP_NEWRELIC+ as the given Hash keys. which is the most common scenario
|
68
|
+
# from Rack middleware in most Ruby applications. However, the Hash keys are
|
69
69
|
# case-insensitive and the "HTTP_" prefixes may also be omitted.
|
70
70
|
#
|
71
71
|
# Calling this method is not necessary in a typical HTTP trace as
|
@@ -75,13 +75,13 @@ module NewRelic
|
|
75
75
|
# as calling after the headers are already created will have no effect.
|
76
76
|
#
|
77
77
|
# This method accepts both W3C trace context and New Relic distributed tracing headers.
|
78
|
-
# When both are present, only the W3C headers are utilized. When W3C trace context
|
78
|
+
# When both are present, only the W3C headers are utilized. When W3C trace context
|
79
79
|
# headers are present, New Relic headers are ignored regardless if W3C trace context
|
80
|
-
# headers are valid and parsable.
|
80
|
+
# headers are valid and parsable.
|
81
81
|
#
|
82
|
-
# @param headers [Hash] Incoming distributed trace headers as a Ruby
|
82
|
+
# @param headers [Hash] Incoming distributed trace headers as a Ruby
|
83
83
|
# Hash object. Hash keys are expected to be one of
|
84
|
-
# +TRACEPARENT+, +TRACESTATE+, +NEWRELIC+ and are
|
84
|
+
# +TRACEPARENT+, +TRACESTATE+, +NEWRELIC+ and are
|
85
85
|
# case-insensitive, with or without "HTTP_" prefixes.
|
86
86
|
#
|
87
87
|
# either as a JSON string or as a
|
@@ -113,14 +113,14 @@ module NewRelic
|
|
113
113
|
# otherwise, fish for key/value pairs regardless of prefix and case-sensitivity.
|
114
114
|
hdr = if transport_type.start_with? NewRelic::HTTP
|
115
115
|
headers
|
116
|
-
else
|
116
|
+
else
|
117
117
|
# start with the most common case first
|
118
118
|
hdr = {
|
119
119
|
NewRelic::HTTP_TRACEPARENT_KEY => headers[NewRelic::TRACEPARENT_KEY],
|
120
|
-
NewRelic::HTTP_TRACESTATE_KEY => headers[NewRelic::TRACESTATE_KEY],
|
120
|
+
NewRelic::HTTP_TRACESTATE_KEY => headers[NewRelic::TRACESTATE_KEY],
|
121
121
|
NewRelic::HTTP_NEWRELIC_KEY => headers[NewRelic::NEWRELIC_KEY]
|
122
|
-
}
|
123
|
-
|
122
|
+
}
|
123
|
+
|
124
124
|
# when not found, search for any casing for trace context headers, ignoring potential prefixes
|
125
125
|
hdr[NewRelic::HTTP_TRACEPARENT_KEY] ||= variant_key_value headers, NewRelic::TRACEPARENT_KEY
|
126
126
|
hdr[NewRelic::HTTP_TRACESTATE_KEY] ||= variant_key_value headers, NewRelic::TRACESTATE_KEY
|
@@ -134,7 +134,7 @@ module NewRelic
|
|
134
134
|
NewRelic::Agent.logger.error 'error during accept_distributed_trace_headers', e
|
135
135
|
nil
|
136
136
|
end
|
137
|
-
|
137
|
+
|
138
138
|
private
|
139
139
|
|
140
140
|
def has_variant_key? key, variants
|
@@ -142,9 +142,8 @@ module NewRelic
|
|
142
142
|
end
|
143
143
|
|
144
144
|
def variant_key_value headers, variants
|
145
|
-
(headers.detect{|k, v| has_variant_key?(k, variants)} || NewRelic::EMPTY_ARRAY)[1]
|
145
|
+
(headers.detect { |k, v| has_variant_key?(k, variants) } || NewRelic::EMPTY_ARRAY)[1]
|
146
146
|
end
|
147
|
-
|
148
147
|
end
|
149
148
|
end
|
150
149
|
end
|
@@ -24,7 +24,7 @@ module NewRelic
|
|
24
24
|
return object if object.empty?
|
25
25
|
hash = {}
|
26
26
|
object.each_pair do |k, v|
|
27
|
-
k = normalize_string(k)
|
27
|
+
k = normalize_string(k) if k.is_a?(String)
|
28
28
|
k = normalize_string(k.to_s) if k.is_a?(Symbol)
|
29
29
|
hash[k] = normalize_object(v)
|
30
30
|
end
|