sentry-ruby 5.10.0 → 5.14.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +7 -1
- data/README.md +9 -9
- data/lib/sentry/breadcrumb.rb +8 -2
- data/lib/sentry/check_in_event.rb +60 -0
- data/lib/sentry/client.rb +36 -1
- data/lib/sentry/configuration.rb +16 -0
- data/lib/sentry/cron/monitor_check_ins.rb +66 -0
- data/lib/sentry/cron/monitor_config.rb +53 -0
- data/lib/sentry/cron/monitor_schedule.rb +42 -0
- data/lib/sentry/envelope.rb +1 -1
- data/lib/sentry/event.rb +6 -0
- data/lib/sentry/hub.rb +69 -1
- data/lib/sentry/integrable.rb +6 -0
- data/lib/sentry/interfaces/single_exception.rb +5 -3
- data/lib/sentry/net/http.rb +25 -22
- data/lib/sentry/profiler.rb +18 -7
- data/lib/sentry/propagation_context.rb +134 -0
- data/lib/sentry/puma.rb +11 -4
- data/lib/sentry/rack/capture_exceptions.rb +1 -4
- data/lib/sentry/redis.rb +8 -3
- data/lib/sentry/release_detector.rb +1 -1
- data/lib/sentry/scope.rb +17 -2
- data/lib/sentry/span.rb +39 -2
- data/lib/sentry/test_helper.rb +18 -12
- data/lib/sentry/transaction.rb +9 -17
- data/lib/sentry/transaction_event.rb +0 -3
- data/lib/sentry/transport/configuration.rb +74 -1
- data/lib/sentry/transport/http_transport.rb +8 -2
- data/lib/sentry/transport.rb +4 -3
- data/lib/sentry/utils/argument_checking_helper.rb +6 -0
- data/lib/sentry/version.rb +1 -1
- data/lib/sentry-ruby.rb +62 -6
- metadata +7 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 95fd53222ce5360d32645f0bc7577792bdef0a02b9e4b8de27555eabd2ef1844
|
|
4
|
+
data.tar.gz: e5eb696315a22747051e5bbdeac314c5ae103cabd59d3fb266b16b0b22345611
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f18df0d05208c0a03352501b4b746f6ccc74799b234198b67b35e709539fde52aa36c56a6297510e8e9e1dc8a62658ac5d81e0023c5935de455effc16ee824fe
|
|
7
|
+
data.tar.gz: 47f5db68454ab971d92df8c7fbd95846830edfe09b6b2ea40fef1f5ab39a9db922a5564abe45b29fb55df729bdf53bb1632c566c93b8b7f0d1c96e00c441d0dc
|
data/Gemfile
CHANGED
|
@@ -21,9 +21,15 @@ gem "simplecov-cobertura", "~> 1.4"
|
|
|
21
21
|
gem "rexml"
|
|
22
22
|
gem "stackprof" unless RUBY_PLATFORM == "java"
|
|
23
23
|
|
|
24
|
-
|
|
24
|
+
ruby_version = Gem::Version.new(RUBY_VERSION)
|
|
25
|
+
|
|
26
|
+
if ruby_version >= Gem::Version.new("2.6.0")
|
|
25
27
|
gem "debug", github: "ruby/debug", platform: :ruby
|
|
26
28
|
gem "irb"
|
|
29
|
+
|
|
30
|
+
if ruby_version >= Gem::Version.new("3.0.0")
|
|
31
|
+
gem "ruby-lsp-rspec"
|
|
32
|
+
end
|
|
27
33
|
end
|
|
28
34
|
|
|
29
35
|
gem "pry"
|
data/README.md
CHANGED
|
@@ -13,14 +13,14 @@ _Bad software is everywhere, and we're tired of it. Sentry is on a mission to he
|
|
|
13
13
|
Sentry SDK for Ruby
|
|
14
14
|
===========
|
|
15
15
|
|
|
16
|
-
| current version
|
|
17
|
-
| ---
|
|
18
|
-
| [](https://rubygems.org/gems/sentry-ruby)
|
|
19
|
-
| [](https://rubygems.org/gems/sentry-rails)
|
|
20
|
-
| [](https://rubygems.org/gems/sentry-sidekiq)
|
|
21
|
-
| [](https://rubygems.org/gems/sentry-delayed_job)
|
|
22
|
-
| [](https://rubygems.org/gems/sentry-resque)
|
|
23
|
-
| [](https://rubygems.org/gems/sentry-opentelemetry) | [](https://rubygems.org/gems/sentry-ruby) | [](https://github.com/getsentry/sentry-ruby/actions/workflows/sentry_ruby_test.yml) | [](https://codecov.io/gh/getsentry/sentry-ruby/branch/master) | [](https://rubygems.org/gems/sentry-ruby/) |
|
|
19
|
+
| [](https://rubygems.org/gems/sentry-rails) | [](https://github.com/getsentry/sentry-ruby/actions/workflows/sentry_rails_test.yml) | [](https://codecov.io/gh/getsentry/sentry-ruby/branch/master) | [](https://rubygems.org/gems/sentry-rails/) |
|
|
20
|
+
| [](https://rubygems.org/gems/sentry-sidekiq) | [](https://github.com/getsentry/sentry-ruby/actions/workflows/sentry_sidekiq_test.yml) | [](https://codecov.io/gh/getsentry/sentry-ruby/branch/master) | [](https://rubygems.org/gems/sentry-sidekiq/) |
|
|
21
|
+
| [](https://rubygems.org/gems/sentry-delayed_job) | [](https://github.com/getsentry/sentry-ruby/actions/workflows/sentry_delayed_job_test.yml) | [](https://codecov.io/gh/getsentry/sentry-ruby/branch/master) | [](https://rubygems.org/gems/sentry-delayed_job/) |
|
|
22
|
+
| [](https://rubygems.org/gems/sentry-resque) | [](https://github.com/getsentry/sentry-ruby/actions/workflows/sentry_resque_test.yml) | [](https://codecov.io/gh/getsentry/sentry-ruby/branch/master) | [](https://rubygems.org/gems/sentry-resque/) |
|
|
23
|
+
| [](https://rubygems.org/gems/sentry-opentelemetry) | [](https://github.com/getsentry/sentry-ruby/actions/workflows/sentry_opentelemetry_test.yml) | [](https://codecov.io/gh/getsentry/sentry-ruby/branch/master) | [](https://rubygems.org/gems/sentry-opentelemetry/) |
|
|
24
24
|
|
|
25
25
|
|
|
26
26
|
|
|
@@ -33,7 +33,7 @@ If you're using `sentry-raven`, we recommend you to migrate to this new SDK. You
|
|
|
33
33
|
|
|
34
34
|
## Requirements
|
|
35
35
|
|
|
36
|
-
We test
|
|
36
|
+
We test from Ruby 2.4 to Ruby 3.2 at the latest patchlevel/teeny version. We also support JRuby 9.0.
|
|
37
37
|
|
|
38
38
|
If you use self-hosted Sentry, please also make sure its version is above `20.6.0`.
|
|
39
39
|
|
data/lib/sentry/breadcrumb.rb
CHANGED
|
@@ -9,7 +9,7 @@ module Sentry
|
|
|
9
9
|
# @return [Hash, nil]
|
|
10
10
|
attr_accessor :data
|
|
11
11
|
# @return [String, nil]
|
|
12
|
-
|
|
12
|
+
attr_reader :level
|
|
13
13
|
# @return [Time, Integer, nil]
|
|
14
14
|
attr_accessor :timestamp
|
|
15
15
|
# @return [String, nil]
|
|
@@ -26,10 +26,10 @@ module Sentry
|
|
|
26
26
|
def initialize(category: nil, data: nil, message: nil, timestamp: nil, level: nil, type: nil)
|
|
27
27
|
@category = category
|
|
28
28
|
@data = data || {}
|
|
29
|
-
@level = level
|
|
30
29
|
@timestamp = timestamp || Sentry.utc_now.to_i
|
|
31
30
|
@type = type
|
|
32
31
|
self.message = message
|
|
32
|
+
self.level = level
|
|
33
33
|
end
|
|
34
34
|
|
|
35
35
|
# @return [Hash]
|
|
@@ -50,6 +50,12 @@ module Sentry
|
|
|
50
50
|
@message = (message || "").byteslice(0..Event::MAX_MESSAGE_SIZE_IN_BYTES)
|
|
51
51
|
end
|
|
52
52
|
|
|
53
|
+
# @param level [String]
|
|
54
|
+
# @return [void]
|
|
55
|
+
def level=(level) # needed to meet the Sentry spec
|
|
56
|
+
@level = level == "warn" ? "warning" : level
|
|
57
|
+
end
|
|
58
|
+
|
|
53
59
|
private
|
|
54
60
|
|
|
55
61
|
def serialized_data
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
require 'securerandom'
|
|
4
|
+
require 'sentry/cron/monitor_config'
|
|
5
|
+
|
|
6
|
+
module Sentry
|
|
7
|
+
class CheckInEvent < Event
|
|
8
|
+
TYPE = 'check_in'
|
|
9
|
+
|
|
10
|
+
# uuid to identify this check-in.
|
|
11
|
+
# @return [String]
|
|
12
|
+
attr_accessor :check_in_id
|
|
13
|
+
|
|
14
|
+
# Identifier of the monitor for this check-in.
|
|
15
|
+
# @return [String]
|
|
16
|
+
attr_accessor :monitor_slug
|
|
17
|
+
|
|
18
|
+
# Duration of this check since it has started in seconds.
|
|
19
|
+
# @return [Integer, nil]
|
|
20
|
+
attr_accessor :duration
|
|
21
|
+
|
|
22
|
+
# Monitor configuration to support upserts.
|
|
23
|
+
# @return [Cron::MonitorConfig, nil]
|
|
24
|
+
attr_accessor :monitor_config
|
|
25
|
+
|
|
26
|
+
# Status of this check-in.
|
|
27
|
+
# @return [Symbol]
|
|
28
|
+
attr_accessor :status
|
|
29
|
+
|
|
30
|
+
VALID_STATUSES = %i(ok in_progress error)
|
|
31
|
+
|
|
32
|
+
def initialize(
|
|
33
|
+
slug:,
|
|
34
|
+
status:,
|
|
35
|
+
duration: nil,
|
|
36
|
+
monitor_config: nil,
|
|
37
|
+
check_in_id: nil,
|
|
38
|
+
**options
|
|
39
|
+
)
|
|
40
|
+
super(**options)
|
|
41
|
+
|
|
42
|
+
self.monitor_slug = slug
|
|
43
|
+
self.status = status
|
|
44
|
+
self.duration = duration
|
|
45
|
+
self.monitor_config = monitor_config
|
|
46
|
+
self.check_in_id = check_in_id || SecureRandom.uuid.delete('-')
|
|
47
|
+
end
|
|
48
|
+
|
|
49
|
+
# @return [Hash]
|
|
50
|
+
def to_hash
|
|
51
|
+
data = super
|
|
52
|
+
data[:check_in_id] = check_in_id
|
|
53
|
+
data[:monitor_slug] = monitor_slug
|
|
54
|
+
data[:status] = status
|
|
55
|
+
data[:duration] = duration if duration
|
|
56
|
+
data[:monitor_config] = monitor_config.to_hash if monitor_config
|
|
57
|
+
data
|
|
58
|
+
end
|
|
59
|
+
end
|
|
60
|
+
end
|
data/lib/sentry/client.rb
CHANGED
|
@@ -104,6 +104,37 @@ module Sentry
|
|
|
104
104
|
event
|
|
105
105
|
end
|
|
106
106
|
|
|
107
|
+
# Initializes a CheckInEvent object with the given options.
|
|
108
|
+
#
|
|
109
|
+
# @param slug [String] identifier of this monitor
|
|
110
|
+
# @param status [Symbol] status of this check-in, one of {CheckInEvent::VALID_STATUSES}
|
|
111
|
+
# @param hint [Hash] the hint data that'll be passed to `before_send` callback and the scope's event processors.
|
|
112
|
+
# @param duration [Integer, nil] seconds elapsed since this monitor started
|
|
113
|
+
# @param monitor_config [Cron::MonitorConfig, nil] configuration for this monitor
|
|
114
|
+
# @param check_in_id [String, nil] for updating the status of an existing monitor
|
|
115
|
+
#
|
|
116
|
+
# @return [Event]
|
|
117
|
+
def event_from_check_in(
|
|
118
|
+
slug,
|
|
119
|
+
status,
|
|
120
|
+
hint = {},
|
|
121
|
+
duration: nil,
|
|
122
|
+
monitor_config: nil,
|
|
123
|
+
check_in_id: nil
|
|
124
|
+
)
|
|
125
|
+
return unless configuration.sending_allowed?
|
|
126
|
+
|
|
127
|
+
CheckInEvent.new(
|
|
128
|
+
configuration: configuration,
|
|
129
|
+
integration_meta: Sentry.integrations[hint[:integration]],
|
|
130
|
+
slug: slug,
|
|
131
|
+
status: status,
|
|
132
|
+
duration: duration,
|
|
133
|
+
monitor_config: monitor_config,
|
|
134
|
+
check_in_id: check_in_id
|
|
135
|
+
)
|
|
136
|
+
end
|
|
137
|
+
|
|
107
138
|
# Initializes an Event object with the given Transaction object.
|
|
108
139
|
# @param transaction [Transaction] the transaction to be recorded.
|
|
109
140
|
# @return [TransactionEvent]
|
|
@@ -148,6 +179,8 @@ module Sentry
|
|
|
148
179
|
raise
|
|
149
180
|
end
|
|
150
181
|
|
|
182
|
+
# @deprecated use Sentry.get_traceparent instead.
|
|
183
|
+
#
|
|
151
184
|
# Generates a Sentry trace for distribted tracing from the given Span.
|
|
152
185
|
# Returns `nil` if `config.propagate_traces` is `false`.
|
|
153
186
|
# @param span [Span] the span to generate trace from.
|
|
@@ -160,7 +193,9 @@ module Sentry
|
|
|
160
193
|
trace
|
|
161
194
|
end
|
|
162
195
|
|
|
163
|
-
#
|
|
196
|
+
# @deprecated Use Sentry.get_baggage instead.
|
|
197
|
+
#
|
|
198
|
+
# Generates a W3C Baggage header for distributed tracing from the given Span.
|
|
164
199
|
# Returns `nil` if `config.propagate_traces` is `false`.
|
|
165
200
|
# @param span [Span] the span to generate trace from.
|
|
166
201
|
# @return [String, nil]
|
data/lib/sentry/configuration.rb
CHANGED
|
@@ -243,6 +243,11 @@ module Sentry
|
|
|
243
243
|
# @return [Boolean]
|
|
244
244
|
attr_accessor :auto_session_tracking
|
|
245
245
|
|
|
246
|
+
# Allowlist of outgoing request targets to which sentry-trace and baggage headers are attached.
|
|
247
|
+
# Default is all (/.*/)
|
|
248
|
+
# @return [Array<String, Regexp>]
|
|
249
|
+
attr_accessor :trace_propagation_targets
|
|
250
|
+
|
|
246
251
|
# The instrumenter to use, :sentry or :otel
|
|
247
252
|
# @return [Symbol]
|
|
248
253
|
attr_reader :instrumenter
|
|
@@ -253,6 +258,11 @@ module Sentry
|
|
|
253
258
|
# @return [Float, nil]
|
|
254
259
|
attr_reader :profiles_sample_rate
|
|
255
260
|
|
|
261
|
+
# Array of patches to apply.
|
|
262
|
+
# Default is {DEFAULT_PATCHES}
|
|
263
|
+
# @return [Array<Symbol>]
|
|
264
|
+
attr_accessor :enabled_patches
|
|
265
|
+
|
|
256
266
|
# these are not config options
|
|
257
267
|
# @!visibility private
|
|
258
268
|
attr_reader :errors, :gem_specs
|
|
@@ -290,6 +300,10 @@ module Sentry
|
|
|
290
300
|
|
|
291
301
|
INSTRUMENTERS = [:sentry, :otel]
|
|
292
302
|
|
|
303
|
+
PROPAGATION_TARGETS_MATCH_ALL = /.*/.freeze
|
|
304
|
+
|
|
305
|
+
DEFAULT_PATCHES = %i(redis puma http).freeze
|
|
306
|
+
|
|
293
307
|
class << self
|
|
294
308
|
# Post initialization callbacks are called at the end of initialization process
|
|
295
309
|
# allowing extending the configuration of sentry-ruby by multiple extensions
|
|
@@ -332,6 +346,8 @@ module Sentry
|
|
|
332
346
|
self.dsn = ENV['SENTRY_DSN']
|
|
333
347
|
self.server_name = server_name_from_env
|
|
334
348
|
self.instrumenter = :sentry
|
|
349
|
+
self.trace_propagation_targets = [PROPAGATION_TARGETS_MATCH_ALL]
|
|
350
|
+
self.enabled_patches = DEFAULT_PATCHES.dup
|
|
335
351
|
|
|
336
352
|
self.before_send = nil
|
|
337
353
|
self.before_send_transaction = nil
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
module Sentry
|
|
2
|
+
module Cron
|
|
3
|
+
module MonitorCheckIns
|
|
4
|
+
MAX_SLUG_LENGTH = 50
|
|
5
|
+
|
|
6
|
+
module Patch
|
|
7
|
+
def perform(*args)
|
|
8
|
+
slug = self.class.sentry_monitor_slug
|
|
9
|
+
monitor_config = self.class.sentry_monitor_config
|
|
10
|
+
|
|
11
|
+
check_in_id = Sentry.capture_check_in(slug,
|
|
12
|
+
:in_progress,
|
|
13
|
+
monitor_config: monitor_config)
|
|
14
|
+
|
|
15
|
+
start = Sentry.utc_now.to_i
|
|
16
|
+
ret = super
|
|
17
|
+
duration = Sentry.utc_now.to_i - start
|
|
18
|
+
|
|
19
|
+
Sentry.capture_check_in(slug,
|
|
20
|
+
:ok,
|
|
21
|
+
check_in_id: check_in_id,
|
|
22
|
+
duration: duration,
|
|
23
|
+
monitor_config: monitor_config)
|
|
24
|
+
|
|
25
|
+
ret
|
|
26
|
+
rescue Exception
|
|
27
|
+
duration = Sentry.utc_now.to_i - start
|
|
28
|
+
|
|
29
|
+
Sentry.capture_check_in(slug,
|
|
30
|
+
:error,
|
|
31
|
+
check_in_id: check_in_id,
|
|
32
|
+
duration: duration,
|
|
33
|
+
monitor_config: monitor_config)
|
|
34
|
+
|
|
35
|
+
raise
|
|
36
|
+
end
|
|
37
|
+
end
|
|
38
|
+
|
|
39
|
+
module ClassMethods
|
|
40
|
+
def sentry_monitor_check_ins(slug: nil, monitor_config: nil)
|
|
41
|
+
@sentry_monitor_slug = slug
|
|
42
|
+
@sentry_monitor_config = monitor_config
|
|
43
|
+
|
|
44
|
+
prepend Patch
|
|
45
|
+
end
|
|
46
|
+
|
|
47
|
+
def sentry_monitor_slug
|
|
48
|
+
@sentry_monitor_slug ||= begin
|
|
49
|
+
slug = name.gsub('::', '-').downcase
|
|
50
|
+
slug[-MAX_SLUG_LENGTH..-1] || slug
|
|
51
|
+
end
|
|
52
|
+
end
|
|
53
|
+
|
|
54
|
+
def sentry_monitor_config
|
|
55
|
+
@sentry_monitor_config
|
|
56
|
+
end
|
|
57
|
+
end
|
|
58
|
+
|
|
59
|
+
extend ClassMethods
|
|
60
|
+
|
|
61
|
+
def self.included(base)
|
|
62
|
+
base.extend(ClassMethods)
|
|
63
|
+
end
|
|
64
|
+
end
|
|
65
|
+
end
|
|
66
|
+
end
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
require 'sentry/cron/monitor_schedule'
|
|
4
|
+
|
|
5
|
+
module Sentry
|
|
6
|
+
module Cron
|
|
7
|
+
class MonitorConfig
|
|
8
|
+
# The monitor schedule configuration
|
|
9
|
+
# @return [MonitorSchedule::Crontab, MonitorSchedule::Interval]
|
|
10
|
+
attr_accessor :schedule
|
|
11
|
+
|
|
12
|
+
# How long (in minutes) after the expected checkin time will we wait
|
|
13
|
+
# until we consider the checkin to have been missed.
|
|
14
|
+
# @return [Integer, nil]
|
|
15
|
+
attr_accessor :checkin_margin
|
|
16
|
+
|
|
17
|
+
# How long (in minutes) is the checkin allowed to run for in in_progress
|
|
18
|
+
# before it is considered failed.
|
|
19
|
+
# @return [Integer, nil]
|
|
20
|
+
attr_accessor :max_runtime
|
|
21
|
+
|
|
22
|
+
# tz database style timezone string
|
|
23
|
+
# @return [String, nil]
|
|
24
|
+
attr_accessor :timezone
|
|
25
|
+
|
|
26
|
+
def initialize(schedule, checkin_margin: nil, max_runtime: nil, timezone: nil)
|
|
27
|
+
@schedule = schedule
|
|
28
|
+
@checkin_margin = checkin_margin
|
|
29
|
+
@max_runtime = max_runtime
|
|
30
|
+
@timezone = timezone
|
|
31
|
+
end
|
|
32
|
+
|
|
33
|
+
def self.from_crontab(crontab, **options)
|
|
34
|
+
new(MonitorSchedule::Crontab.new(crontab), **options)
|
|
35
|
+
end
|
|
36
|
+
|
|
37
|
+
def self.from_interval(num, unit, **options)
|
|
38
|
+
return nil unless MonitorSchedule::Interval::VALID_UNITS.include?(unit)
|
|
39
|
+
|
|
40
|
+
new(MonitorSchedule::Interval.new(num, unit), **options)
|
|
41
|
+
end
|
|
42
|
+
|
|
43
|
+
def to_hash
|
|
44
|
+
{
|
|
45
|
+
schedule: schedule.to_hash,
|
|
46
|
+
checkin_margin: checkin_margin,
|
|
47
|
+
max_runtime: max_runtime,
|
|
48
|
+
timezone: timezone
|
|
49
|
+
}.compact
|
|
50
|
+
end
|
|
51
|
+
end
|
|
52
|
+
end
|
|
53
|
+
end
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Sentry
|
|
4
|
+
module Cron
|
|
5
|
+
module MonitorSchedule
|
|
6
|
+
class Crontab
|
|
7
|
+
# A crontab formatted string such as "0 * * * *".
|
|
8
|
+
# @return [String]
|
|
9
|
+
attr_accessor :value
|
|
10
|
+
|
|
11
|
+
def initialize(value)
|
|
12
|
+
@value = value
|
|
13
|
+
end
|
|
14
|
+
|
|
15
|
+
def to_hash
|
|
16
|
+
{ type: :crontab, value: value }
|
|
17
|
+
end
|
|
18
|
+
end
|
|
19
|
+
|
|
20
|
+
class Interval
|
|
21
|
+
# The number representing duration of the interval.
|
|
22
|
+
# @return [Integer]
|
|
23
|
+
attr_accessor :value
|
|
24
|
+
|
|
25
|
+
# The unit representing duration of the interval.
|
|
26
|
+
# @return [Symbol]
|
|
27
|
+
attr_accessor :unit
|
|
28
|
+
|
|
29
|
+
VALID_UNITS = %i(year month week day hour minute)
|
|
30
|
+
|
|
31
|
+
def initialize(value, unit)
|
|
32
|
+
@value = value
|
|
33
|
+
@unit = unit
|
|
34
|
+
end
|
|
35
|
+
|
|
36
|
+
def to_hash
|
|
37
|
+
{ type: :interval, value: value, unit: unit }
|
|
38
|
+
end
|
|
39
|
+
end
|
|
40
|
+
end
|
|
41
|
+
end
|
|
42
|
+
end
|
data/lib/sentry/envelope.rb
CHANGED
data/lib/sentry/event.rb
CHANGED
|
@@ -37,6 +37,11 @@ module Sentry
|
|
|
37
37
|
# @return [RequestInterface]
|
|
38
38
|
attr_reader :request
|
|
39
39
|
|
|
40
|
+
# Dynamic Sampling Context (DSC) that gets attached
|
|
41
|
+
# as the trace envelope header in the transport.
|
|
42
|
+
# @return [Hash, nil]
|
|
43
|
+
attr_accessor :dynamic_sampling_context
|
|
44
|
+
|
|
40
45
|
# @param configuration [Configuration]
|
|
41
46
|
# @param integration_meta [Hash, nil]
|
|
42
47
|
# @param message [String, nil]
|
|
@@ -54,6 +59,7 @@ module Sentry
|
|
|
54
59
|
@tags = {}
|
|
55
60
|
|
|
56
61
|
@fingerprint = []
|
|
62
|
+
@dynamic_sampling_context = nil
|
|
57
63
|
|
|
58
64
|
# configuration data that's directly used by events
|
|
59
65
|
@server_name = configuration.server_name
|
data/lib/sentry/hub.rb
CHANGED
|
@@ -156,6 +156,30 @@ module Sentry
|
|
|
156
156
|
capture_event(event, **options, &block)
|
|
157
157
|
end
|
|
158
158
|
|
|
159
|
+
def capture_check_in(slug, status, **options, &block)
|
|
160
|
+
check_argument_type!(slug, ::String)
|
|
161
|
+
check_argument_includes!(status, Sentry::CheckInEvent::VALID_STATUSES)
|
|
162
|
+
|
|
163
|
+
return unless current_client
|
|
164
|
+
|
|
165
|
+
options[:hint] ||= {}
|
|
166
|
+
options[:hint][:slug] = slug
|
|
167
|
+
|
|
168
|
+
event = current_client.event_from_check_in(
|
|
169
|
+
slug,
|
|
170
|
+
status,
|
|
171
|
+
options[:hint],
|
|
172
|
+
duration: options.delete(:duration),
|
|
173
|
+
monitor_config: options.delete(:monitor_config),
|
|
174
|
+
check_in_id: options.delete(:check_in_id)
|
|
175
|
+
)
|
|
176
|
+
|
|
177
|
+
return unless event
|
|
178
|
+
|
|
179
|
+
capture_event(event, **options, &block)
|
|
180
|
+
event.check_in_id
|
|
181
|
+
end
|
|
182
|
+
|
|
159
183
|
def capture_event(event, **options, &block)
|
|
160
184
|
check_argument_type!(event, Sentry::Event)
|
|
161
185
|
|
|
@@ -178,7 +202,7 @@ module Sentry
|
|
|
178
202
|
configuration.log_debug(event.to_json_compatible)
|
|
179
203
|
end
|
|
180
204
|
|
|
181
|
-
@last_event_id = event&.event_id
|
|
205
|
+
@last_event_id = event&.event_id if event.is_a?(Sentry::ErrorEvent)
|
|
182
206
|
event
|
|
183
207
|
end
|
|
184
208
|
|
|
@@ -229,6 +253,50 @@ module Sentry
|
|
|
229
253
|
end_session
|
|
230
254
|
end
|
|
231
255
|
|
|
256
|
+
def get_traceparent
|
|
257
|
+
return nil unless current_scope
|
|
258
|
+
|
|
259
|
+
current_scope.get_span&.to_sentry_trace ||
|
|
260
|
+
current_scope.propagation_context.get_traceparent
|
|
261
|
+
end
|
|
262
|
+
|
|
263
|
+
def get_baggage
|
|
264
|
+
return nil unless current_scope
|
|
265
|
+
|
|
266
|
+
current_scope.get_span&.to_baggage ||
|
|
267
|
+
current_scope.propagation_context.get_baggage&.serialize
|
|
268
|
+
end
|
|
269
|
+
|
|
270
|
+
def get_trace_propagation_headers
|
|
271
|
+
headers = {}
|
|
272
|
+
|
|
273
|
+
traceparent = get_traceparent
|
|
274
|
+
headers[SENTRY_TRACE_HEADER_NAME] = traceparent if traceparent
|
|
275
|
+
|
|
276
|
+
baggage = get_baggage
|
|
277
|
+
headers[BAGGAGE_HEADER_NAME] = baggage if baggage && !baggage.empty?
|
|
278
|
+
|
|
279
|
+
headers
|
|
280
|
+
end
|
|
281
|
+
|
|
282
|
+
def continue_trace(env, **options)
|
|
283
|
+
configure_scope { |s| s.generate_propagation_context(env) }
|
|
284
|
+
|
|
285
|
+
return nil unless configuration.tracing_enabled?
|
|
286
|
+
|
|
287
|
+
propagation_context = current_scope.propagation_context
|
|
288
|
+
return nil unless propagation_context.incoming_trace
|
|
289
|
+
|
|
290
|
+
Transaction.new(
|
|
291
|
+
hub: self,
|
|
292
|
+
trace_id: propagation_context.trace_id,
|
|
293
|
+
parent_span_id: propagation_context.parent_span_id,
|
|
294
|
+
parent_sampled: propagation_context.parent_sampled,
|
|
295
|
+
baggage: propagation_context.baggage,
|
|
296
|
+
**options
|
|
297
|
+
)
|
|
298
|
+
end
|
|
299
|
+
|
|
232
300
|
private
|
|
233
301
|
|
|
234
302
|
def current_layer
|
data/lib/sentry/integrable.rb
CHANGED
|
@@ -22,5 +22,11 @@ module Sentry
|
|
|
22
22
|
options[:hint][:integration] = integration_name
|
|
23
23
|
Sentry.capture_message(message, **options, &block)
|
|
24
24
|
end
|
|
25
|
+
|
|
26
|
+
def capture_check_in(slug, status, **options, &block)
|
|
27
|
+
options[:hint] ||= {}
|
|
28
|
+
options[:hint][:integration] = integration_name
|
|
29
|
+
Sentry.capture_check_in(slug, status, **options, &block)
|
|
30
|
+
end
|
|
25
31
|
end
|
|
26
32
|
end
|
|
@@ -11,7 +11,8 @@ module Sentry
|
|
|
11
11
|
OMISSION_MARK = "...".freeze
|
|
12
12
|
MAX_LOCAL_BYTES = 1024
|
|
13
13
|
|
|
14
|
-
attr_reader :type, :
|
|
14
|
+
attr_reader :type, :module, :thread_id, :stacktrace
|
|
15
|
+
attr_accessor :value
|
|
15
16
|
|
|
16
17
|
def initialize(exception:, stacktrace: nil)
|
|
17
18
|
@type = exception.class.to_s
|
|
@@ -21,8 +22,9 @@ module Sentry
|
|
|
21
22
|
else
|
|
22
23
|
exception.message || ""
|
|
23
24
|
end
|
|
25
|
+
exception_message = exception_message.inspect unless exception_message.is_a?(String)
|
|
24
26
|
|
|
25
|
-
@value = exception_message.byteslice(0..Event::MAX_MESSAGE_SIZE_IN_BYTES)
|
|
27
|
+
@value = Utils::EncodingHelper.encode_to_utf_8(exception_message.byteslice(0..Event::MAX_MESSAGE_SIZE_IN_BYTES))
|
|
26
28
|
|
|
27
29
|
@module = exception.class.to_s.split('::')[0...-1].join('::')
|
|
28
30
|
@thread_id = Thread.current.object_id
|
|
@@ -50,7 +52,7 @@ module Sentry
|
|
|
50
52
|
v = v.byteslice(0..MAX_LOCAL_BYTES - 1) + OMISSION_MARK
|
|
51
53
|
end
|
|
52
54
|
|
|
53
|
-
v
|
|
55
|
+
Utils::EncodingHelper.encode_to_utf_8(v)
|
|
54
56
|
rescue StandardError
|
|
55
57
|
PROBLEMATIC_LOCAL_VALUE_REPLACEMENT
|
|
56
58
|
end
|