tobox 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1414826d4ba25bb3b9ac45856cfe3d064efd57c4d0dbac1f5ad6b0fa5887286
-  data.tar.gz: 194b0b90a514e1e4809170baf4389090a06cc62e4456412117ced3094dab89d5
+  metadata.gz: f199b223858e41b8fae97f8e6d8a07f83b16a349010c4c35d402884fefcf5954
+  data.tar.gz: f7c5db09b9b477535cceef7522a9afca13bf16da6c4394f426d5a637d290662d
 SHA512:
-  metadata.gz: ec514b27d335a02c0eb2c3d3a6a01cdf3ddd289484b4aa80e51b4664a0f3eff3a179986004d1b6d3b0db338df0a15645a9b622dd1771b81b8d3670c554541367
-  data.tar.gz: 36eabe5466a4912d994893496e8cf76fbc445e7cf437003536cd5688531ec4786ff714f25c391cf969ec3d3fdfe77f6017ccacb0d5285d9b341c5fe5456c0978
+  metadata.gz: a30f871ceb72033405eab56005aad942e8f34405852d33cf979e9c6a46474ff6e6459d098ed7aacf967140d232035ad1d093b2e27998179606eff7a99b41f8e0
+  data.tar.gz: 10da8b5d25df57d13d971f37126619872a7ae92208496faf028f2ddd4e66df28e6d76e207498030ee0efd8842231e231b51b1c14f59cdc0b4067873802a4d74b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.7.1] - 2025-02-07
+
+* `:datadog` plugin: support datadog gem v2 or higher.
+
 ## [0.7.0] - 2024-12-18
 
 ### Features

data/lib/tobox/plugins/datadog/configuration.rb

@@ -10,7 +10,9 @@ module Datadog
       module Tobox
         module Configuration
           class Settings < Contrib::Configuration::Settings
-            if Gem::Version.new(DDTrace::VERSION::STRING) >= Gem::Version.new("1.13.0")
+            DATADOG_VERSION = defined?(DDTrace) ? DDTrace::VERSION : Datadog::VERSION
+
+            if Gem::Version.new(DATADOG_VERSION::STRING) >= Gem::Version.new("1.13.0")
               option :enabled do |o|
                 o.type :bool
                 o.env "DD_TOBOX_ENABLED"
@@ -47,12 +49,12 @@ module Datadog
 
             option :service_name
 
-            if DDTrace::VERSION::STRING >= "1.15.0"
+            if DATADOG_VERSION::STRING >= "1.15.0"
               option :error_handler do |o|
                 o.type :proc
                 o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
               end
-            elsif DDTrace::VERSION::STRING >= "1.13.0"
+            elsif DATADOG_VERSION::STRING >= "1.13.0"
               option :error_handler do |o|
                 o.type :proc
                 o.experimental_default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)

data/lib/tobox/plugins/datadog.rb

@@ -8,6 +8,8 @@ module Tobox
   module Plugins
     module Datadog
       class EventHandler
+        DATADOG_VERSION = defined?(DDTrace) ? DDTrace::VERSION : ::Datadog::VERSION
+
         def initialize(config)
           @config = config
           @db_table = @config[:table]
@@ -38,12 +40,7 @@ module Tobox
             end
           end
 
-          span = ::Datadog::Tracing.trace(
-            "tobox.event",
-            service: service,
-            span_type: ::Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
-            on_error: error_handler
-          )
+          span = create_span(service, error_handler)
           span.resource = resource
 
           span.set_tag(::Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, "tobox")
@@ -81,6 +78,28 @@ module Tobox
           span.set_error(error)
           span.finish
         end
+
+        private
+
+        if Gem::Version.new(DATADOG_VERSION::STRING) >= Gem::Version.new("2.0.0")
+          def create_span(service, error_handler)
+            ::Datadog::Tracing.trace(
+              "tobox.event",
+              service: service,
+              type: ::Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
+              on_error: error_handler
+            )
+          end
+        else
+          def create_span(service, error_handler)
+            ::Datadog::Tracing.trace(
+              "tobox.event",
+              service: service,
+              span_type: ::Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
+              on_error: error_handler
+            )
+          end
+        end
       end
 
       class << self

data/lib/tobox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tobox
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tobox
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - HoneyryderChuck
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 2025-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -81,7 +80,6 @@ metadata:
   documentation_uri: https://gitlab.com/os85/tobox
   changelog_uri: https://gitlab.com/os85/tobox/-/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Transactional outbox pattern implementation in ruby
 test_files: []