foam-ruby 0.1.0.alpha8 → 0.1.0.alpha10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4435b32248c007790701a7de2054f702398a2f1881bcaa571f20f209825d5e8
-  data.tar.gz: 82a9836aa895f5b1b70ace7b441dd288997ff7e2772a5c1e5f7742a2fa22dcc6
+  metadata.gz: 71780521715f934380dd5f95a3a37dcb08f20080da5cd1c118323b436e96c2bb
+  data.tar.gz: fac0121d3b535c4e36d75cedb35fe5e74fc0bbb286f8ed168485f8e2b20abd7b
 SHA512:
-  metadata.gz: 8e3792c185a39b7470ddf0b0037580fcf45ed9f906d4834ea28bd837422df5fbb365109f9525fae66e7cb68121844ad119f38228d83bcfb0946965fbf6b005d2
-  data.tar.gz: 4fab2024d4ef4e8fe3601e3836e8af28544feaefd41d80e929721f651ac7ba84c034810dc923d90bf9a540ac335dd6c25db7d4567ea30b3c039f61abd9115a84
+  metadata.gz: 2b2e862134bc9f576ee91f1e7343af59ca31889392c959929f0bc8fcc931ea748b3b9f0796629eecf1bbd243f8927caacb456b0304b4bc1429bcd5e6493d0d3c
+  data.tar.gz: 40d3e22371d54dad030036a5a552718b391c3112e7c114e49c5741e3c63906de62d459fb7bff0471be84f81fe6a795c35b7352613649f2e4362d54287ca285f5

data/lib/foam/ruby/configuration.rb

@@ -9,7 +9,7 @@ module Foam
 
       def initialize
         @token = ENV["FOAM_API_TOKEN"]
-        @service_name = ENV.fetch("OTEL_SERVICE_NAME", "rails-app")
+        @service_name = ENV["OTEL_SERVICE_NAME"]
         @endpoint = ENV.fetch("FOAM_OTEL_ENDPOINT", FOAM_OTEL_ENDPOINT)
       end
 
@@ -26,7 +26,13 @@ module Foam
       end
 
       def valid?
-        !token.nil? && !token.empty?
+        present?(token) && present?(service_name)
+      end
+
+      private
+
+      def present?(val)
+        !val.nil? && !val.empty?
       end
     end
   end

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

@@ -27,6 +27,7 @@ module Foam
         existing = OpenTelemetry.tracer_provider
         if existing.is_a?(OpenTelemetry::SDK::Trace::TracerProvider)
           existing.add_span_processor(@foam_span_processor)
+          install_instrumentations!
         else
           OpenTelemetry::SDK.configure do |c|
             c.service_name = config.service_name
@@ -38,6 +39,15 @@ module Foam
         @attached_provider = OpenTelemetry.tracer_provider
       end
 
+      def install_instrumentations!
+        registry = OpenTelemetry::Instrumentation.registry
+        return unless registry
+
+        registry.each do |instrumentation|
+          instrumentation.install unless instrumentation.installed?
+        end
+      end
+
       def ensure_processor_attached!
         return unless @foam_span_processor
 

data/lib/foam/ruby/version.rb

@@ -2,6 +2,6 @@
 
 module Foam
   module Ruby
-    VERSION = "0.1.0.alpha8"
+    VERSION = "0.1.0.alpha10"
   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
@@ -18,16 +19,17 @@ module Foam
         config.service_name = service_name if service_name
 
         unless config.valid?
-          warn "[foam-ruby] Missing token — set FOAM_API_TOKEN or pass token: to Foam::Ruby.init"
+          warn "[foam-ruby] Missing required config — set OTEL_FOAM_COLLECTOR_BEARER_TOKEN and OTEL_SERVICE_NAME, " \
+               "or pass token: and service_name: to Foam::Ruby.init"
           return
         end
 
         require_relative "ruby/otel_setup"
         require_relative "ruby/log_subscriber"
+        require_relative "ruby/middleware"
 
         OtelSetup.configure!(config)
-        schedule_trace_reattach!
-        schedule_logger_attach!
+        insert_middleware!
         bridge_sentry!
         @initialized = true
       rescue Exception => e # rubocop:disable Lint/RescueException
@@ -35,6 +37,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?
 
@@ -72,14 +92,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
@@ -101,31 +117,30 @@ module Foam
         nil
       end
 
-      def schedule_trace_reattach!
-        return unless defined?(::Rails) && ::Rails.respond_to?(:application) && ::Rails.application
+      def attach_otel_logger!
+        return unless defined?(::Rails) && ::Rails.respond_to?(:logger) && ::Rails.logger
 
-        ::Rails.application.config.after_initialize do
-          OtelSetup.ensure_processor_attached!
-          OtelSetup.ensure_log_processor_attached!
+        unless OpenTelemetry.logger_provider.is_a?(OpenTelemetry::SDK::Logs::LoggerProvider)
+          return
         end
-      rescue Exception # rubocop:disable Lint/RescueException
-        nil
-      end
 
-      def do_attach_otel_logger!
-        return unless ::Rails.respond_to?(:logger) && ::Rails.logger
+        logger = ::Rails.logger
 
-        unless OpenTelemetry.logger_provider.is_a?(OpenTelemetry::SDK::Logs::LoggerProvider)
-          return
+        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.alpha8
+  version: 0.1.0.alpha10
 platform: ruby
 authors:
 - Foam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-04-15 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