foam-ruby 0.1.0.alpha7 → 0.1.0.alpha9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6357c1e7accb580c8cec51b5ca55500a49c84964984f1037176dccd242240e82
-  data.tar.gz: 85b970210911bc6bbacf876c25407f13ab1d8900a0466a83d92d267f065d1bb6
+  metadata.gz: 87d1563f7f755555866b2b250981864ab47631e4bd751bbc9b9c74cc039bcf3f
+  data.tar.gz: 12f4674411cdc386042fca764ec96b7e38c4c19a7632a913b8b940bc0cfa8df5
 SHA512:
-  metadata.gz: 127fbcc2b2c88659c61d20404fb6361e090cdc2dc352221b87d123efeb3121e2727414f6b4f05ba4140b2748b330a137e2c8e1eda6205f27097ad2be592d896c
-  data.tar.gz: 9d5718f4db88c948a6787632687cf9081c4c0a0425e5b45ae4c349e4b3e333aed3d075980bf54ece6fdea8427b95139a8cb7ddcd7faea59ac2bf5d7ec56053f3
+  metadata.gz: ae75e5573553e9e9dc3df56dfd474a80ea1aebdabf47868524ceed505d7cdfbdc7d8b20721dcf85c8d97a4711d802d7fe3a2678b2ca47651f39d37585426db21
+  data.tar.gz: c6f2ac7466bd9d53c2d434d43f0f8378a396ed859a1dae5af523d18ce7564a3242c87eea117bd07179b2f181b415204ba57997288b8b393d75223b1fd6b72baa

data/lib/foam/ruby/log_subscriber.rb

@@ -24,13 +24,14 @@ module Foam
       }.freeze
 
       def initialize
-        @otel_logger = OpenTelemetry.logger_provider.logger(name: "foam-ruby")
+        @logger_name = "foam-ruby"
       end
 
       def emit(severity, message)
         return if message.nil? || (message.respond_to?(:empty?) && message.empty?)
 
-        @otel_logger.on_emit(
+        otel_logger = OpenTelemetry.logger_provider.logger(name: @logger_name)
+        otel_logger.on_emit(
           body: message.to_s,
           severity_number: SEVERITY_MAP.fetch(severity, OpenTelemetry::Logs::SeverityNumber::SEVERITY_NUMBER_INFO),
           severity_text: SEVERITY_TEXT.fetch(severity, "INFO"),

data/lib/foam/ruby/middleware.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Foam
+  module Ruby
+    class Middleware
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        Foam::Ruby.ensure_worker_setup!
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/foam/ruby/otel_setup.rb

@@ -17,37 +17,71 @@ module Foam
       end
 
       def configure_traces(config)
-        OpenTelemetry::SDK.configure do |c|
-          c.service_name = config.service_name
-
-          c.add_span_processor(
-            OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
-              OpenTelemetry::Exporter::OTLP::Exporter.new(
-                endpoint: config.traces_endpoint,
-                headers: config.otel_headers
-              )
-            )
+        @foam_span_processor = OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
+          OpenTelemetry::Exporter::OTLP::Exporter.new(
+            endpoint: config.traces_endpoint,
+            headers: config.otel_headers
           )
+        )
 
-          c.use_all
+        existing = OpenTelemetry.tracer_provider
+        if existing.is_a?(OpenTelemetry::SDK::Trace::TracerProvider)
+          existing.add_span_processor(@foam_span_processor)
+        else
+          OpenTelemetry::SDK.configure do |c|
+            c.service_name = config.service_name
+            c.add_span_processor(@foam_span_processor)
+            c.use_all
+          end
         end
+
+        @attached_provider = OpenTelemetry.tracer_provider
+      end
+
+      def ensure_processor_attached!
+        return unless @foam_span_processor
+
+        current = OpenTelemetry.tracer_provider
+        return if current.equal?(@attached_provider)
+        return unless current.is_a?(OpenTelemetry::SDK::Trace::TracerProvider)
+
+        current.add_span_processor(@foam_span_processor)
+        @attached_provider = current
       end
 
       def configure_logs(config)
-        resource = OpenTelemetry::SDK::Resources::Resource.create(
-          "service.name" => config.service_name,
-          "deployment.environment" => ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "production"
+        @foam_log_processor = OpenTelemetry::SDK::Logs::Export::BatchLogRecordProcessor.new(
+          OpenTelemetry::Exporter::OTLP::Logs::LogsExporter.new(
+            endpoint: config.logs_endpoint,
+            headers: config.otel_headers
+          )
         )
 
-        exporter = OpenTelemetry::Exporter::OTLP::Logs::LogsExporter.new(
-          endpoint: config.logs_endpoint,
-          headers: config.otel_headers
-        )
+        existing = OpenTelemetry.logger_provider
+        if existing.is_a?(OpenTelemetry::SDK::Logs::LoggerProvider)
+          existing.add_log_record_processor(@foam_log_processor)
+        else
+          resource = OpenTelemetry::SDK::Resources::Resource.create(
+            "service.name" => config.service_name,
+            "deployment.environment" => ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "production"
+          )
+          provider = OpenTelemetry::SDK::Logs::LoggerProvider.new(resource: resource)
+          provider.add_log_record_processor(@foam_log_processor)
+          OpenTelemetry.logger_provider = provider
+        end
+
+        @attached_logger_provider = OpenTelemetry.logger_provider
+      end
+
+      def ensure_log_processor_attached!
+        return unless @foam_log_processor
+
+        current = OpenTelemetry.logger_provider
+        return if current.equal?(@attached_logger_provider)
+        return unless current.is_a?(OpenTelemetry::SDK::Logs::LoggerProvider)
 
-        processor = OpenTelemetry::SDK::Logs::Export::BatchLogRecordProcessor.new(exporter)
-        logger_provider = OpenTelemetry::SDK::Logs::LoggerProvider.new(resource: resource)
-        logger_provider.add_log_record_processor(processor)
-        OpenTelemetry.logger_provider = logger_provider
+        current.add_log_record_processor(@foam_log_processor)
+        @attached_logger_provider = current
       end
     end
   end

data/lib/foam/ruby/version.rb

@@ -2,6 +2,6 @@
 
 module Foam
   module Ruby
-    VERSION = "0.1.0.alpha7"
+    VERSION = "0.1.0.alpha9"
   end
 end

data/lib/foam/ruby.rb

@@ -11,6 +11,7 @@ module Foam
       end
 
       def init(token: nil, service_name: nil)
+        return if initialized?
         return unless production?
 
         config = configuration
@@ -24,9 +25,10 @@ module Foam
 
         require_relative "ruby/otel_setup"
         require_relative "ruby/log_subscriber"
+        require_relative "ruby/middleware"
 
         OtelSetup.configure!(config)
-        schedule_logger_attach!
+        insert_middleware!
         bridge_sentry!
         @initialized = true
       rescue Exception => e # rubocop:disable Lint/RescueException
@@ -34,6 +36,24 @@ module Foam
         @initialized = false
       end
 
+      # Ensures Foam's processors and logger broadcast are attached in the
+      # current process. Called by Middleware on the first request per worker
+      # PID — a single integer comparison on every subsequent request.
+      # Public so non-Rails apps can call it from custom fork hooks.
+      def ensure_worker_setup!
+        return unless initialized?
+
+        pid = Process.pid
+        return if @worker_pid == pid
+        @worker_pid = pid
+
+        OtelSetup.ensure_processor_attached!
+        OtelSetup.ensure_log_processor_attached!
+        attach_otel_logger!
+      rescue Exception # rubocop:disable Lint/RescueException
+        nil
+      end
+
       def capture_exception(error, attributes: {})
         return unless initialized?
 
@@ -71,14 +91,10 @@ module Foam
         false
       end
 
-      def schedule_logger_attach!
-        return unless defined?(::Rails)
+      def insert_middleware!
+        return unless defined?(::Rails) && ::Rails.respond_to?(:application) && ::Rails.application
 
-        if ::Rails.respond_to?(:application) && ::Rails.application
-          ::Rails.application.config.after_initialize { do_attach_otel_logger! }
-        else
-          do_attach_otel_logger!
-        end
+        ::Rails.application.middleware.insert(0, Foam::Ruby::Middleware)
       rescue Exception # rubocop:disable Lint/RescueException
         nil
       end
@@ -100,20 +116,30 @@ module Foam
         nil
       end
 
-      def do_attach_otel_logger!
-        return unless ::Rails.respond_to?(:logger) && ::Rails.logger
+      def attach_otel_logger!
+        return unless defined?(::Rails) && ::Rails.respond_to?(:logger) && ::Rails.logger
 
         unless OpenTelemetry.logger_provider.is_a?(OpenTelemetry::SDK::Logs::LoggerProvider)
           return
         end
 
+        logger = ::Rails.logger
+
+        if logger.respond_to?(:broadcasts)
+          return if logger.broadcasts.any? { |l| l.is_a?(OtelLogger) }
+        else
+          return if logger.equal?(@attached_rails_logger)
+        end
+
         otel_logger = OtelLogger.new
 
-        if ::Rails.logger.respond_to?(:broadcast_to)
-          ::Rails.logger.broadcast_to(otel_logger)
+        if logger.respond_to?(:broadcast_to)
+          logger.broadcast_to(otel_logger)
         elsif defined?(::ActiveSupport::Logger) && ::ActiveSupport::Logger.respond_to?(:broadcast)
-          ::Rails.logger.extend(::ActiveSupport::Logger.broadcast(otel_logger))
+          logger.extend(::ActiveSupport::Logger.broadcast(otel_logger))
         end
+
+        @attached_rails_logger = logger
       rescue Exception # rubocop:disable Lint/RescueException
         nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foam-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha7
+  version: 0.1.0.alpha9
 platform: ruby
 authors:
 - Foam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-04-14 00:00:00.000000000 Z
+date: 2026-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -218,6 +218,7 @@ files:
 - lib/foam/ruby.rb
 - lib/foam/ruby/configuration.rb
 - lib/foam/ruby/log_subscriber.rb
+- lib/foam/ruby/middleware.rb
 - lib/foam/ruby/otel_setup.rb
 - lib/foam/ruby/version.rb
 homepage: https://github.com/nicktesh/packages