foam-ruby 0.1.0.alpha13 → 0.1.0.alpha14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d499bfb9b269432b8a581f296cc917118d8da08c18ec8bcd0804d099b93a4e46
-  data.tar.gz: 30ed5cf79368e4b044562f9eb8e5385e72af60bf6f91a53826f47aebe01816d4
+  metadata.gz: d3d94dd6da1d8be5d17fffeae51f7f05e8d324f2c8969490c761d683cb64fd38
+  data.tar.gz: 790fadb6fbe21745a5b8042acb589e463a1f8efe6f390125c6d8fb086203a7b4
 SHA512:
-  metadata.gz: 01ad0c424faf4ab05e52ecff9ddb5f5695ed0ed18006f6b53a58af7950f2aedc5f66f92c9af2bfa632a7ea7512a5d4864a8210dc627cabe02277921f6d20d2ee
-  data.tar.gz: 53732245e699e9198dbaf25c43426e0a9811dc3901b45a93dcdadbeb15b12195c95cb2f35d4d81676481f55844c2858ccb0eef8ae9331037801f65bf418f879e
+  metadata.gz: 1bba8f1b602ca0ca765f41df63f62e8cdbd3b74a078e3f3b2679bd9fe74769f925d23d3b6245605a9e5f91186e8d699d0c143f6203a6a23839eb8efd9e546e62
+  data.tar.gz: e390774bc1780c7f7e6b1586bf02c0a72fad3ff945a4c9b99c93c9337dd795de20d7562c568dadfd4e1cf5b03d5031a69070470c77e18b55ff2942697289f487

data/lib/foam/ruby/configuration.rb

@@ -8,7 +8,7 @@ module Foam
       attr_accessor :token, :service_name, :endpoint
 
       def initialize
-        @token = ENV["FOAM_API_TOKEN"]
+        @token = ENV["OTEL_FOAM_COLLECTOR_BEARER_TOKEN"]
         @service_name = ENV["OTEL_SERVICE_NAME"]
         @endpoint = ENV.fetch("FOAM_OTEL_ENDPOINT", FOAM_OTEL_ENDPOINT)
       end

data/lib/foam/ruby/otel_setup.rb

@@ -13,53 +13,33 @@ module Foam
         opentelemetry-instrumentation-rack
         opentelemetry-instrumentation-rails
         opentelemetry-instrumentation-action_pack
+        opentelemetry-instrumentation-action_view
+        opentelemetry-instrumentation-action_mailer
         opentelemetry-instrumentation-active_record
         opentelemetry-instrumentation-active_support
+        opentelemetry-instrumentation-active_job
+        opentelemetry-instrumentation-active_storage
+        opentelemetry-instrumentation-concurrent_ruby
       ].freeze
 
       module_function
 
-      # -- public API (called from Foam::Ruby + Middleware) --
-
       def configure!(config)
-        require_instrumentations!
         configure_traces(config)
         configure_logs(config)
+        register_at_exit_flush!
       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 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)
-
-        current.add_log_record_processor(@foam_log_processor)
-        @attached_logger_provider = current
-      end
-
-      # -- internal --
-
       def require_instrumentations!
-        INSTRUMENTATIONS.each do |name|
-          require name
+        INSTRUMENTATIONS.each do |gem_name|
+          require gem_name
         rescue LoadError
           nil
         end
       end
 
       def configure_traces(config)
+        require_instrumentations!
         @foam_span_processor = OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
           OpenTelemetry::Exporter::OTLP::Exporter.new(
             endpoint: config.traces_endpoint,
@@ -67,9 +47,9 @@ module Foam
           )
         )
 
-        provider = OpenTelemetry.tracer_provider
-        if provider.is_a?(OpenTelemetry::SDK::Trace::TracerProvider)
-          provider.add_span_processor(@foam_span_processor)
+        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|
@@ -82,6 +62,37 @@ 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 register_at_exit_flush!
+        at_exit do
+          @foam_span_processor&.force_flush(timeout: 5)
+          @foam_log_processor&.force_flush(timeout: 5)
+          @foam_span_processor&.shutdown(timeout: 5)
+          @foam_log_processor&.shutdown(timeout: 5)
+        rescue Exception # rubocop:disable Lint/RescueException
+          nil
+        end
+      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)
         @foam_log_processor = OpenTelemetry::SDK::Logs::Export::BatchLogRecordProcessor.new(
           OpenTelemetry::Exporter::OTLP::Logs::LogsExporter.new(
@@ -90,9 +101,9 @@ module Foam
           )
         )
 
-        provider = OpenTelemetry.logger_provider
-        if provider.is_a?(OpenTelemetry::SDK::Logs::LoggerProvider)
-          provider.add_log_record_processor(@foam_log_processor)
+        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,
@@ -106,10 +117,15 @@ module Foam
         @attached_logger_provider = OpenTelemetry.logger_provider
       end
 
-      def install_instrumentations!
-        OpenTelemetry::Instrumentation.registry&.each do |instrumentation|
-          instrumentation.install unless instrumentation.installed?
-        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)
+
+        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.alpha13"
+    VERSION = "0.1.0.alpha14"
   end
 end

data/lib/foam/ruby.rb

@@ -19,7 +19,7 @@ module Foam
         config.service_name = service_name if service_name
 
         unless config.valid?
-          warn "[foam-ruby] Missing required config — set FOAM_API_TOKEN and OTEL_SERVICE_NAME, " \
+          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
@@ -29,15 +29,18 @@ module Foam
         require_relative "ruby/middleware"
 
         OtelSetup.configure!(config)
-        setup_rails! if rails_app?
+        insert_middleware!
+        schedule_logger_attach!
+        bridge_sentry!
         @initialized = true
       rescue Exception => e # rubocop:disable Lint/RescueException
         warn "[foam-ruby] init failed: #{e.message}"
         @initialized = false
       end
 
-      # Re-attaches Foam's processors and logger broadcast in the current
-      # process. Called by Middleware on first request per worker PID.
+      # 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?
@@ -90,37 +93,45 @@ module Foam
         false
       end
 
-      def rails_app?
-        defined?(::Rails) && ::Rails.respond_to?(:application) && ::Rails.application
+      def schedule_logger_attach!
+        return unless defined?(::Rails) && ::Rails.respond_to?(:application) && ::Rails.application
+
+        ::Rails.application.config.after_initialize { attach_otel_logger! }
+      rescue Exception # rubocop:disable Lint/RescueException
+        nil
       end
 
-      def setup_rails!
-        ::Rails.application.middleware.insert(0, Foam::Ruby::Middleware)
+      def insert_middleware!
+        return unless defined?(::Rails) && ::Rails.respond_to?(:application) && ::Rails.application
 
-        ::Rails.application.config.after_initialize do
-          attach_otel_logger!
-          bridge_sentry!
-        end
+        ::Rails.application.middleware.insert(0, Foam::Ruby::Middleware)
       rescue Exception # rubocop:disable Lint/RescueException
         nil
       end
 
       def bridge_sentry!
-        return unless defined?(::Sentry)
-
-        ::Sentry.singleton_class.prepend(Module.new do
-          def capture_exception(exception, **options, &block)
-            Foam::Ruby.capture_exception(exception) if exception.is_a?(::Exception)
-            super
-          end
-        end)
+        return unless defined?(::Rails) && ::Rails.respond_to?(:application) && ::Rails.application
+
+        ::Rails.application.config.after_initialize do
+          next unless defined?(::Sentry)
+
+          ::Sentry.singleton_class.prepend(Module.new do
+            def capture_exception(exception, **options, &block)
+              Foam::Ruby.capture_exception(exception) if exception.is_a?(::Exception)
+              super
+            end
+          end)
+        end
       rescue Exception # rubocop:disable Lint/RescueException
         nil
       end
 
       def attach_otel_logger!
         return unless defined?(::Rails) && ::Rails.respond_to?(:logger) && ::Rails.logger
-        return unless OpenTelemetry.logger_provider.is_a?(OpenTelemetry::SDK::Logs::LoggerProvider)
+
+        unless OpenTelemetry.logger_provider.is_a?(OpenTelemetry::SDK::Logs::LoggerProvider)
+          return
+        end
 
         logger = ::Rails.logger
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foam-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha13
+  version: 0.1.0.alpha14
 platform: ruby
 authors:
 - Foam
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.24'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-rails
   requirement: !ruby/object:Gem::Requirement
@@ -109,21 +123,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.31'
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-instrumentation-rack
+  name: opentelemetry-instrumentation-action_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-instrumentation-active_record
+  name: opentelemetry-instrumentation-action_view
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -137,19 +151,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-instrumentation-action_pack
+  name: opentelemetry-instrumentation-action_mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-active_support
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +192,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-active_job
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-active_storage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-concurrent_ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement