stack-service-base 0.0.76 → 0.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5040caaeefe798a92d0f5758464a592094ab4110ed47eb1454cbc6105d054792
-  data.tar.gz: 8df39599e8a2ef12abca2d7ba2a1117fbcaebf673608f2f21ccbc9d91a68da0b
+  metadata.gz: 333dfdbe061e1a83f2b9271a54ae24336489e3ec41ef9fb605d85d457cc0ca1b
+  data.tar.gz: b45fe7a043608ba55c47b0221ac6673e20d65afd27cc9dec90294cd9a0bc14a9
 SHA512:
-  metadata.gz: 461bc25463a6a72254b06911850420d7668e624d674810223478598579ad460d0b3d457a4fec9a49deed70b609edb3b3d4a4edb37ce74202fdf7c36d5d0c1af2
-  data.tar.gz: 5ce16e4b261baf9e920b09ce0765df22e5ef14873150e02d1c28ced389a10ec758612913d23e44c3c97ddfa5bb2d2a0b5e06c1102ea13b058237c3f302dccbe7
+  metadata.gz: 4a3453756c2b111afa7c6418c31679a84d9b84f4f2714020ed4fa65f24faef1796220056f578744db06c634756685df2c6e2d5690206eac3c655988a9fd233d3
+  data.tar.gz: e510fa98848cd0a813be31e41f335a256ef100bbfeb6f740c3942db3459836afad53ac6d2911019b3b6d181ae034ffbcab3f6efe8622879469ffbc4fd00f96ed

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
 
@@ -191,6 +210,7 @@ def otl_span(name, attributes = {}, &block)
   end
 end
 
+# otl_current_span { _1.def add_attributes(otl_traceparent_id: otl_traceparent_id) }
 def otl_current_span
   return unless OTEL_ENABLED && Otel.enabled
   yield OpenTelemetry::Trace.current_span

data/lib/stack-service-base/project_template/gitlab-c/docker/Dockerfile.build

@@ -1,6 +1,6 @@
 FROM ruby:3.3.0-alpine3.19  AS base
 RUN apk add --update bash docker-cli-buildx docker-cli-compose git
-RUN gem install build-labels:0.0.68 dry-stack:0.1.16
+RUN gem install build-labels:0.0.70 dry-stack:0.1.16
 
 FROM base AS runner
 WORKDIR /build

data/lib/stack-service-base/stack_template/home/stack/Dockerfile.deploy

@@ -1,6 +1,6 @@
 FROM ruby:3.3.0-alpine3.19 as base
 RUN apk add docker-cli-buildx git parallel
-RUN gem install build-labels:0.0.55 dry-stack:0.1.51
+RUN gem install build-labels:0.0.70 dry-stack:0.1.51
 RUN apk add --no-cache openssh-client ca-certificates
 
 WORKDIR /build

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

@@ -1,3 +1,3 @@
 module StackServiceBase
-  VERSION = '0.0.76'
+  VERSION = '0.0.78'
 end

metadata

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