stack-service-base 0.0.75 → 0.0.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42a684599ec2f5f4ce219ff383bb91f280f3551633c88e5c854971e358b4d40a
-  data.tar.gz: 900890a86bfc5070661c1dcf7b533994685cfd118197d960e16bff8fe2236722
+  metadata.gz: f84cb064ccf3f6f83754e525d595d9902e8143ef279477c4a79e18252b3f72c4
+  data.tar.gz: 515133d93daa3d1282a81dae58cdd688d82d090a0639e66c3859254e9781d38d
 SHA512:
-  metadata.gz: b5d88abae4042bfbb7dff5a190c1d31c27fc8a712eda46984c47f4c5e301a56cf25484a6ae49ed573b066d9c7776d8fbc05d14c865651d70696daa8236f8dacf
-  data.tar.gz: 189b5f00ebb89a0d08e1d482c27795f95697ac8e00388940e073218790420d0fe8cd8ab329ed7a441d6450dec2e6b653899f111bc408aeddfdfb75a14ca46ddd
+  metadata.gz: 3b53b686eb180ea3001a7cc7506b2c57e7887985a4ac06ecb35553f4239b2bbfdb29c96626df8d2813594d9d8f390826c842dbef8e9c777fa60a79d5355829ba
+  data.tar.gz: 53f50ae84f7abb9c76b30a771de3cee5f1bc83ff8dc651f184c850a912065155bc3cd4e61e708eba1cb6e5bdc0973454ce90329cff876804b75ccc4d6c9a9217

data/lib/stack-service-base/open_telemetry.rb

@@ -37,9 +37,28 @@ if OTEL_ENABLED
   require 'opentelemetry-exporter-otlp-logs'
 end
 
+if false
+  # TODO: disable Faraday spans for the given Threads
+  #   debug and test
+
+  if defined? OpenTelemetry::Instrumentation::Faraday::Middlewares::Stable::TracerMiddleware
+    class OpenTelemetry::Instrumentation::Faraday::Middlewares::Stable::TracerMiddlewareTracerMiddleware
+      alias_method :_original_call, :call
+      def call(env)
+        if Thread.current[:disable_faraday] == true
+          app.call env
+        else
+          _original_call(env)
+        end
+      end
+    end
+  end
+
+end
+
 if defined? Async and OTEL_ENABLED
   module AsyncTaskOTELPatch
-    def initialize(reactor, parent = Async::Task.current?, logger: nil, finished: nil, **options, &block)
+    def initialize(*pos, **kw, &block)
       ctx_ = OpenTelemetry::Context.current
 
       block_otl = ->(t, *arguments){
@@ -47,7 +66,7 @@ if defined? Async and OTEL_ENABLED
           block.call t, *arguments
         end
       }
-      super reactor, parent, logger: , finished: , **options, &block_otl
+      super(*pos, **kw, &block_otl)
     end
   end
 
@@ -149,7 +168,39 @@ if defined? Sequel and OTEL_ENABLED
   end
 end
 
-def otl_span(name, attributes = {})
+
+# Thread.otl_new do
+# ...
+# end
+
+class << Thread
+  alias_method :_otel_original_new, :new
+
+  if OTEL_ENABLED
+    def otl_new(*args, **kwargs, &block)
+      ctx = OpenTelemetry::Context.current
+
+      _otel_original_new(*args, **kwargs) do |*bargs|
+        OpenTelemetry::Context.with_current(ctx) do
+          block.call(*bargs)
+        end
+      end
+    end
+  else
+    alias_method :otl_new, :new
+  end
+end
+
+def otl_span_thread(name, attributes = {}, &block)
+  ctx_ = OpenTelemetry::Context.current
+  Thread.new do
+    OpenTelemetry::Context.with_current(ctx_) do
+      otl_span(name, attributes, &block)
+    end
+  end
+end
+
+def otl_span(name, attributes = {}, &block)
   # span_ = OpenTelemetry::Trace.current_span
   return yield(nil) unless OTEL_ENABLED && Otel.enabled
 
@@ -170,13 +221,13 @@ end
 # end
 
 def otl_traceparent_id
-    return nil unless OTEL_ENABLED && Otel.enabled
+  return nil unless OTEL_ENABLED && Otel.enabled
 
-    span_context = OpenTelemetry::Trace.current_span.context
-    trace_id = span_context.trace_id.unpack1('H*')
-    span_id = span_context.span_id.unpack1('H*')
-    trace_flags = format('%02x', span_context.trace_flags.instance_eval{ @flags }) # Two-digit hex for trace flags (e.g., sampled)
-    "00-#{trace_id}-#{span_id}-#{trace_flags}"
+  span_context = OpenTelemetry::Trace.current_span.context
+  trace_id = span_context.trace_id.unpack1('H*')
+  span_id = span_context.span_id.unpack1('H*')
+  trace_flags = format('%02x', span_context.trace_flags.instance_eval{ @flags }) # Two-digit hex for trace flags (e.g., sampled)
+  "00-#{trace_id}-#{span_id}-#{trace_flags}"
 end
 
 def otl_def(name)

data/lib/stack-service-base/version.rb

@@ -1,3 +1,3 @@
 module StackServiceBase
-  VERSION = '0.0.75'
+  VERSION = '0.0.77'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack-service-base
 version: !ruby/object:Gem::Version
-  version: 0.0.75
+  version: 0.0.77
 platform: ruby
 authors:
 - Artyom B