Merge branch 'main' into dependabot-improvements

Author: arielvalentin

.toys/.data/releases.yml

@@ -193,6 +193,10 @@ gems:
     directory: instrumentation/faraday
     version_constant: [OpenTelemetry, Instrumentation, Faraday, VERSION]
 
+  - name: opentelemetry-instrumentation-grpc
+    directory: instrumentation/grpc
+    version_constant: [OpenTelemetry, Instrumentation, Grpc, VERSION]
+
   - name: opentelemetry-instrumentation-mongo
     directory: instrumentation/mongo
     version_constant: [OpenTelemetry, Instrumentation, Mongo, VERSION]
@@ -290,6 +294,6 @@ gems:
     version_rb_path: lib/opentelemetry/resource/detector/google_cloud_platform/version.rb
     version_constant: [OpenTelemetry, Resource, Detector, GoogleCloudPlatform, VERSION]
 
-  - name: opentelemetry-instrumentation-grpc
-    directory: instrumentation/grpc
-    version_constant: [OpenTelemetry, Instrumentation, Grpc, VERSION]
+  - name: opentelemetry-sampler-xray
+    directory: sampler/xray
+    version_constant: [OpenTelemetry, Sampler, XRay, VERSION]

CONTRIBUTING.md

@@ -69,9 +69,8 @@ This repository contains multiple Ruby gems:
 
 * Various instrumentation gems located in subdirectories of `instrumentation`
 * Various resource detector gems located in subdirectories of `resources`
-* `opentelemetry-propagator-xray` located in the `propagator/xray` directory
-* `opentelemetry-propagator-ottrace` located in the `propagator/ottrace` directory
-* `opentelemetry-propagator-google_cloud_trace_context` located in the `propagator/google_cloud_trace_context` directory
+* Various propagation gems located in the subdirectories of `propagator`
+* `opentelemetry-sampler-xray` located in the `sampler/xray` directory
 
 Each of these gems has its configuration and tests.
 

instrumentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/dup/tracer_middleware.rb

@@ -84,6 +84,8 @@ def self.around_default_stack
 
             def handle_response(datum)
               datum.delete(:otel_span)&.tap do |span|
+                token = datum.delete(:otel_token)
+                OpenTelemetry::Context.detach(token) if token
                 return unless span.recording?
 
                 if datum.key?(:response)
@@ -99,7 +101,6 @@ def handle_response(datum)
                 end
 
                 span.finish
-                OpenTelemetry::Context.detach(datum.delete(:otel_token)) if datum.include?(:otel_token)
               end
             rescue StandardError => e
               OpenTelemetry.handle_error(e)

instrumentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/old/tracer_middleware.rb

@@ -76,6 +76,8 @@ def self.around_default_stack
 
             def handle_response(datum)
               datum.delete(:otel_span)&.tap do |span|
+                token = datum.delete(:otel_token)
+                OpenTelemetry::Context.detach(token) if token
                 return unless span.recording?
 
                 if datum.key?(:response)
@@ -90,7 +92,6 @@ def handle_response(datum)
                 end
 
                 span.finish
-                OpenTelemetry::Context.detach(datum.delete(:otel_token)) if datum.include?(:otel_token)
               end
             rescue StandardError => e
               OpenTelemetry.handle_error(e)

instrumentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/stable/tracer_middleware.rb

@@ -76,6 +76,8 @@ def self.around_default_stack
 
             def handle_response(datum)
               datum.delete(:otel_span)&.tap do |span|
+                token = datum.delete(:otel_token)
+                OpenTelemetry::Context.detach(token) if token
                 return unless span.recording?
 
                 if datum.key?(:response)
@@ -90,7 +92,6 @@ def handle_response(datum)
                 end
 
                 span.finish
-                OpenTelemetry::Context.detach(datum.delete(:otel_token)) if datum.include?(:otel_token)
               end
             rescue StandardError => e
               OpenTelemetry.handle_error(e)

instrumentation/excon/test/opentelemetry/instrumentation/excon/dup/instrumentation_test.rb

@@ -199,6 +199,19 @@
 
       _(span.attributes['peer.service']).must_equal 'example:custom'
     end
+
+    describe 'context detachment with non-recording spans' do
+      it 'detaches context when span is not recorded' do
+        with_sampler(OpenTelemetry::SDK::Trace::Samplers::ALWAYS_OFF) do
+          initial_context = OpenTelemetry::Context.current
+          Excon.get('http://example.com/success')
+          final_context = OpenTelemetry::Context.current
+
+          _(final_context).must_equal initial_context
+          _(exporter.finished_spans).must_be_empty
+        end
+      end
+    end
   end
 
   describe 'untraced?' do

instrumentation/excon/test/opentelemetry/instrumentation/excon/old/instrumentation_test.rb

@@ -158,6 +158,19 @@
 
       _(span.attributes['peer.service']).must_equal 'example:custom'
     end
+
+    describe 'context detachment with non-recording spans' do
+      it 'detaches context when span is not recorded' do
+        with_sampler(OpenTelemetry::SDK::Trace::Samplers::ALWAYS_OFF) do
+          initial_context = OpenTelemetry::Context.current
+          Excon.get('http://example.com/success')
+          final_context = OpenTelemetry::Context.current
+
+          _(final_context).must_equal initial_context
+          _(exporter.finished_spans).must_be_empty
+        end
+      end
+    end
   end
 
   describe 'untraced?' do

instrumentation/excon/test/opentelemetry/instrumentation/excon/stable/instrumentation_test.rb

@@ -172,6 +172,19 @@
 
       _(span.attributes['peer.service']).must_equal 'example:custom'
     end
+
+    describe 'context detachment with non-recording spans' do
+      it 'detaches context when span is not recorded' do
+        with_sampler(OpenTelemetry::SDK::Trace::Samplers::ALWAYS_OFF) do
+          initial_context = OpenTelemetry::Context.current
+          Excon.get('http://example.com/success')
+          final_context = OpenTelemetry::Context.current
+
+          _(final_context).must_equal initial_context
+          _(exporter.finished_spans).must_be_empty
+        end
+      end
+    end
   end
 
   describe 'untraced?' do

instrumentation/excon/test/test_helper.rb

@@ -20,3 +20,11 @@
   c.logger = Logger.new($stderr, level: ENV.fetch('OTEL_LOG_LEVEL', 'fatal').to_sym)
   c.add_span_processor span_processor
 end
+
+def with_sampler(sampler)
+  previous_sampler = OpenTelemetry.tracer_provider.sampler
+  OpenTelemetry.tracer_provider.sampler = sampler
+  yield
+ensure
+  OpenTelemetry.tracer_provider.sampler = previous_sampler
+end