brut 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b455ac9d87f61b5baa45cc6f4cc11c3b940b015aaf7792ba5ed8229dfd23d2fc
-  data.tar.gz: 5e6216b69db294da81ed31041a4b65a4a2b04de229e3d8695e5c9e1ad1625a84
+  metadata.gz: 2e624fb125bcb14a88b3b7adb148561c404befc86974a77423b6cd66293bba31
+  data.tar.gz: e2a20fc23b6aa7d0708ea7adf9852333b10616aa4e633d972031c726b9d43316
 SHA512:
-  metadata.gz: 688aba783c6b979976ddf40417a6220a10295effef357aa9ebc0b1cd772fac759cae4ddaa2ce09c5bb4b1559d65ee04261d57a3c4253559b7f22a4c9dfffa42b
-  data.tar.gz: 67dbc5b31bf1c6e02f4f5b505d3f69e1eb084f862ccb78372377a3b49052e71711af4868eec6c5fd3bc68a4994bc10bbecb5ce42a260677c6a42c765f8a21e0a
+  metadata.gz: 59b7398fbf77fafd04c770e617b8fcb341887db4b14691828ab94775c4d36b44d8475889293a39a8cfc92c7b27ef935c487c60d8f7a7f25f96edbfa57db8b75b
+  data.tar.gz: aa3ce63a03296837fb5c425ce430a8a0658d732edf32fbed4ac7d01d74fb39dfde6e0b91e0aeadfb7f26d970ac3f23fcf6aab3216354152884fe9f86f4772412

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brut (0.0.9)
+    brut (0.0.10)
       concurrent-ruby
       i18n
       irb

data/lib/brut/cli/apps/db.rb

@@ -13,12 +13,10 @@ class Brut::CLI::Apps::DB < Brut::CLI::App
     def handle_bootstrap_exception(ex)
       case ex
       when Sequel::DatabaseConnectionError
-        err.puts "Database needs to be created"
-        stop_execution
+        abort_execution("Database needs to be created")
       when Sequel::DatabaseError
         if ex.cause.kind_of?(PG::UndefinedTable)
-          err.puts "Migrations need to be run"
-          stop_execution
+          abort_execution("Migrations need to be run")
         else
           super
         end
@@ -87,6 +85,7 @@ class Brut::CLI::Apps::DB < Brut::CLI::App
         stop_execution
       when Sequel::DatabaseError
         if ex.cause.kind_of?(PG::UndefinedTable)
+          out.puts ex.message
           out.puts "Migrations need to be run"
           continue_execution
         else
@@ -151,8 +150,7 @@ class Brut::CLI::Apps::DB < Brut::CLI::App
     def handle_bootstrap_exception(ex)
       case ex
       when Sequel::DatabaseConnectionError
-        err.puts "Database does not exist. Create it first"
-        stop_execution
+        abort_execution("Database does not exist. Create it first")
       when Sequel::DatabaseError
         if ex.cause.kind_of?(PG::UndefinedTable)
           # ignoring - we are running migrations which will address this

data/lib/brut/cli.rb

@@ -26,12 +26,7 @@ module Brut
     # @param project_root [Pathname] the path to the root of your project. This is needed before the Brut framework is initialized so
     # it must be specified explicitly.
     def self.app(app_klass, project_root:)
-      Brut::CLI::AppRunner.new(app_klass:,project_root:).run!.tap {
-        otel_configured = OpenTelemetry.tracer_provider.is_a?(OpenTelemetry::SDK::Trace::TracerProvider)
-        if otel_configured
-          OpenTelemetry.tracer_provider.shutdown
-        end
-      }
+      Brut::CLI::AppRunner.new(app_klass:,project_root:).run!
     end
     autoload(:App, "brut/cli/app")
     autoload(:Command, "brut/cli/command")

data/lib/brut/framework/mcp.rb

@@ -17,6 +17,9 @@ require "opentelemetry/exporter/otlp"
 # intended to use or interact with this class at all. End of line.
 class Brut::Framework::MCP
 
+  @otel_shutdown = Concurrent::AtomicBoolean.new(false)
+  def self.otel_shutdown = @otel_shutdown
+
   # Create and configure the MCP.  The app will not work until {#boot!} has been called, however most of the core configuration
   # will be available via `Brut.container`.
   #
@@ -66,58 +69,34 @@ class Brut::Framework::MCP
       begin
         Brut.container.sequel_db_handle.disconnect
       rescue Sequel::DatabaseConnectionError
-        SemanticLogger["Sequel::Database"].info "Not connected to database, so not disconnecting"
+        SemanticLogger[self.class].info "Not connected to database, so not disconnecting"
+      end
+      otel_configured = OpenTelemetry.tracer_provider.is_a?(OpenTelemetry::SDK::Trace::TracerProvider)
+      if otel_configured
+        if $PROGRAM_NAME =~ /^sidekiq/
+          SemanticLogger[self.class].info "Assuming we are sidekiq, which will shutdown OpenTelemetry, so doing nothing", program: $PROGRAM_NAME
+        else
+          if self.class.otel_shutdown.make_true
+            SemanticLogger[self.class].info "Shutting down OpenTelemetry", program: $PROGRAM_NAME
+            OpenTelemetry.tracer_provider.shutdown
+          else
+            SemanticLogger[self.class].info "OpenTelemetry already shutdown", program: $PROGRAM_NAME
+          end
+        end
+      else
+        SemanticLogger[self.class].info "OpenTelemetry was not configured, so no shutdown needed", program: $PROGRAM_NAME
       end
     end
-    Sequel::Database.extension :pg_array
-    Sequel::Database.extension :pg_json
-
-    sequel_db = Brut.container.sequel_db_handle
 
-    Sequel::Model.db = sequel_db
-
-    Sequel::Model.plugin :find_bang
-    Sequel::Model.plugin :created_at
-    Sequel::Model.plugin :table_select
-    Sequel::Model.plugin :skip_saving_columns
+    boot_postgres!
+    boot_otel!
 
-    if !Brut.container.external_id_prefix.nil?
-      Sequel::Model.plugin :external_id, global_prefix: Brut.container.external_id_prefix
-    end
     if Brut.container.eager_load_classes?
       SemanticLogger["Brut"].info("Eagerly loading app's classes")
       @loader.eager_load
     else
       SemanticLogger["Brut"].info("Lazily loading app's classes")
     end
-    OpenTelemetry::SDK.configure do |c|
-      c.service_name = @app.id
-      if ENV["OTEL_TRACES_EXPORTER"]
-        SemanticLogger[self.class].info "OTEL_TRACES_EXPORTER was set (to '#{ENV['OTEL_TRACES_EXPORTER']}'), so Brut's OTel logging is disabled"
-      else
-        c.add_span_processor(
-          OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(
-            Brut::Instrumentation::LoggerSpanExporter.new
-          )
-        )
-      end
-
-      if defined?(OpenTelemetry::Instrumentation::Sidekiq)
-        c.use 'OpenTelemetry::Instrumentation::Sidekiq', {
-          span_naming: :job_class,
-        }
-      else
-        SemanticLogger[self.class].info "OpenTelemetry::Instrumentation::Sidekiq is not loaded, so Sidekiq traces will not be captured"
-      end
-    end
-
-    Brut.container.store(
-      "tracer",
-      OpenTelemetry::SDK::Trace::Tracer,
-      "Tracer for Open Telemetry",
-      OpenTelemetry.tracer_provider.tracer(@app.id)
-    )
-    Sequel::Database.extension :brut_instrumentation
 
     @app.boot!
 
@@ -304,4 +283,53 @@ private
 
     @loader.setup
   end
+
+  def boot_postgres!
+    Sequel::Database.extension :pg_array
+    Sequel::Database.extension :pg_json
+
+    sequel_db = Brut.container.sequel_db_handle
+
+    Sequel::Model.db = sequel_db
+
+    Sequel::Model.plugin :find_bang
+    Sequel::Model.plugin :created_at
+    Sequel::Model.plugin :table_select
+    Sequel::Model.plugin :skip_saving_columns
+
+    if !Brut.container.external_id_prefix.nil?
+      Sequel::Model.plugin :external_id, global_prefix: Brut.container.external_id_prefix
+    end
+    Sequel::Database.extension :brut_instrumentation
+  end
+
+  def boot_otel!
+    OpenTelemetry::SDK.configure do |c|
+      c.service_name = @app.id
+      if ENV["OTEL_TRACES_EXPORTER"]
+        SemanticLogger[self.class].info "OTEL_TRACES_EXPORTER was set (to '#{ENV['OTEL_TRACES_EXPORTER']}'), so Brut's OTel logging is disabled"
+      else
+        c.add_span_processor(
+          OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(
+            Brut::Instrumentation::LoggerSpanExporter.new
+          )
+        )
+      end
+
+      if defined?(OpenTelemetry::Instrumentation::Sidekiq)
+        c.use 'OpenTelemetry::Instrumentation::Sidekiq', {
+          span_naming: :job_class,
+        }
+      else
+        SemanticLogger[self.class].info "OpenTelemetry::Instrumentation::Sidekiq is not loaded, so Sidekiq traces will not be captured"
+      end
+    end
+
+    Brut.container.store(
+      "tracer",
+      OpenTelemetry::SDK::Trace::Tracer,
+      "Tracer for Open Telemetry",
+      OpenTelemetry.tracer_provider.tracer(@app.id)
+    )
+  end
 end

data/lib/brut/version.rb

@@ -1,4 +1,4 @@
 module Brut
   # @!visibility private
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brut
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - David Bryant Copeland