tobox 0.7.0 → 0.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +4 -0
  3. data/lib/tobox/plugins/datadog/configuration.rb +5 -3
  4. data/lib/tobox/plugins/datadog.rb +25 -6
  5. data/lib/tobox/version.rb +1 -1
  6. metadata +3 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d1414826d4ba25bb3b9ac45856cfe3d064efd57c4d0dbac1f5ad6b0fa5887286
4
- data.tar.gz: 194b0b90a514e1e4809170baf4389090a06cc62e4456412117ced3094dab89d5
3
+ metadata.gz: f199b223858e41b8fae97f8e6d8a07f83b16a349010c4c35d402884fefcf5954
4
+ data.tar.gz: f7c5db09b9b477535cceef7522a9afca13bf16da6c4394f426d5a637d290662d
5
5
  SHA512:
6
- metadata.gz: ec514b27d335a02c0eb2c3d3a6a01cdf3ddd289484b4aa80e51b4664a0f3eff3a179986004d1b6d3b0db338df0a15645a9b622dd1771b81b8d3670c554541367
7
- data.tar.gz: 36eabe5466a4912d994893496e8cf76fbc445e7cf437003536cd5688531ec4786ff714f25c391cf969ec3d3fdfe77f6017ccacb0d5285d9b341c5fe5456c0978
6
+ metadata.gz: a30f871ceb72033405eab56005aad942e8f34405852d33cf979e9c6a46474ff6e6459d098ed7aacf967140d232035ad1d093b2e27998179606eff7a99b41f8e0
7
+ data.tar.gz: 10da8b5d25df57d13d971f37126619872a7ae92208496faf028f2ddd4e66df28e6d76e207498030ee0efd8842231e231b51b1c14f59cdc0b4067873802a4d74b
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  ## [Unreleased]
2
2
 
3
+ ## [0.7.1] - 2025-02-07
4
+
5
+ * `:datadog` plugin: support datadog gem v2 or higher.
6
+
3
7
  ## [0.7.0] - 2024-12-18
4
8
 
5
9
  ### Features
data/lib/tobox/plugins/datadog/configuration.rb CHANGED
@@ -10,7 +10,9 @@ module Datadog
10
10
  module Tobox
11
11
  module Configuration
12
12
  class Settings < Contrib::Configuration::Settings
13
- if Gem::Version.new(DDTrace::VERSION::STRING) >= Gem::Version.new("1.13.0")
13
+ DATADOG_VERSION = defined?(DDTrace) ? DDTrace::VERSION : Datadog::VERSION
14
+
15
+ if Gem::Version.new(DATADOG_VERSION::STRING) >= Gem::Version.new("1.13.0")
14
16
  option :enabled do |o|
15
17
  o.type :bool
16
18
  o.env "DD_TOBOX_ENABLED"
@@ -47,12 +49,12 @@ module Datadog
47
49
 
48
50
  option :service_name
49
51
 
50
- if DDTrace::VERSION::STRING >= "1.15.0"
52
+ if DATADOG_VERSION::STRING >= "1.15.0"
51
53
  option :error_handler do |o|
52
54
  o.type :proc
53
55
  o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
54
56
  end
55
- elsif DDTrace::VERSION::STRING >= "1.13.0"
57
+ elsif DATADOG_VERSION::STRING >= "1.13.0"
56
58
  option :error_handler do |o|
57
59
  o.type :proc
58
60
  o.experimental_default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
data/lib/tobox/plugins/datadog.rb CHANGED
@@ -8,6 +8,8 @@ module Tobox
8
8
  module Plugins
9
9
  module Datadog
10
10
  class EventHandler
11
+ DATADOG_VERSION = defined?(DDTrace) ? DDTrace::VERSION : ::Datadog::VERSION
12
+
11
13
  def initialize(config)
12
14
  @config = config
13
15
  @db_table = @config[:table]
@@ -38,12 +40,7 @@ module Tobox
38
40
  end
39
41
  end
40
42
 
41
- span = ::Datadog::Tracing.trace(
42
- "tobox.event",
43
- service: service,
44
- span_type: ::Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
45
- on_error: error_handler
46
- )
43
+ span = create_span(service, error_handler)
47
44
  span.resource = resource
48
45
 
49
46
  span.set_tag(::Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, "tobox")
@@ -81,6 +78,28 @@ module Tobox
81
78
  span.set_error(error)
82
79
  span.finish
83
80
  end
81
+
82
+ private
83
+
84
+ if Gem::Version.new(DATADOG_VERSION::STRING) >= Gem::Version.new("2.0.0")
85
+ def create_span(service, error_handler)
86
+ ::Datadog::Tracing.trace(
87
+ "tobox.event",
88
+ service: service,
89
+ type: ::Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
90
+ on_error: error_handler
91
+ )
92
+ end
93
+ else
94
+ def create_span(service, error_handler)
95
+ ::Datadog::Tracing.trace(
96
+ "tobox.event",
97
+ service: service,
98
+ span_type: ::Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
99
+ on_error: error_handler
100
+ )
101
+ end
102
+ end
84
103
  end
85
104
 
86
105
  class << self
data/lib/tobox/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Tobox
4
- VERSION = "0.7.0"
4
+ VERSION = "0.7.1"
5
5
  end
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tobox
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - HoneyryderChuck
8
- autorequire:
9
8
  bindir: exe
10
9
  cert_chain: []
11
- date: 2024-12-18 00:00:00.000000000 Z
10
+ date: 2025-02-07 00:00:00.000000000 Z
12
11
  dependencies:
13
12
  - !ruby/object:Gem::Dependency
14
13
  name: logger
@@ -81,7 +80,6 @@ metadata:
81
80
  documentation_uri: https://gitlab.com/os85/tobox
82
81
  changelog_uri: https://gitlab.com/os85/tobox/-/blob/master/CHANGELOG.md
83
82
  rubygems_mfa_required: 'true'
84
- post_install_message:
85
83
  rdoc_options: []
86
84
  require_paths:
87
85
  - lib
@@ -96,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
96
94
  - !ruby/object:Gem::Version
97
95
  version: '0'
98
96
  requirements: []
99
- rubygems_version: 3.5.3
100
- signing_key:
97
+ rubygems_version: 3.6.2
101
98
  specification_version: 4
102
99
  summary: Transactional outbox pattern implementation in ruby
103
100
  test_files: []