ddtrace 1.11.0.beta1 → 1.11.0

data/lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/heartbeat.rb

@@ -7,16 +7,18 @@ module Datadog
         module ServerInternalTracer
           # Trace when a Sidekiq process has a heartbeat
           module Heartbeat
-            def stop
+            private
+
+            def heartbeat
               configuration = Datadog.configuration.tracing[:sidekiq]
 
-              Datadog::Tracing.trace(Ext::SPAN_STOP, service: configuration[:service_name]) do |span|
+              Datadog::Tracing.trace(Ext::SPAN_HEARTBEAT, service: configuration[:service_name]) do |span|
                 span.span_type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
                 span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
 
                 span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
-                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_STOP)
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_HEARTBEAT)
 
                 # Set analytics sample rate
                 if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
@@ -26,10 +28,13 @@ module Datadog
                 super
               end
             end
+          end
 
+          # This implementation is identical to `Heartbeat`, but patching `beat` method instead.
+          module Beat
             private
 
-            def heartbeat
+            def beat
               configuration = Datadog.configuration.tracing[:sidekiq]
 
               Datadog::Tracing.trace(Ext::SPAN_HEARTBEAT, service: configuration[:service_name]) do |span|

data/lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/stop.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Sidekiq
+        module ServerInternalTracer
+          # Trace when Sidekiq stops
+          module Stop
+            def stop
+              configuration = Datadog.configuration.tracing[:sidekiq]
+
+              Datadog::Tracing.trace(Ext::SPAN_STOP, service: configuration[:service_name]) do |span|
+                span.span_type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
+
+                span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
+
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_STOP)
+
+                # Set analytics sample rate
+                if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+                  Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+                end
+
+                super
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/version.rb

@@ -5,9 +5,11 @@ module DDTrace
     MAJOR = 1
     MINOR = 11
     PATCH = 0
-    PRE = 'beta1'
+    PRE = nil
+    BUILD = nil
+    # PRE and BUILD above are modified for dev gems during gem build GHA workflow
 
-    STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
+    STRING = [MAJOR, MINOR, PATCH, PRE, BUILD].compact.join('.')
 
     MINIMUM_RUBY_VERSION = '2.1.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 1.11.0.beta1
+  version: 1.11.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -272,6 +272,7 @@ files:
 - lib/datadog/core/remote/configuration/target.rb
 - lib/datadog/core/remote/dispatcher.rb
 - lib/datadog/core/remote/ext.rb
+- lib/datadog/core/remote/negotiation.rb
 - lib/datadog/core/remote/worker.rb
 - lib/datadog/core/runtime/ext.rb
 - lib/datadog/core/runtime/metrics.rb
@@ -739,6 +740,7 @@ files:
 - lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/job_fetch.rb
 - lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/redis_info.rb
 - lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/scheduled_poller.rb
+- lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/stop.rb
 - lib/datadog/tracing/contrib/sidekiq/server_tracer.rb
 - lib/datadog/tracing/contrib/sidekiq/utils.rb
 - lib/datadog/tracing/contrib/sinatra/configuration/settings.rb
@@ -862,6 +864,7 @@ licenses:
 - BSD-3-Clause
 metadata:
   allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -880,7 +883,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications