stack-service-base 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5450eee19abf3aeffa5ab2ad3fed729f42c14ced177471940ce27cde61a59584
-  data.tar.gz: 3fe96d720e4037d1418f9a0775e715a6cb3ecc737613f87413e5f6e4516982cc
+  metadata.gz: 5511026a19ca068d501ca1cf33053d66cc3f22925adb51a232f981948aa22f01
+  data.tar.gz: aa6640e692ef366445b02151eeedd9235ba6d0dc5397a1d30eb419910b203626
 SHA512:
-  metadata.gz: 01a6532aca09387fe4f5c696a93f587a16cff1ca650f4e862961570340bcbd57fe4a87a521a596312017514b64189d37eaf8386dd7722f041f8ae40de7d169bb
-  data.tar.gz: 73fbf5663328ef7963a073a14bdeaa78f0ed74753091182b5476f54a502d8bc4bf91a1d78a7e7d8593b27b38b01771dc94fe9bbe946a9d2572095344016f230c
+  metadata.gz: 07eedfbefd18e243a62af1482d960638f4f2b8fe607af7de588f3a67e6b491b4244727163faeb34f8bda69585d8012d4e33e8f1e4116cd4f26b14454faf14002
+  data.tar.gz: 43c0f4db64e33650a66ab08cd5b24b5763df191a4941914d541c1c7a55c713b2d287f28b4d53dca1cc221e8f6f2654c9de6c6fa8fbff13c07666972505d8dcb2

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

@@ -5,6 +5,7 @@ QUIET = ENV.fetch('CONSOLE_LEVEL', 'false') == 'true'
 PERFORMANCE = ENV.fetch('PERFORMANCE', 'false') == 'true'
 
 ENV['CONSOLE_LEVEL'] ||= 'all' unless QUIET || PERFORMANCE
+# ENV['CONSOLE_OUTPUT'] ||= 'XTerm' # JSON,Text,XTerm,Default
 
 CONSOLE_LOGGER = Class.new {
   def <<(...) = Console.logger.info(...)

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

@@ -1,3 +1,5 @@
+require 'async'
+
 ENV['OTEL_LOG_LEVEL'] ||= 'debug'
 ENV['OTEL_TRACES_EXPORTER'] ||= 'console,otlp'
 
@@ -22,7 +24,6 @@ if OTEL_ENABLED
 end
 
 if defined? Async and OTEL_ENABLED
-  require 'async'
   module AsyncTaskOTELPatch
     def initialize(parent = Task.current?, finished: nil, **options, &block)
       ctx_ = OpenTelemetry::Context.current
@@ -58,8 +59,17 @@ def otel_initialize
   return unless OTEL_ENABLED
 
   OpenTelemetry::SDK.configure do |c|
+    OpenTelemetry::Instrumentation::Rack
+    c.use_all({
+      'OpenTelemetry::Instrumentation::Sinatra' => { install_rack: true },
+      'OpenTelemetry::Instrumentation::Rack' => {
+        use_rack_events: false, # TODO: doesnt work with Websoker requests
+        # /home/user/.rbenv/versions/3.3.1/lib/ruby/gems/3.3.0/gems/opentelemetry-instrumentation-rack-0.26.0/lib/opentelemetry/instrumentation/rack/instrumentation.rb#43
+        url_quantization: ->(path, env) { "HTTP #{env['REQUEST_METHOD']} #{path}" },
+        untraced_requests: ->(env) { env['HTTP_UPGRADE'] == 'websocket' }
+      }
+    })
     # c.service_name = SERVICE_NAME
-    c.use_all # enables all instrumentation!
   end
 
   at_exit do
@@ -125,6 +135,16 @@ def otl_current_span
   yield OpenTelemetry::Trace.current_span
 end
 
+def otl_traceparent_id
+    return nil unless 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}"
+end
+
 def otl_def(name)
   original_method = self.respond_to?(:instance_method) ? instance_method(name) : method(name)
   self.respond_to?(:remove_method) ? remove_method(name) : Object.send(:remove_method, name)
@@ -138,12 +158,6 @@ def otl_def(name)
   end
 end
 
-if defined?  OpenTelemetry::Instrumentation::Rack::Middlewares
-  OpenTelemetry::Instrumentation::Rack::Middlewares::TracerMiddleware.config[:url_quantization] = ->(path, env) {
-    "HTTP #{env['REQUEST_METHOD']} #{path}"
-  }
-end
-
 if OTEL_ENABLED
   class OpenTelemetry::SDK::Trace::Span
     alias add_attributes_old add_attributes

data/lib/version.rb

@@ -1,5 +1,5 @@
 module StackServiceBase
   class Base
-    VERSION = '0.0.9'
+    VERSION = '0.0.11'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: stack-service-base
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - ''
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-07 00:00:00.000000000 Z
+date: 2025-05-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: prometheus-client
   requirement: !ruby/object:Gem::Requirement