foam-ruby 0.1.0.alpha11 → 0.1.0.alpha13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d11bbb00722285e3f5067846a74672e3db19c6f01a747dbb42cd5f6d39301249
-  data.tar.gz: 215a14be456423046f861db934ef9a4ff81858a43092a20c8723d96d2ab33208
+  metadata.gz: d499bfb9b269432b8a581f296cc917118d8da08c18ec8bcd0804d099b93a4e46
+  data.tar.gz: 30ed5cf79368e4b044562f9eb8e5385e72af60bf6f91a53826f47aebe01816d4
 SHA512:
-  metadata.gz: 8dccca7b49de454e8ef27e53b0fa3666b1edc3e0de7724758b8adcbd7394ff197ddca5afedb3108e758d1699b11e9f92d256db158361eec2371fc03e4bc0a87a
-  data.tar.gz: a0ba57ba2fe9e56fdcfc46a32af1076bfe33c36840effaa5e6b51c13ccef63a077eefea4ec407ae99a15803bd75503b6d3bd10b97cc4beffb031d9ee8d27f41b
+  metadata.gz: 01ad0c424faf4ab05e52ecff9ddb5f5695ed0ed18006f6b53a58af7950f2aedc5f66f92c9af2bfa632a7ea7512a5d4864a8210dc627cabe02277921f6d20d2ee
+  data.tar.gz: 53732245e699e9198dbaf25c43426e0a9811dc3901b45a93dcdadbeb15b12195c95cb2f35d4d81676481f55844c2858ccb0eef8ae9331037801f65bf418f879e

data/lib/foam/ruby/otel_setup.rb

@@ -9,13 +9,56 @@ require "opentelemetry-logs-sdk"
 module Foam
   module Ruby
     module OtelSetup
+      INSTRUMENTATIONS = %w[
+        opentelemetry-instrumentation-rack
+        opentelemetry-instrumentation-rails
+        opentelemetry-instrumentation-action_pack
+        opentelemetry-instrumentation-active_record
+        opentelemetry-instrumentation-active_support
+      ].freeze
+
       module_function
 
+      # -- public API (called from Foam::Ruby + Middleware) --
+
       def configure!(config)
+        require_instrumentations!
         configure_traces(config)
         configure_logs(config)
       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
+        rescue LoadError
+          nil
+        end
+      end
+
       def configure_traces(config)
         @foam_span_processor = OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
           OpenTelemetry::Exporter::OTLP::Exporter.new(
@@ -24,9 +67,9 @@ module Foam
           )
         )
 
-        existing = OpenTelemetry.tracer_provider
-        if existing.is_a?(OpenTelemetry::SDK::Trace::TracerProvider)
-          existing.add_span_processor(@foam_span_processor)
+        provider = OpenTelemetry.tracer_provider
+        if provider.is_a?(OpenTelemetry::SDK::Trace::TracerProvider)
+          provider.add_span_processor(@foam_span_processor)
           install_instrumentations!
         else
           OpenTelemetry::SDK.configure do |c|
@@ -39,26 +82,6 @@ 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
-
-        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(
@@ -67,9 +90,9 @@ module Foam
           )
         )
 
-        existing = OpenTelemetry.logger_provider
-        if existing.is_a?(OpenTelemetry::SDK::Logs::LoggerProvider)
-          existing.add_log_record_processor(@foam_log_processor)
+        provider = OpenTelemetry.logger_provider
+        if provider.is_a?(OpenTelemetry::SDK::Logs::LoggerProvider)
+          provider.add_log_record_processor(@foam_log_processor)
         else
           resource = OpenTelemetry::SDK::Resources::Resource.create(
             "service.name" => config.service_name,
@@ -83,15 +106,10 @@ module Foam
         @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)
-
-        current.add_log_record_processor(@foam_log_processor)
-        @attached_logger_provider = current
+      def install_instrumentations!
+        OpenTelemetry::Instrumentation.registry&.each do |instrumentation|
+          instrumentation.install unless instrumentation.installed?
+        end
       end
     end
   end

data/lib/foam/ruby/version.rb

@@ -2,6 +2,6 @@
 
 module Foam
   module Ruby
-    VERSION = "0.1.0.alpha11"
+    VERSION = "0.1.0.alpha13"
   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 OTEL_FOAM_COLLECTOR_BEARER_TOKEN and OTEL_SERVICE_NAME, " \
+          warn "[foam-ruby] Missing required config — set FOAM_API_TOKEN and OTEL_SERVICE_NAME, " \
                "or pass token: and service_name: to Foam::Ruby.init"
           return
         end
@@ -29,18 +29,15 @@ module Foam
         require_relative "ruby/middleware"
 
         OtelSetup.configure!(config)
-        insert_middleware!
-        schedule_logger_attach!
-        bridge_sentry!
+        setup_rails! if rails_app?
         @initialized = true
       rescue Exception => e # rubocop:disable Lint/RescueException
         warn "[foam-ruby] init failed: #{e.message}"
         @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.
+      # Re-attaches Foam's processors and logger broadcast in the current
+      # process. Called by Middleware on first request per worker PID.
       # Public so non-Rails apps can call it from custom fork hooks.
       def ensure_worker_setup!
         return unless initialized?
@@ -93,45 +90,37 @@ module Foam
         false
       end
 
-      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
+      def rails_app?
+        defined?(::Rails) && ::Rails.respond_to?(:application) && ::Rails.application
       end
 
-      def insert_middleware!
-        return unless defined?(::Rails) && ::Rails.respond_to?(:application) && ::Rails.application
-
+      def setup_rails!
         ::Rails.application.middleware.insert(0, Foam::Ruby::Middleware)
+
+        ::Rails.application.config.after_initialize do
+          attach_otel_logger!
+          bridge_sentry!
+        end
       rescue Exception # rubocop:disable Lint/RescueException
         nil
       end
 
       def bridge_sentry!
-        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
+        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)
       rescue Exception # rubocop:disable Lint/RescueException
         nil
       end
 
       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
+        return unless OpenTelemetry.logger_provider.is_a?(OpenTelemetry::SDK::Logs::LoggerProvider)
 
         logger = ::Rails.logger
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foam-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha11
+  version: 0.1.0.alpha13
 platform: ruby
 authors:
 - Foam