newrelic_rpm 6.6.0.358 → 6.11.0.365
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +3 -0
- data/.travis.yml +81 -5
- data/CHANGELOG.md +262 -0
- data/Gemfile +6 -2
- data/Guardfile +18 -1
- data/LICENSE +1 -1
- data/Rakefile +2 -0
- data/lib/new_relic/agent.rb +89 -7
- data/lib/new_relic/agent/agent.rb +115 -58
- data/lib/new_relic/agent/agent_logger.rb +4 -0
- data/lib/new_relic/agent/attribute_filter.rb +7 -7
- data/lib/new_relic/agent/attributes.rb +150 -0
- data/lib/new_relic/agent/autostart.rb +19 -14
- data/lib/new_relic/agent/configuration/default_source.rb +154 -9
- data/lib/new_relic/agent/configuration/event_harvest_config.rb +11 -5
- data/lib/new_relic/agent/configuration/manager.rb +0 -8
- data/lib/new_relic/agent/configuration/server_source.rb +3 -2
- data/lib/new_relic/agent/configuration/yaml_source.rb +11 -6
- data/lib/new_relic/agent/connect/request_builder.rb +5 -13
- data/lib/new_relic/agent/database.rb +1 -2
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo.rb +1 -1
- data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +2 -2
- data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +8 -8
- data/lib/new_relic/agent/distributed_tracing.rb +155 -6
- data/lib/new_relic/agent/{cross_app_payload.rb → distributed_tracing/cross_app_payload.rb} +2 -1
- data/lib/new_relic/agent/{cross_app_tracing.rb → distributed_tracing/cross_app_tracing.rb} +60 -45
- data/lib/new_relic/agent/distributed_tracing/distributed_trace_intrinsics.rb +80 -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} +24 -101
- 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/error_collector.rb +33 -16
- data/lib/new_relic/agent/error_event_aggregator.rb +7 -5
- data/lib/new_relic/agent/external.rb +7 -7
- data/lib/new_relic/agent/guid_generator.rb +28 -0
- data/lib/new_relic/agent/hostname.rb +7 -1
- data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +24 -19
- data/lib/new_relic/agent/http_clients/excon_wrappers.rb +28 -13
- data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +17 -21
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +10 -11
- data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +16 -4
- data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +4 -6
- data/lib/new_relic/agent/http_clients/uri_util.rb +3 -2
- data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +5 -7
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +4 -0
- data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +11 -2
- data/lib/new_relic/agent/instrumentation/active_record.rb +4 -2
- data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +7 -2
- data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +8 -4
- data/lib/new_relic/agent/instrumentation/bunny.rb +45 -28
- data/lib/new_relic/agent/instrumentation/curb.rb +59 -18
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +3 -1
- data/lib/new_relic/agent/instrumentation/excon.rb +1 -1
- data/lib/new_relic/agent/instrumentation/excon/connection.rb +6 -3
- data/lib/new_relic/agent/instrumentation/excon/middleware.rb +2 -1
- data/lib/new_relic/agent/instrumentation/grape.rb +5 -10
- data/lib/new_relic/agent/instrumentation/http.rb +6 -3
- data/lib/new_relic/agent/instrumentation/httpclient.rb +5 -3
- data/lib/new_relic/agent/instrumentation/memcache.rb +3 -1
- data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +6 -2
- data/lib/new_relic/agent/instrumentation/mongo.rb +9 -3
- data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +13 -0
- data/lib/new_relic/agent/instrumentation/net.rb +6 -3
- data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +25 -1
- data/lib/new_relic/agent/instrumentation/redis.rb +9 -3
- data/lib/new_relic/agent/instrumentation/resque.rb +3 -0
- data/lib/new_relic/agent/instrumentation/sidekiq.rb +47 -23
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +23 -6
- data/lib/new_relic/agent/logging.rb +139 -0
- data/lib/new_relic/agent/messaging.rb +5 -73
- data/lib/new_relic/agent/method_tracer.rb +18 -6
- data/lib/new_relic/agent/method_tracer_helpers.rb +2 -2
- 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} +1 -1
- data/lib/new_relic/agent/{synthetics_monitor.rb → monitors/synthetics_monitor.rb} +2 -4
- data/lib/new_relic/agent/new_relic_service.rb +7 -6
- data/lib/new_relic/agent/noticible_error.rb +22 -0
- data/lib/new_relic/agent/span_event_aggregator.rb +1 -0
- data/lib/new_relic/agent/span_event_primitive.rb +86 -53
- data/lib/new_relic/agent/sql_sampler.rb +3 -3
- data/lib/new_relic/agent/supported_versions.rb +2 -2
- data/lib/new_relic/agent/system_info.rb +12 -3
- data/lib/new_relic/agent/tracer.rb +65 -18
- data/lib/new_relic/agent/transaction.rb +84 -79
- data/lib/new_relic/agent/transaction/abstract_segment.rb +28 -2
- data/lib/new_relic/agent/transaction/distributed_tracer.rb +171 -0
- data/lib/new_relic/agent/transaction/distributed_tracing.rb +57 -146
- data/lib/new_relic/agent/transaction/external_request_segment.rb +29 -36
- data/lib/new_relic/agent/transaction/message_broker_segment.rb +3 -11
- data/lib/new_relic/agent/transaction/segment.rb +7 -1
- data/lib/new_relic/agent/transaction/trace.rb +2 -4
- data/lib/new_relic/agent/transaction/trace_context.rb +168 -0
- data/lib/new_relic/agent/transaction/trace_node.rb +10 -8
- data/lib/new_relic/agent/transaction_error_primitive.rb +10 -15
- data/lib/new_relic/agent/transaction_event_primitive.rb +28 -39
- data/lib/new_relic/cli/commands/deployments.rb +1 -1
- data/lib/new_relic/cli/commands/install.rb +3 -2
- data/lib/new_relic/coerce.rb +31 -6
- data/lib/new_relic/constants.rb +38 -0
- data/lib/new_relic/control/instance_methods.rb +10 -1
- data/lib/new_relic/dependency_detection.rb +4 -4
- data/lib/new_relic/environment_report.rb +5 -1
- data/lib/new_relic/noticed_error.rb +38 -17
- data/lib/new_relic/rack/browser_monitoring.rb +5 -0
- data/lib/new_relic/supportability_helper.rb +14 -0
- data/lib/new_relic/version.rb +1 -1
- data/lib/tasks/multiverse.rb +25 -0
- data/lib/tasks/tests.rake +6 -1
- data/newrelic_rpm.gemspec +19 -8
- data/test/agent_helper.rb +323 -71
- metadata +100 -33
- 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
@@ -4,6 +4,7 @@
|
|
4
4
|
|
5
5
|
require 'new_relic/agent/transaction/abstract_segment'
|
6
6
|
require 'new_relic/agent/span_event_primitive'
|
7
|
+
require 'new_relic/agent/attributes'
|
7
8
|
|
8
9
|
module NewRelic
|
9
10
|
module Agent
|
@@ -12,13 +13,18 @@ module NewRelic
|
|
12
13
|
# unscoped_metrics can be nil, a string, or array. we do this to save
|
13
14
|
# object allocations. if allocations weren't important then we would
|
14
15
|
# initialize it as an array that would be empty, have one item, or many items.
|
15
|
-
attr_reader :unscoped_metrics
|
16
|
+
attr_reader :unscoped_metrics, :attributes
|
16
17
|
|
17
18
|
def initialize name=nil, unscoped_metrics=nil, start_time=nil
|
18
19
|
@unscoped_metrics = unscoped_metrics
|
20
|
+
@attributes = Attributes.new(NewRelic::Agent.instance.attribute_filter)
|
19
21
|
super name, start_time
|
20
22
|
end
|
21
23
|
|
24
|
+
def add_custom_attributes(p)
|
25
|
+
attributes.merge_custom_attributes(p)
|
26
|
+
end
|
27
|
+
|
22
28
|
private
|
23
29
|
|
24
30
|
def record_metrics
|
@@ -121,13 +121,11 @@ module NewRelic
|
|
121
121
|
}
|
122
122
|
end
|
123
123
|
|
124
|
-
EMPTY_HASH = {}.freeze
|
125
|
-
|
126
124
|
def trace_tree attributes_hash
|
127
125
|
[
|
128
126
|
NewRelic::Coerce.float(self.start_time),
|
129
|
-
EMPTY_HASH,
|
130
|
-
EMPTY_HASH,
|
127
|
+
NewRelic::EMPTY_HASH,
|
128
|
+
NewRelic::EMPTY_HASH,
|
131
129
|
self.root_node.to_array,
|
132
130
|
attributes_hash
|
133
131
|
]
|
@@ -0,0 +1,168 @@
|
|
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
|
+
# frozen_string_literal: true
|
5
|
+
|
6
|
+
module NewRelic
|
7
|
+
module Agent
|
8
|
+
class Transaction
|
9
|
+
module TraceContext
|
10
|
+
include NewRelic::Coerce
|
11
|
+
|
12
|
+
module AccountHelpers
|
13
|
+
extend self
|
14
|
+
|
15
|
+
def trace_state_entry_key
|
16
|
+
@trace_state_entry_key ||= if Agent.config[:trusted_account_key]
|
17
|
+
"#{Agent.config[:trusted_account_key]}@nr".freeze
|
18
|
+
elsif Agent.config[:account_id]
|
19
|
+
"#{Agent.config[:account_id]}@nr".freeze
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
SUPPORTABILITY_PREFIX = "Supportability/TraceContext"
|
25
|
+
CREATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/Create"
|
26
|
+
ACCEPT_PREFIX = "#{SUPPORTABILITY_PREFIX}/Accept"
|
27
|
+
TRACESTATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/TraceState"
|
28
|
+
|
29
|
+
CREATE_SUCCESS_METRIC = "#{CREATE_PREFIX}/Success"
|
30
|
+
CREATE_EXCEPTION_METRIC = "#{CREATE_PREFIX}/Exception"
|
31
|
+
|
32
|
+
ACCEPT_SUCCESS_METRIC = "#{ACCEPT_PREFIX}/Success"
|
33
|
+
ACCEPT_EXCEPTION_METRIC = "#{ACCEPT_PREFIX}/Exception"
|
34
|
+
IGNORE_MULTIPLE_ACCEPT_METRIC = "#{ACCEPT_PREFIX}/Ignored/Multiple"
|
35
|
+
IGNORE_ACCEPT_AFTER_CREATE_METRIC = "#{ACCEPT_PREFIX}/Ignored/CreateBeforeAccept"
|
36
|
+
|
37
|
+
NO_NR_ENTRY_TRACESTATE_METRIC = "#{TRACESTATE_PREFIX}/NoNrEntry"
|
38
|
+
INVALID_TRACESTATE_PAYLOAD_METRIC = "#{TRACESTATE_PREFIX}/InvalidNrEntry"
|
39
|
+
|
40
|
+
attr_accessor :trace_context_header_data
|
41
|
+
attr_reader :trace_state_payload
|
42
|
+
|
43
|
+
def trace_parent_header_present? request
|
44
|
+
request[NewRelic::HTTP_TRACEPARENT_KEY]
|
45
|
+
end
|
46
|
+
|
47
|
+
def accept_trace_context_incoming_request request
|
48
|
+
header_data = NewRelic::Agent::DistributedTracing::TraceContext.parse(
|
49
|
+
format: NewRelic::FORMAT_RACK,
|
50
|
+
carrier: request,
|
51
|
+
trace_state_entry_key: AccountHelpers.trace_state_entry_key,
|
52
|
+
)
|
53
|
+
return if header_data.nil?
|
54
|
+
|
55
|
+
accept_trace_context header_data
|
56
|
+
end
|
57
|
+
private :accept_trace_context_incoming_request
|
58
|
+
|
59
|
+
def insert_trace_context_header header, format=NewRelic::FORMAT_NON_RACK
|
60
|
+
return unless Agent.config[:'distributed_tracing.enabled']
|
61
|
+
|
62
|
+
NewRelic::Agent::DistributedTracing::TraceContext.insert \
|
63
|
+
format: format,
|
64
|
+
carrier: header,
|
65
|
+
trace_id: transaction.trace_id.rjust(32, '0').downcase,
|
66
|
+
parent_id: transaction.current_segment.guid,
|
67
|
+
trace_flags: transaction.sampled? ? 0x1 : 0x0,
|
68
|
+
trace_state: create_trace_state
|
69
|
+
|
70
|
+
@trace_context_inserted = true
|
71
|
+
|
72
|
+
NewRelic::Agent.increment_metric CREATE_SUCCESS_METRIC
|
73
|
+
true
|
74
|
+
rescue Exception => e
|
75
|
+
NewRelic::Agent.increment_metric CREATE_EXCEPTION_METRIC
|
76
|
+
NewRelic::Agent.logger.warn "Failed to create trace context payload", e
|
77
|
+
false
|
78
|
+
end
|
79
|
+
|
80
|
+
def create_trace_state
|
81
|
+
entry_key = AccountHelpers.trace_state_entry_key.dup
|
82
|
+
payload = create_trace_state_payload
|
83
|
+
|
84
|
+
if payload
|
85
|
+
entry = NewRelic::Agent::DistributedTracing::TraceContext.create_trace_state_entry \
|
86
|
+
entry_key,
|
87
|
+
payload.to_s
|
88
|
+
else
|
89
|
+
entry = NewRelic::EMPTY_STR
|
90
|
+
end
|
91
|
+
|
92
|
+
trace_context_header_data ? trace_context_header_data.trace_state(entry) : entry
|
93
|
+
end
|
94
|
+
|
95
|
+
def create_trace_state_payload
|
96
|
+
unless Agent.config[:'distributed_tracing.enabled']
|
97
|
+
NewRelic::Agent.logger.warn "Not configured to create WC3 trace context payload"
|
98
|
+
return
|
99
|
+
end
|
100
|
+
|
101
|
+
|
102
|
+
span_guid = Agent.config[:'span_events.enabled'] ? transaction.current_segment.guid : nil
|
103
|
+
transaction_guid = Agent.config[:'analytics_events.enabled'] ? transaction.guid : nil
|
104
|
+
|
105
|
+
TraceContextPayload.create \
|
106
|
+
parent_account_id: Agent.config[:account_id],
|
107
|
+
parent_app_id: Agent.config[:primary_application_id],
|
108
|
+
transaction_id: transaction_guid,
|
109
|
+
sampled: transaction.sampled?,
|
110
|
+
priority: float!(transaction.priority, NewRelic::PRIORITY_PRECISION),
|
111
|
+
id: span_guid
|
112
|
+
end
|
113
|
+
|
114
|
+
def assign_trace_state_payload
|
115
|
+
payload = @trace_context_header_data.trace_state_payload
|
116
|
+
unless payload
|
117
|
+
NewRelic::Agent.increment_metric NO_NR_ENTRY_TRACESTATE_METRIC
|
118
|
+
return false
|
119
|
+
end
|
120
|
+
unless payload.valid?
|
121
|
+
NewRelic::Agent.increment_metric INVALID_TRACESTATE_PAYLOAD_METRIC
|
122
|
+
return false
|
123
|
+
end
|
124
|
+
@trace_state_payload = payload
|
125
|
+
end
|
126
|
+
|
127
|
+
def accept_trace_context header_data
|
128
|
+
return if ignore_trace_context?
|
129
|
+
|
130
|
+
@trace_context_header_data = header_data
|
131
|
+
transaction.trace_id = header_data.trace_id
|
132
|
+
transaction.parent_span_id = header_data.parent_id
|
133
|
+
|
134
|
+
return false unless payload = assign_trace_state_payload
|
135
|
+
|
136
|
+
transaction.distributed_tracer.parent_transaction_id = payload.transaction_id
|
137
|
+
|
138
|
+
unless payload.sampled.nil?
|
139
|
+
transaction.sampled = payload.sampled
|
140
|
+
transaction.priority = payload.priority if payload.priority
|
141
|
+
end
|
142
|
+
NewRelic::Agent.increment_metric ACCEPT_SUCCESS_METRIC
|
143
|
+
true
|
144
|
+
rescue => e
|
145
|
+
NewRelic::Agent.increment_metric ACCEPT_EXCEPTION_METRIC
|
146
|
+
NewRelic::Agent.logger.warn "Failed to accept trace context payload", e
|
147
|
+
false
|
148
|
+
end
|
149
|
+
|
150
|
+
def ignore_trace_context?
|
151
|
+
if trace_context_header_data
|
152
|
+
NewRelic::Agent.increment_metric IGNORE_MULTIPLE_ACCEPT_METRIC
|
153
|
+
return true
|
154
|
+
elsif trace_context_inserted?
|
155
|
+
NewRelic::Agent.increment_metric IGNORE_ACCEPT_AFTER_CREATE_METRIC
|
156
|
+
return true
|
157
|
+
end
|
158
|
+
false
|
159
|
+
end
|
160
|
+
|
161
|
+
def trace_context_inserted?
|
162
|
+
@trace_context_inserted ||= false
|
163
|
+
end
|
164
|
+
|
165
|
+
end
|
166
|
+
end
|
167
|
+
end
|
168
|
+
end
|
@@ -22,12 +22,17 @@ module NewRelic
|
|
22
22
|
@metric_name = metric_name || UNKNOWN_NODE_NAME
|
23
23
|
@exit_timestamp = relative_end
|
24
24
|
@children = nil
|
25
|
-
@params = params
|
26
|
-
NewRelic::Agent.instance.attribute_filter.allows_key? p, AttributeFilter::DST_TRANSACTION_SEGMENTS
|
27
|
-
end if params
|
25
|
+
@params = select_allowed_params(params)
|
28
26
|
@parent_node = parent
|
29
27
|
end
|
30
28
|
|
29
|
+
def select_allowed_params params
|
30
|
+
return unless params
|
31
|
+
params.select do |p|
|
32
|
+
NewRelic::Agent.instance.attribute_filter.allows_key? p, AttributeFilter::DST_TRANSACTION_SEGMENTS
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
31
36
|
# sets the final timestamp on a node to indicate the exit
|
32
37
|
# point of the node
|
33
38
|
def end_trace(timestamp)
|
@@ -38,16 +43,13 @@ module NewRelic
|
|
38
43
|
to_debug_str(0)
|
39
44
|
end
|
40
45
|
|
41
|
-
EMPTY_HASH = {}.freeze
|
42
|
-
EMPTY_ARRAY = [].freeze
|
43
|
-
|
44
46
|
def to_array
|
45
|
-
params = @params ? @params : EMPTY_HASH
|
47
|
+
params = @params ? @params : NewRelic::EMPTY_HASH
|
46
48
|
[ NewRelic::Helper.time_to_millis(@entry_timestamp),
|
47
49
|
NewRelic::Helper.time_to_millis(@exit_timestamp),
|
48
50
|
NewRelic::Coerce.string(@metric_name),
|
49
51
|
params ] +
|
50
|
-
[ (@children ? @children.map{|s| s.to_array} : EMPTY_ARRAY) ]
|
52
|
+
[ (@children ? @children.map{|s| s.to_array} : NewRelic::EMPTY_ARRAY) ]
|
51
53
|
end
|
52
54
|
|
53
55
|
def path_string
|
@@ -8,7 +8,8 @@
|
|
8
8
|
# the transaction event aggregator and the synthetics container.
|
9
9
|
|
10
10
|
require 'new_relic/agent/payload_metric_mapping'
|
11
|
-
require 'new_relic/agent/distributed_trace_payload'
|
11
|
+
require 'new_relic/agent/distributed_tracing/distributed_trace_payload'
|
12
|
+
require 'new_relic/agent/distributed_tracing/distributed_trace_intrinsics'
|
12
13
|
|
13
14
|
module NewRelic
|
14
15
|
module Agent
|
@@ -31,16 +32,17 @@ module NewRelic
|
|
31
32
|
SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId".freeze
|
32
33
|
SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId".freeze
|
33
34
|
PRIORITY_KEY = "priority".freeze
|
35
|
+
SPAN_ID_KEY = "spanId".freeze
|
34
36
|
|
35
|
-
def create noticed_error, payload
|
37
|
+
def create noticed_error, payload, span_id
|
36
38
|
[
|
37
|
-
intrinsic_attributes_for(noticed_error, payload),
|
39
|
+
intrinsic_attributes_for(noticed_error, payload, span_id),
|
38
40
|
noticed_error.custom_attributes,
|
39
41
|
noticed_error.agent_attributes
|
40
42
|
]
|
41
43
|
end
|
42
44
|
|
43
|
-
def intrinsic_attributes_for noticed_error, payload
|
45
|
+
def intrinsic_attributes_for noticed_error, payload, span_id
|
44
46
|
attrs = {
|
45
47
|
TYPE_KEY => SAMPLE_TYPE,
|
46
48
|
ERROR_CLASS_KEY => noticed_error.exception_class_name,
|
@@ -49,16 +51,17 @@ module NewRelic
|
|
49
51
|
TIMESTAMP_KEY => noticed_error.timestamp.to_f
|
50
52
|
}
|
51
53
|
|
54
|
+
attrs[SPAN_ID_KEY] = span_id if span_id
|
52
55
|
attrs[PORT_KEY] = noticed_error.request_port if noticed_error.request_port
|
53
56
|
|
54
57
|
if payload
|
55
58
|
attrs[NAME_KEY] = payload[:name]
|
56
59
|
attrs[DURATION_KEY] = payload[:duration]
|
57
|
-
attrs[SAMPLED_KEY] = payload[:
|
58
|
-
attrs[PRIORITY_KEY] = payload[:
|
60
|
+
attrs[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
|
61
|
+
attrs[PRIORITY_KEY] = payload[:priority]
|
59
62
|
append_synthetics payload, attrs
|
60
63
|
append_cat payload, attrs
|
61
|
-
|
64
|
+
DistributedTraceIntrinsics.copy_to_hash payload, attrs
|
62
65
|
PayloadMetricMapping.append_mapped_metrics payload[:metrics], attrs
|
63
66
|
end
|
64
67
|
|
@@ -75,14 +78,6 @@ module NewRelic
|
|
75
78
|
sample[GUID_KEY] = payload[:guid] if payload[:guid]
|
76
79
|
sample[REFERRING_TRANSACTION_GUID_KEY] = payload[:referring_transaction_guid] if payload[:referring_transaction_guid]
|
77
80
|
end
|
78
|
-
|
79
|
-
def append_distributed_trace_intrinsics payload, sample
|
80
|
-
return unless Agent.config[:'distributed_tracing.enabled']
|
81
|
-
DistributedTracePayload::INTRINSIC_KEYS.each do |key|
|
82
|
-
value = payload[key]
|
83
|
-
sample[key] = value unless value.nil?
|
84
|
-
end
|
85
|
-
end
|
86
81
|
end
|
87
82
|
end
|
88
83
|
end
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
# This file is distributed under New Relic's license terms.
|
3
3
|
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
+
# frozen_string_literal: true
|
4
5
|
|
5
6
|
# This module was introduced and largely extracted from the transaction event aggregator
|
6
7
|
# when the synthetics container was extracted from it. Its purpose is to create the data
|
@@ -8,7 +9,7 @@
|
|
8
9
|
# the transaction event aggregator and the synthetics container.
|
9
10
|
|
10
11
|
require 'new_relic/agent/payload_metric_mapping'
|
11
|
-
require 'new_relic/agent/
|
12
|
+
require 'new_relic/agent/distributed_tracing/distributed_trace_intrinsics'
|
12
13
|
|
13
14
|
module NewRelic
|
14
15
|
module Agent
|
@@ -16,30 +17,28 @@ module NewRelic
|
|
16
17
|
include NewRelic::Coerce
|
17
18
|
extend self
|
18
19
|
|
20
|
+
COMMA = ','
|
21
|
+
|
19
22
|
# The type field of the sample
|
20
|
-
SAMPLE_TYPE = 'Transaction'
|
23
|
+
SAMPLE_TYPE = 'Transaction'
|
21
24
|
|
22
25
|
# Strings for static keys of the sample structure
|
23
|
-
TYPE_KEY = 'type'
|
24
|
-
TIMESTAMP_KEY = 'timestamp'
|
25
|
-
NAME_KEY = 'name'
|
26
|
-
DURATION_KEY = 'duration'
|
27
|
-
ERROR_KEY = 'error'
|
28
|
-
SAMPLED_KEY = 'sampled'
|
29
|
-
PRIORITY_KEY = 'priority'
|
30
|
-
GUID_KEY = 'nr.guid'
|
31
|
-
REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'
|
32
|
-
CAT_PATH_HASH_KEY = 'nr.pathHash'
|
33
|
-
CAT_REFERRING_PATH_HASH_KEY = 'nr.referringPathHash'
|
34
|
-
CAT_ALTERNATE_PATH_HASHES_KEY = 'nr.alternatePathHashes'
|
35
|
-
APDEX_PERF_ZONE_KEY = 'nr.apdexPerfZone'
|
36
|
-
SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId"
|
37
|
-
SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId"
|
38
|
-
SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId"
|
39
|
-
|
40
|
-
|
41
|
-
# To avoid allocations when we have empty custom or agent attributes
|
42
|
-
EMPTY_HASH = {}.freeze
|
26
|
+
TYPE_KEY = 'type'
|
27
|
+
TIMESTAMP_KEY = 'timestamp'
|
28
|
+
NAME_KEY = 'name'
|
29
|
+
DURATION_KEY = 'duration'
|
30
|
+
ERROR_KEY = 'error'
|
31
|
+
SAMPLED_KEY = 'sampled'
|
32
|
+
PRIORITY_KEY = 'priority'
|
33
|
+
GUID_KEY = 'nr.guid'
|
34
|
+
REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'
|
35
|
+
CAT_PATH_HASH_KEY = 'nr.pathHash'
|
36
|
+
CAT_REFERRING_PATH_HASH_KEY = 'nr.referringPathHash'
|
37
|
+
CAT_ALTERNATE_PATH_HASHES_KEY = 'nr.alternatePathHashes'
|
38
|
+
APDEX_PERF_ZONE_KEY = 'nr.apdexPerfZone'
|
39
|
+
SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId"
|
40
|
+
SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId"
|
41
|
+
SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId"
|
43
42
|
|
44
43
|
def create(payload)
|
45
44
|
intrinsics = {
|
@@ -51,11 +50,11 @@ module NewRelic
|
|
51
50
|
PRIORITY_KEY => payload[:priority]
|
52
51
|
}
|
53
52
|
|
54
|
-
intrinsics[SAMPLED_KEY] = payload[:
|
53
|
+
intrinsics[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
|
55
54
|
|
56
|
-
|
55
|
+
PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
|
57
56
|
append_optional_attributes(intrinsics, payload)
|
58
|
-
|
57
|
+
DistributedTraceIntrinsics.copy_to_hash payload, intrinsics
|
59
58
|
|
60
59
|
attributes = payload[:attributes]
|
61
60
|
|
@@ -76,22 +75,12 @@ module NewRelic
|
|
76
75
|
append_cat_alternate_path_hashes(sample, payload)
|
77
76
|
end
|
78
77
|
|
79
|
-
COMMA = ','.freeze
|
80
|
-
|
81
78
|
def append_cat_alternate_path_hashes(sample, payload)
|
82
79
|
if payload.include?(:cat_alternate_path_hashes)
|
83
80
|
sample[CAT_ALTERNATE_PATH_HASHES_KEY] = payload[:cat_alternate_path_hashes].sort.join(COMMA)
|
84
81
|
end
|
85
82
|
end
|
86
83
|
|
87
|
-
def append_distributed_trace_intrinsics(sample, payload)
|
88
|
-
return unless Agent.config[:'distributed_tracing.enabled']
|
89
|
-
DistributedTracePayload::INTRINSIC_KEYS.each do |key|
|
90
|
-
value = payload[key]
|
91
|
-
sample[key] = value unless value.nil?
|
92
|
-
end
|
93
|
-
end
|
94
|
-
|
95
84
|
def optionally_append(sample_key, payload_key, sample, payload)
|
96
85
|
if payload.include?(payload_key)
|
97
86
|
sample[sample_key] = string(payload[payload_key])
|
@@ -100,19 +89,19 @@ module NewRelic
|
|
100
89
|
|
101
90
|
def custom_attributes attributes
|
102
91
|
if attributes
|
103
|
-
result = attributes.custom_attributes_for(
|
92
|
+
result = attributes.custom_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
|
104
93
|
result.freeze
|
105
94
|
else
|
106
|
-
EMPTY_HASH
|
95
|
+
NewRelic::EMPTY_HASH
|
107
96
|
end
|
108
97
|
end
|
109
98
|
|
110
99
|
def agent_attributes attributes
|
111
100
|
if attributes
|
112
|
-
result = attributes.agent_attributes_for(
|
101
|
+
result = attributes.agent_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
|
113
102
|
result.freeze
|
114
103
|
else
|
115
|
-
EMPTY_HASH
|
104
|
+
NewRelic::EMPTY_HASH
|
116
105
|
end
|
117
106
|
end
|
118
107
|
end
|
@@ -39,7 +39,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
|
|
39
39
|
control.env = @environment if @environment
|
40
40
|
|
41
41
|
load_yaml_from_env(control.env)
|
42
|
-
@appname ||= NewRelic::Agent.config
|
42
|
+
@appname ||= NewRelic::Agent.config[:app_name][0] || control.env || 'development'
|
43
43
|
@license_key ||= NewRelic::Agent.config[:license_key]
|
44
44
|
|
45
45
|
setup_logging(control.env)
|