feat: Support non block structured untraced ctx

open-telemetry · May 8, 2024 · 18e4fa3 · 18e4fa3
1 parent a1f1629
commit 18e4fa3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/common/lib/opentelemetry/common/utilities.rb b/common/lib/opentelemetry/common/utilities.rb
@@ -87,9 +87,12 @@ def truncate_attribute_value(value, limit)
       end
 
       # Disables tracing within the provided block.
-      def untraced
-        Context.with_value(UNTRACED_KEY, true) do |ctx, _|
-          yield ctx
+      def untraced(context = Context.current)
+        context = context.set_value(UNTRACED_KEY, true)
+        if block_given?
+          Context.with_current(context) { |ctx| yield ctx }
+        else
+          context
         end
       end
 

diff --git a/common/test/opentelemetry/common/utilities_test.rb b/common/test/opentelemetry/common/utilities_test.rb
@@ -26,6 +26,13 @@ def shutdown(timeout: nil); end
       common_utils.untraced {}
       assert_equal(false, common_utils.untraced?)
     end
+
+    it 'supports non block format' do
+      token = OpenTelemetry::Context.attach(common_utils.untraced)
+      assert_equal(true, common_utils.untraced?)
+      OpenTelemetry::Context.detach(token)
+      assert_equal(false, common_utils.untraced?)
+    end
   end
 
   describe '#utf8_encode' do