atatus 1.3.0 → 1.6.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +21 -0
- data/Gemfile +72 -22
- data/LICENSE +1 -1
- data/atatus.gemspec +2 -2
- data/lib/atatus/agent.rb +78 -29
- data/lib/atatus/central_config/cache_control.rb +18 -1
- data/lib/atatus/central_config.rb +72 -27
- data/lib/atatus/child_durations.rb +64 -0
- data/lib/atatus/collector/base.rb +102 -43
- data/lib/atatus/collector/builder.rb +134 -4
- data/lib/atatus/collector/hist.rb +54 -0
- data/lib/atatus/collector/layer.rb +1 -0
- data/lib/atatus/collector/transport.rb +41 -11
- data/lib/atatus/config/bytes.rb +17 -0
- data/lib/atatus/config/duration.rb +17 -0
- data/lib/atatus/config/options.rb +29 -9
- data/lib/atatus/config/regexp_list.rb +17 -0
- data/lib/atatus/config/wildcard_pattern_list.rb +64 -0
- data/lib/atatus/config.rb +129 -28
- data/lib/atatus/context/request/socket.rb +18 -1
- data/lib/atatus/context/request/url.rb +17 -0
- data/lib/atatus/context/request.rb +17 -0
- data/lib/atatus/context/response.rb +27 -2
- data/lib/atatus/context/user.rb +17 -0
- data/lib/atatus/context.rb +32 -1
- data/lib/atatus/context_builder.rb +19 -4
- data/lib/atatus/deprecations.rb +17 -0
- data/lib/atatus/error/exception.rb +24 -0
- data/lib/atatus/error/log.rb +17 -0
- data/lib/atatus/error.rb +27 -0
- data/lib/atatus/error_builder.rb +21 -2
- data/lib/atatus/grape.rb +62 -0
- data/lib/atatus/graphql.rb +91 -0
- data/lib/atatus/grpc.rb +99 -0
- data/lib/atatus/instrumenter.rb +135 -30
- data/lib/atatus/internal_error.rb +17 -0
- data/lib/atatus/logging.rb +17 -2
- data/lib/atatus/metadata/process_info.rb +17 -0
- data/lib/atatus/metadata/service_info.rb +21 -6
- data/lib/atatus/metadata/system_info/container_info.rb +49 -10
- data/lib/atatus/metadata/system_info/hw_info.rb +1 -1
- data/lib/atatus/metadata/system_info.rb +22 -3
- data/lib/atatus/metadata.rb +17 -0
- data/lib/atatus/metrics/breakdown_set.rb +31 -0
- data/lib/atatus/metrics/{cpu_mem.rb → cpu_mem_set.rb} +110 -63
- data/lib/atatus/metrics/metric.rb +140 -0
- data/lib/atatus/metrics/set.rb +123 -0
- data/lib/atatus/metrics/span_scoped_set.rb +56 -0
- data/lib/atatus/metrics/transaction_set.rb +26 -0
- data/lib/atatus/metrics/vm_set.rb +58 -0
- data/lib/atatus/metrics.rb +69 -27
- data/lib/atatus/metricset.rb +48 -4
- data/lib/atatus/middleware.rb +28 -8
- data/lib/atatus/naively_hashable.rb +17 -0
- data/lib/atatus/normalizers/grape/endpoint_run.rb +65 -0
- data/lib/atatus/normalizers/grape.rb +22 -0
- data/lib/atatus/normalizers/rails/action_controller.rb +44 -0
- data/lib/atatus/normalizers/rails/action_mailer.rb +43 -0
- data/lib/atatus/normalizers/{action_view.rb → rails/action_view.rb} +17 -0
- data/lib/atatus/normalizers/rails/active_record.rb +80 -0
- data/lib/atatus/normalizers/rails.rb +27 -0
- data/lib/atatus/normalizers.rb +23 -9
- data/lib/atatus/opentracing.rb +75 -42
- data/lib/atatus/rails.rb +29 -13
- data/lib/atatus/railtie.rb +19 -6
- data/lib/atatus/resque.rb +29 -0
- data/lib/atatus/sinatra.rb +53 -0
- data/lib/atatus/span/context/db.rb +43 -0
- data/lib/atatus/span/context/destination.rb +77 -0
- data/lib/atatus/span/context/http.rb +43 -0
- data/lib/atatus/span/context.rb +43 -28
- data/lib/atatus/span.rb +44 -15
- data/lib/atatus/span_helpers.rb +18 -1
- data/lib/atatus/spies/action_dispatch.rb +27 -6
- data/lib/atatus/spies/delayed_job.rb +26 -5
- data/lib/atatus/spies/dynamo_db.rb +62 -0
- data/lib/atatus/spies/elasticsearch.rb +53 -7
- data/lib/atatus/spies/faraday.rb +54 -20
- data/lib/atatus/spies/http.rb +36 -6
- data/lib/atatus/spies/json.rb +18 -0
- data/lib/atatus/spies/mongo.rb +41 -10
- data/lib/atatus/spies/net_http.rb +52 -11
- data/lib/atatus/spies/rake.rb +42 -23
- data/lib/atatus/spies/redis.rb +17 -0
- data/lib/atatus/spies/resque.rb +57 -0
- data/lib/atatus/spies/sequel.rb +54 -17
- data/lib/atatus/spies/shoryuken.rb +69 -0
- data/lib/atatus/spies/sidekiq.rb +46 -25
- data/lib/atatus/spies/sinatra.rb +20 -4
- data/lib/atatus/spies/sneakers.rb +74 -0
- data/lib/atatus/spies/sucker_punch.rb +58 -0
- data/lib/atatus/spies/tilt.rb +20 -1
- data/lib/atatus/spies.rb +33 -15
- data/lib/atatus/sql/signature.rb +169 -0
- data/lib/atatus/sql/tokenizer.rb +264 -0
- data/lib/atatus/sql/tokens.rb +63 -0
- data/lib/atatus/sql.rb +36 -0
- data/lib/atatus/sql_summarizer.rb +24 -6
- data/lib/atatus/stacktrace/frame.rb +17 -3
- data/lib/atatus/stacktrace.rb +17 -0
- data/lib/atatus/stacktrace_builder.rb +23 -3
- data/lib/atatus/subscriber.rb +23 -4
- data/lib/atatus/trace_context/traceparent.rb +111 -0
- data/lib/atatus/trace_context/tracestate.rb +148 -0
- data/lib/atatus/trace_context.rb +84 -51
- data/lib/atatus/transaction.rb +74 -18
- data/lib/atatus/transport/base.rb +44 -27
- data/lib/atatus/transport/connection/http.rb +58 -35
- data/lib/atatus/transport/connection/proxy_pipe.rb +24 -5
- data/lib/atatus/transport/connection.rb +28 -72
- data/lib/atatus/transport/filters/hash_sanitizer.rb +77 -0
- data/lib/atatus/transport/filters/secrets_filter.rb +30 -55
- data/lib/atatus/transport/filters.rb +18 -1
- data/lib/atatus/transport/headers.rb +83 -0
- data/lib/atatus/transport/serializers/context_serializer.rb +30 -3
- data/lib/atatus/transport/serializers/error_serializer.rb +17 -2
- data/lib/atatus/transport/serializers/metadata_serializer.rb +44 -22
- data/lib/atatus/transport/serializers/metricset_serializer.rb +34 -6
- data/lib/atatus/transport/serializers/span_serializer.rb +47 -12
- data/lib/atatus/transport/serializers/transaction_serializer.rb +18 -2
- data/lib/atatus/transport/serializers.rb +17 -5
- data/lib/atatus/transport/user_agent.rb +48 -0
- data/lib/atatus/transport/worker.rb +31 -7
- data/lib/atatus/util/inflector.rb +17 -0
- data/lib/atatus/util/lru_cache.rb +17 -0
- data/lib/atatus/util/throttle.rb +17 -0
- data/lib/atatus/util.rb +18 -1
- data/lib/atatus/version.rb +19 -1
- data/lib/atatus.rb +84 -16
- metadata +46 -26
- data/Rakefile +0 -19
- data/bench/.gitignore +0 -2
- data/bench/app.rb +0 -53
- data/bench/benchmark.rb +0 -36
- data/bench/report.rb +0 -55
- data/bench/rubyprof.rb +0 -39
- data/bench/stackprof.rb +0 -23
- data/bin/build_docs +0 -5
- data/bin/console +0 -15
- data/bin/setup +0 -8
- data/bin/with_framework +0 -7
- data/lib/atatus/metrics/vm.rb +0 -60
- data/lib/atatus/normalizers/action_controller.rb +0 -27
- data/lib/atatus/normalizers/action_mailer.rb +0 -26
- data/lib/atatus/normalizers/active_record.rb +0 -45
- data/lib/atatus/util/prefixed_logger.rb +0 -18
- data/vendor/.gitkeep +0 -0
@@ -0,0 +1,264 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
18
|
+
# frozen_string_literal: true
|
19
|
+
|
20
|
+
require 'strscan'
|
21
|
+
require 'atatus/sql/tokens'
|
22
|
+
|
23
|
+
module Atatus
|
24
|
+
module Sql
|
25
|
+
# @api private
|
26
|
+
class Tokenizer
|
27
|
+
include Tokens
|
28
|
+
|
29
|
+
ALPHA = /[[:alpha:]]/.freeze
|
30
|
+
DIGIT = /[[:digit:]]/.freeze
|
31
|
+
SPACE = /[[:space:]]+/.freeze
|
32
|
+
|
33
|
+
def initialize(input)
|
34
|
+
@input = input
|
35
|
+
|
36
|
+
@scanner = StringScanner.new(input)
|
37
|
+
@byte_start = 0
|
38
|
+
end
|
39
|
+
|
40
|
+
attr_reader :input, :scanner, :token
|
41
|
+
|
42
|
+
def text
|
43
|
+
@input.byteslice(@byte_start, @byte_end - @byte_start)
|
44
|
+
end
|
45
|
+
|
46
|
+
def scan
|
47
|
+
scanner.skip(SPACE)
|
48
|
+
|
49
|
+
@byte_start = scanner.pos
|
50
|
+
char = next_char
|
51
|
+
|
52
|
+
return false unless char
|
53
|
+
|
54
|
+
@token = next_token(char)
|
55
|
+
|
56
|
+
true
|
57
|
+
end
|
58
|
+
|
59
|
+
private
|
60
|
+
|
61
|
+
# rubocop:disable Metrics/CyclomaticComplexity
|
62
|
+
def next_token(char)
|
63
|
+
case char
|
64
|
+
when '_' then scan_keyword_or_identifier(possible_keyword: false)
|
65
|
+
when '.' then PERIOD
|
66
|
+
when '$' then scan_dollar_sign
|
67
|
+
when '`' then scan_quoted_indentifier('`')
|
68
|
+
when '"' then scan_quoted_indentifier('"')
|
69
|
+
when '[' then scan_quoted_indentifier(']')
|
70
|
+
when '(' then LPAREN
|
71
|
+
when ')' then RPAREN
|
72
|
+
when '/' then scan_bracketed_comment
|
73
|
+
when '-' then scan_simple_comment
|
74
|
+
when "'" then scan_string_literal
|
75
|
+
when ALPHA then scan_keyword_or_identifier(possible_keyword: true)
|
76
|
+
when DIGIT then scan_numeric_literal
|
77
|
+
else OTHER
|
78
|
+
end
|
79
|
+
end
|
80
|
+
# rubocop:enable Metrics/CyclomaticComplexity
|
81
|
+
|
82
|
+
def next_char
|
83
|
+
char = @scanner.getch
|
84
|
+
@byte_end = @scanner.pos
|
85
|
+
char
|
86
|
+
end
|
87
|
+
|
88
|
+
# StringScanner#peek returns next byte which could be an incomplete utf
|
89
|
+
# multi-byte character
|
90
|
+
def peek_char(length = 1)
|
91
|
+
# The maximum byte count of utf chars is 4:
|
92
|
+
# > In UTF-8, characters from the U+0000..U+10FFFF range (the UTF-16
|
93
|
+
# accessible range) are encoded using sequences of 1 to 4 octets.
|
94
|
+
# # https://tools.ietf.org/html/rfc3629
|
95
|
+
return nil if length > 4
|
96
|
+
|
97
|
+
char = @scanner.peek(length)
|
98
|
+
|
99
|
+
return nil if char.empty?
|
100
|
+
return char if char.valid_encoding?
|
101
|
+
|
102
|
+
peek_char(length + 1)
|
103
|
+
end
|
104
|
+
|
105
|
+
# rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
106
|
+
def scan_keyword_or_identifier(possible_keyword:)
|
107
|
+
while (peek = peek_char)
|
108
|
+
if peek == '_' || peek == '$' || peek =~ DIGIT
|
109
|
+
possible_keyword = false
|
110
|
+
next next_char
|
111
|
+
end
|
112
|
+
|
113
|
+
next next_char if peek =~ ALPHA
|
114
|
+
|
115
|
+
break
|
116
|
+
end
|
117
|
+
|
118
|
+
return IDENT unless possible_keyword
|
119
|
+
|
120
|
+
snap = text
|
121
|
+
|
122
|
+
if snap.length < KEYWORD_MIN_LENGTH || snap.length > KEYWORD_MAX_LENGTH
|
123
|
+
return IDENT
|
124
|
+
end
|
125
|
+
|
126
|
+
keyword = KEYWORDS[snap.length].find { |kw| snap.upcase == kw.to_s }
|
127
|
+
return keyword if keyword
|
128
|
+
|
129
|
+
IDENT
|
130
|
+
end
|
131
|
+
# rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
132
|
+
|
133
|
+
# rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
134
|
+
def scan_dollar_sign
|
135
|
+
while (peek = peek_char)
|
136
|
+
case peek
|
137
|
+
when DIGIT
|
138
|
+
next_char while peek_char =~ DIGIT
|
139
|
+
when '$', '_', ALPHA, SPACE
|
140
|
+
# PostgreSQL supports dollar-quoted string literal syntax,
|
141
|
+
# like $foo$...$foo$. The tag (foo in this case) is optional,
|
142
|
+
# and if present follows identifier rules.
|
143
|
+
while (char = next_char)
|
144
|
+
case char
|
145
|
+
when '$'
|
146
|
+
# This marks the end of the initial $foo$.
|
147
|
+
snap = text
|
148
|
+
slice = input.slice(scanner.pos, input.length)
|
149
|
+
index = slice.index(snap)
|
150
|
+
next unless index && index >= 0
|
151
|
+
|
152
|
+
delta = index + snap.bytesize
|
153
|
+
@byte_end += delta
|
154
|
+
scanner.pos += delta
|
155
|
+
return STRING
|
156
|
+
when SPACE
|
157
|
+
# Unknown token starting with $, consume chars until space.
|
158
|
+
@byte_end -= char.bytesize
|
159
|
+
return OTHER
|
160
|
+
end
|
161
|
+
end
|
162
|
+
else break
|
163
|
+
end
|
164
|
+
end
|
165
|
+
|
166
|
+
OTHER
|
167
|
+
end
|
168
|
+
# rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
|
169
|
+
|
170
|
+
def scan_quoted_indentifier(delimiter)
|
171
|
+
while (char = next_char)
|
172
|
+
next unless char == delimiter
|
173
|
+
|
174
|
+
if delimiter == '"' && peek_char == delimiter
|
175
|
+
next next_char
|
176
|
+
end
|
177
|
+
|
178
|
+
break
|
179
|
+
end
|
180
|
+
|
181
|
+
# Remove quotes from identifier
|
182
|
+
@byte_start += char.bytesize
|
183
|
+
@byte_end -= char.bytesize
|
184
|
+
|
185
|
+
IDENT
|
186
|
+
end
|
187
|
+
|
188
|
+
# rubocop:disable Metrics/CyclomaticComplexity
|
189
|
+
def scan_bracketed_comment
|
190
|
+
return OTHER unless peek_char == '*'
|
191
|
+
|
192
|
+
nesting = 1
|
193
|
+
|
194
|
+
while (char = next_char)
|
195
|
+
case char
|
196
|
+
when '/'
|
197
|
+
next unless peek_char == '*'
|
198
|
+
next_char
|
199
|
+
nesting += 1
|
200
|
+
when '*'
|
201
|
+
next unless peek_char == '/'
|
202
|
+
next_char
|
203
|
+
nesting -= 1
|
204
|
+
return COMMENT if nesting == 0
|
205
|
+
end
|
206
|
+
end
|
207
|
+
end
|
208
|
+
# rubocop:enable Metrics/CyclomaticComplexity
|
209
|
+
|
210
|
+
def scan_simple_comment
|
211
|
+
return OTHER unless peek_char == '-'
|
212
|
+
|
213
|
+
while (char = next_char)
|
214
|
+
break if char == "\n"
|
215
|
+
end
|
216
|
+
|
217
|
+
COMMENT
|
218
|
+
end
|
219
|
+
|
220
|
+
def scan_string_literal
|
221
|
+
delimiter = "'"
|
222
|
+
|
223
|
+
while (char = next_char)
|
224
|
+
if char == '\\'
|
225
|
+
# Skip escaped character, e.g. 'what\'s up?'
|
226
|
+
next_char
|
227
|
+
next
|
228
|
+
end
|
229
|
+
|
230
|
+
next unless char == delimiter
|
231
|
+
|
232
|
+
return STRING unless peek_char
|
233
|
+
return STRING if peek_char != delimiter
|
234
|
+
|
235
|
+
next_char
|
236
|
+
end
|
237
|
+
end
|
238
|
+
|
239
|
+
# rubocop:disable Metrics/CyclomaticComplexity
|
240
|
+
def scan_numeric_literal
|
241
|
+
period = false
|
242
|
+
exponent = false
|
243
|
+
|
244
|
+
while (peek = peek_char)
|
245
|
+
case peek
|
246
|
+
when DIGIT then next_char
|
247
|
+
when '.'
|
248
|
+
return NUMBER if period
|
249
|
+
next_char
|
250
|
+
period = true
|
251
|
+
when 'e', 'E'
|
252
|
+
return NUMBER if exponent
|
253
|
+
next_char
|
254
|
+
next_char if peek_char =~ /[+-]/
|
255
|
+
else break
|
256
|
+
end
|
257
|
+
end
|
258
|
+
|
259
|
+
NUMBER
|
260
|
+
end
|
261
|
+
# rubocop:enable Metrics/CyclomaticComplexity
|
262
|
+
end
|
263
|
+
end
|
264
|
+
end
|
@@ -0,0 +1,63 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
18
|
+
# frozen_string_literal: true
|
19
|
+
|
20
|
+
module Atatus
|
21
|
+
module Sql
|
22
|
+
# @api private
|
23
|
+
module Tokens
|
24
|
+
OTHER = :OTHER
|
25
|
+
COMMENT = :COMMENT
|
26
|
+
IDENT = :IDENT
|
27
|
+
NUMBER = :NUMBER
|
28
|
+
STRING = :STRING
|
29
|
+
|
30
|
+
PERIOD = :PERIOD
|
31
|
+
COMMA = :COMMA
|
32
|
+
LPAREN = :LPAREN
|
33
|
+
RPAREN = :RPAREN
|
34
|
+
|
35
|
+
AS = :AS
|
36
|
+
CALL = :CALL
|
37
|
+
DELETE = :DELETE
|
38
|
+
FROM = :FROM
|
39
|
+
INSERT = :INSERT
|
40
|
+
INTO = :INTO
|
41
|
+
OR = :OR
|
42
|
+
REPLACE = :REPLACE
|
43
|
+
SELECT = :SELECT
|
44
|
+
SET = :SET
|
45
|
+
TABLE = :TABLE
|
46
|
+
TRUNCATE = :TRUNCATE
|
47
|
+
UPDATE = :UPDATE
|
48
|
+
|
49
|
+
KEYWORDS = {
|
50
|
+
2 => [AS, OR],
|
51
|
+
3 => [SET],
|
52
|
+
4 => [CALL, FROM, INTO],
|
53
|
+
5 => [TABLE],
|
54
|
+
6 => [DELETE, INSERT, SELECT, UPDATE],
|
55
|
+
7 => [REPLACE],
|
56
|
+
8 => [TRUNCATE]
|
57
|
+
}.freeze
|
58
|
+
|
59
|
+
KEYWORD_MIN_LENGTH = KEYWORDS.keys.first
|
60
|
+
KEYWORD_MAX_LENGTH = KEYWORDS.keys.last
|
61
|
+
end
|
62
|
+
end
|
63
|
+
end
|
data/lib/atatus/sql.rb
ADDED
@@ -0,0 +1,36 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
18
|
+
# frozen_string_literal: true
|
19
|
+
|
20
|
+
module Atatus
|
21
|
+
# @api private
|
22
|
+
module Sql
|
23
|
+
# This method is only here as a shortcut while the agent ships with
|
24
|
+
# both implementations ~mikker
|
25
|
+
def self.summarizer
|
26
|
+
@summarizer ||=
|
27
|
+
if Atatus.agent&.config&.use_legacy_sql_parser
|
28
|
+
require 'atatus/sql_summarizer'
|
29
|
+
SqlSummarizer.new
|
30
|
+
else
|
31
|
+
require 'atatus/sql/signature'
|
32
|
+
Sql::Signature::Summarizer.new
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
@@ -1,3 +1,20 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
1
18
|
# frozen_string_literal: true
|
2
19
|
|
3
20
|
require 'atatus/util/lru_cache'
|
@@ -9,12 +26,12 @@ module Atatus
|
|
9
26
|
TABLE_REGEX = %{["'`]?([A-Za-z0-9_]+)["'`]?}
|
10
27
|
|
11
28
|
REGEXES = {
|
12
|
-
/^BEGIN/
|
13
|
-
/^COMMIT/
|
14
|
-
/^SELECT .* FROM #{TABLE_REGEX}/
|
15
|
-
/^INSERT INTO #{TABLE_REGEX}/
|
16
|
-
/^UPDATE #{TABLE_REGEX}/
|
17
|
-
/^DELETE FROM #{TABLE_REGEX}/
|
29
|
+
/^BEGIN/iu => 'BEGIN',
|
30
|
+
/^COMMIT/iu => 'COMMIT',
|
31
|
+
/^SELECT .* FROM #{TABLE_REGEX}/iu => 'SELECT FROM ',
|
32
|
+
/^INSERT INTO #{TABLE_REGEX}/iu => 'INSERT INTO ',
|
33
|
+
/^UPDATE #{TABLE_REGEX}/iu => 'UPDATE ',
|
34
|
+
/^DELETE FROM #{TABLE_REGEX}/iu => 'DELETE FROM '
|
18
35
|
}.freeze
|
19
36
|
|
20
37
|
FORMAT = '%s%s'
|
@@ -24,6 +41,7 @@ module Atatus
|
|
24
41
|
end
|
25
42
|
|
26
43
|
def summarize(sql)
|
44
|
+
sql = sql.encode('utf-8', invalid: :replace, undef: :replace)
|
27
45
|
self.class.cache[sql] ||=
|
28
46
|
REGEXES.find do |regex, sig|
|
29
47
|
if (match = sql[0...1000].match(regex))
|
@@ -1,3 +1,20 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
1
18
|
# frozen_string_literal: true
|
2
19
|
|
3
20
|
require 'atatus/naively_hashable'
|
@@ -21,8 +38,6 @@ module Atatus
|
|
21
38
|
:module,
|
22
39
|
:colno
|
23
40
|
)
|
24
|
-
|
25
|
-
# rubocop:disable Metrics/AbcSize
|
26
41
|
def build_context(context_line_count)
|
27
42
|
return unless abs_path && context_line_count > 0
|
28
43
|
|
@@ -38,7 +53,6 @@ module Atatus
|
|
38
53
|
self.pre_context = file_lines.first(padding)
|
39
54
|
self.post_context = file_lines.last(padding)
|
40
55
|
end
|
41
|
-
# rubocop:enable Metrics/AbcSize
|
42
56
|
|
43
57
|
private
|
44
58
|
|
data/lib/atatus/stacktrace.rb
CHANGED
@@ -1,3 +1,20 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
1
18
|
# frozen_string_literal: true
|
2
19
|
|
3
20
|
module Atatus
|
@@ -1,3 +1,20 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
1
18
|
# frozen_string_literal: true
|
2
19
|
|
3
20
|
require 'atatus/stacktrace/frame'
|
@@ -12,7 +29,12 @@ module Atatus
|
|
12
29
|
RUBY_VERS_REGEX = %r{ruby(/gems)?[-/](\d+\.)+\d}.freeze
|
13
30
|
JRUBY_ORG_REGEX = %r{org/jruby}.freeze
|
14
31
|
|
15
|
-
GEMS_PATH =
|
32
|
+
GEMS_PATH =
|
33
|
+
if defined?(Bundler) && Bundler.default_bundle_dir
|
34
|
+
Bundler.bundle_path.to_s
|
35
|
+
else
|
36
|
+
Gem.dir
|
37
|
+
end
|
16
38
|
|
17
39
|
def initialize(config)
|
18
40
|
@config = config
|
@@ -31,7 +53,6 @@ module Atatus
|
|
31
53
|
|
32
54
|
private
|
33
55
|
|
34
|
-
# rubocop:disable Metrics/AbcSize, Metrics/MethodLength
|
35
56
|
def build_frame(cache, keys)
|
36
57
|
line, type = keys
|
37
58
|
abs_path, lineno, function, _module_name = parse_line(line)
|
@@ -49,7 +70,6 @@ module Atatus
|
|
49
70
|
|
50
71
|
cache[[line, type]] = frame
|
51
72
|
end
|
52
|
-
# rubocop:enable Metrics/AbcSize, Metrics/MethodLength
|
53
73
|
|
54
74
|
def parse_line(line)
|
55
75
|
ruby_match = line.match(RUBY_FORMAT)
|
data/lib/atatus/subscriber.rb
CHANGED
@@ -1,3 +1,20 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
1
18
|
# frozen_string_literal: true
|
2
19
|
|
3
20
|
require 'active_support/notifications'
|
@@ -28,8 +45,6 @@ module Atatus
|
|
28
45
|
# AS::Notifications API
|
29
46
|
|
30
47
|
Notification = Struct.new(:id, :span)
|
31
|
-
|
32
|
-
# rubocop:disable Metrics/MethodLength
|
33
48
|
def start(name, id, payload)
|
34
49
|
return unless (transaction = @agent.current_transaction)
|
35
50
|
|
@@ -52,9 +67,9 @@ module Atatus
|
|
52
67
|
|
53
68
|
transaction.notifications << Notification.new(id, span)
|
54
69
|
end
|
55
|
-
# rubocop:enable Metrics/MethodLength
|
56
70
|
|
57
|
-
|
71
|
+
# rubocop:disable Metrics/CyclomaticComplexity
|
72
|
+
def finish(name, id, payload)
|
58
73
|
# debug "AS::Notification#finish:#{name}:#{id}"
|
59
74
|
return unless (transaction = @agent.current_transaction)
|
60
75
|
|
@@ -62,11 +77,15 @@ module Atatus
|
|
62
77
|
next unless notification.id == id
|
63
78
|
|
64
79
|
if (span = notification.span)
|
80
|
+
if @agent.config.span_frames_min_duration?
|
81
|
+
span.original_backtrace ||= @normalizers.backtrace(name, payload)
|
82
|
+
end
|
65
83
|
@agent.end_span if span == @agent.current_span
|
66
84
|
end
|
67
85
|
return
|
68
86
|
end
|
69
87
|
end
|
88
|
+
# rubocop:enable Metrics/CyclomaticComplexity
|
70
89
|
|
71
90
|
private
|
72
91
|
|
@@ -0,0 +1,111 @@
|
|
1
|
+
# Licensed to Elasticsearch B.V. under one or more contributor
|
2
|
+
# license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright
|
4
|
+
# ownership. Elasticsearch B.V. licenses this file to you under
|
5
|
+
# the Apache License, Version 2.0 (the "License"); you may
|
6
|
+
# not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing,
|
12
|
+
# software distributed under the License is distributed on an
|
13
|
+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
14
|
+
# KIND, either express or implied. See the License for the
|
15
|
+
# specific language governing permissions and limitations
|
16
|
+
# under the License.
|
17
|
+
|
18
|
+
# frozen_string_literal: true
|
19
|
+
|
20
|
+
module Atatus
|
21
|
+
class TraceContext
|
22
|
+
# @api private
|
23
|
+
class Traceparent
|
24
|
+
VERSION = '00'
|
25
|
+
HEX_REGEX = /[^[:xdigit:]]/.freeze
|
26
|
+
|
27
|
+
TRACE_ID_LENGTH = 16
|
28
|
+
ID_LENGTH = 8
|
29
|
+
|
30
|
+
# rubocop:disable Metrics/ParameterLists
|
31
|
+
def initialize(
|
32
|
+
version: VERSION,
|
33
|
+
trace_id: nil,
|
34
|
+
span_id: nil,
|
35
|
+
id: nil,
|
36
|
+
recorded: true
|
37
|
+
)
|
38
|
+
@version = version
|
39
|
+
@trace_id = trace_id || hex(TRACE_ID_LENGTH)
|
40
|
+
# TODO: rename span_id kw arg to parent_id with next major version bump
|
41
|
+
@parent_id = span_id
|
42
|
+
@id = id || hex(ID_LENGTH)
|
43
|
+
@recorded = recorded
|
44
|
+
end
|
45
|
+
# rubocop:enable Metrics/ParameterLists
|
46
|
+
|
47
|
+
attr_accessor :version, :id, :trace_id, :parent_id, :recorded
|
48
|
+
|
49
|
+
alias :recorded? :recorded
|
50
|
+
|
51
|
+
def self.parse(header)
|
52
|
+
raise_invalid(header) unless header.length == 55
|
53
|
+
raise_invalid(header) unless header[0..1] == VERSION
|
54
|
+
|
55
|
+
new.tap do |t|
|
56
|
+
t.version, t.trace_id, t.parent_id, t.flags =
|
57
|
+
header.split('-').tap do |values|
|
58
|
+
values[-1] = Util.hex_to_bits(values[-1])
|
59
|
+
end
|
60
|
+
|
61
|
+
raise_invalid(header) if HEX_REGEX =~ t.trace_id
|
62
|
+
raise_invalid(header) if HEX_REGEX =~ t.parent_id
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
class << self
|
67
|
+
private
|
68
|
+
|
69
|
+
def raise_invalid(header)
|
70
|
+
raise InvalidTraceparentHeader,
|
71
|
+
"Couldn't parse invalid traceparent header: #{header.inspect}"
|
72
|
+
end
|
73
|
+
end
|
74
|
+
|
75
|
+
def flags=(flags)
|
76
|
+
@flags = flags
|
77
|
+
|
78
|
+
self.recorded = flags[7] == '1'
|
79
|
+
end
|
80
|
+
|
81
|
+
def flags
|
82
|
+
format('0000000%d', recorded? ? 1 : 0)
|
83
|
+
end
|
84
|
+
|
85
|
+
def hex_flags
|
86
|
+
format('%02x', flags.to_i(2))
|
87
|
+
end
|
88
|
+
|
89
|
+
def ensure_parent_id
|
90
|
+
@parent_id ||= hex(ID_LENGTH)
|
91
|
+
end
|
92
|
+
|
93
|
+
def child
|
94
|
+
dup.tap do |copy|
|
95
|
+
copy.parent_id = id
|
96
|
+
copy.id = hex(ID_LENGTH)
|
97
|
+
end
|
98
|
+
end
|
99
|
+
|
100
|
+
def to_header
|
101
|
+
format('%s-%s-%s-%s', version, trace_id, id, hex_flags)
|
102
|
+
end
|
103
|
+
|
104
|
+
private
|
105
|
+
|
106
|
+
def hex(len)
|
107
|
+
SecureRandom.hex(len)
|
108
|
+
end
|
109
|
+
end
|
110
|
+
end
|
111
|
+
end
|