moved some config settings out of integrations to the root config

Author: ndbroadbent

AGENTS.md

@@ -42,7 +42,7 @@
 
 - Generate Sorbet RBI files: `scripts/tapioca.rb`
 - Generate spellcheck dictionary: `scripts/generate_lockfile_words.sh`
-- Generate TypeScript types from Ruby log structs: `scripts/export_typescript_types.rb`
+- Generate TypeScript structs from YAML schemas: `scripts/generate_typescript_structs.rb`
 
 ## Terraform Provider repo in this workspace
 
@@ -72,7 +72,7 @@
   - The workflow builds the gem and provider, shows diffs, and skips pushes/tags/uploads.
 - Local dry-run for the GitHub Actions workflow isn’t practical without a runner like `act`. You can still sanity-check pieces locally:
   - `gem build logstruct.gemspec`
-  - `ruby scripts/export_typescript_types.rb`
+  - `ruby scripts/generate_typescript_structs.rb`
   - `ruby scripts/export_provider_catalog.rb`
   - `cd terraform-provider-logstruct && go build ./...`
 

INTEGRATIONS.md

@@ -102,7 +102,7 @@
    - The Integrations page lists all `AllLogTypes` with titles/descriptions from `site/lib/integration-helpers.ts`.
    - Add an entry to `getLogTypeInfo` for your new log type (title, concise description, optional `configuration_code: 'integrations_configuration'`).
    - Run the type export to regenerate the docs’ TypeScript assets so example logs render:
-     - `ruby scripts/export_typescript_types.rb`
+     - `ruby scripts/generate_typescript_structs.rb`
 
 8. Sorbet + CI
    - Run `scripts/typecheck.sh` (must be clean).
@@ -138,6 +138,6 @@
 
 - `bundle install`
 - `bundle exec tapioca gems`
-- `ruby scripts/export_typescript_types.rb`
+- `ruby scripts/generate_typescript_structs.rb`
 - `scripts/typecheck.sh`
 - `scripts/test.rb` and (optionally) `scripts/rails_tests.sh`

README.md

@@ -66,8 +66,8 @@ Once initialized (and enabled), the gem automatically includes its modules into
 
 ```ruby
 LogStruct.configure do |c|
-  c.integrations.prefer_json_in_development = false
-  c.integrations.enable_color_output = true
+  c.prefer_json_in_development = false
+  c.enable_color_output = true
 end
 ```
 

lefthook.yml

@@ -17,8 +17,8 @@ pre-commit:
             run: cd site && pnpm exec tsc --noEmit
 
           - name: typescript-export
-            glob: 'lib/**/*.rb'
-            run: scripts/export_typescript_types.rb
+            glob: '{schemas/log_sources/**/*,lib/log_struct/enums.rb,lib/log_struct/enums/*.rb,scripts/generate_typescript_structs.rb}'
+            run: scripts/generate_typescript_structs.rb
 
           - name: codegen-sync
             glob: '{schemas/log_sources/**/*,scripts/templates/generate_log_structs/**/*,scripts/generate_log_structs.rb}'

lib/log_struct/config_struct/integrations.rb

@@ -60,24 +60,6 @@ class Integrations < T::Struct
       # Default: true
       prop :enable_semantic_logger, T::Boolean, default: true
 
-      # Enable colored JSON output in development
-      # Default: true
-      prop :enable_color_output, T::Boolean, default: true
-
-      # Prefer production-style JSON output in development when LogStruct is enabled.
-      # This makes it easy to preview exactly what production logs will look like
-      # when you opt-in to LogStruct locally (via LOGSTRUCT_ENABLED=true or config).
-      # Default: true
-      prop :prefer_json_in_development, T::Boolean, default: true
-
-      # Color configuration for JSON output
-      # Default: nil (uses SemanticLogger defaults)
-      prop :color_map, T.nilable(T::Hash[Symbol, Symbol]), default: nil
-
-      # Filter noisy loggers (ActionView, etc.)
-      # Default: false
-      prop :filter_noisy_loggers, T::Boolean, default: false
-
       # Enable SQL query logging through ActiveRecord instrumentation
       # Default: false (can be resource intensive)
       prop :enable_sql_logging, T::Boolean, default: false

lib/log_struct/configuration.rb

@@ -20,6 +20,19 @@ class Configuration < T::Struct
     prop :enabled, T::Boolean, default: true
     prop :enabled_environments, T::Array[Symbol], factory: -> { [:test, :production] }
     prop :local_environments, T::Array[Symbol], factory: -> { [:development, :test] }
+
+    # Prefer production-style JSON in development when LogStruct is enabled
+    prop :prefer_json_in_development, T::Boolean, default: true
+
+    # Enable colorful human formatter in development
+    prop :enable_color_output, T::Boolean, default: true
+
+    # Custom color map for the color formatter
+    prop :color_map, T.nilable(T::Hash[Symbol, Symbol]), default: nil
+
+    # Filter noisy loggers (ActionView, etc.)
+    prop :filter_noisy_loggers, T::Boolean, default: false
+
     const :integrations, ConfigStruct::Integrations, factory: -> { ConfigStruct::Integrations.new }
     const :filters, ConfigStruct::Filters, factory: -> { ConfigStruct::Filters.new }
 

lib/log_struct/semantic_logger/setup.rb

@@ -120,19 +120,19 @@ def self.add_appenders(app)
         io = determine_output(app)
 
         if Rails.env.development?
-          if config.integrations.prefer_json_in_development
+          if config.prefer_json_in_development
             # Default to production-style JSON in development when enabled
             ::SemanticLogger.add_appender(
               io: io,
               formatter: LogStruct::SemanticLogger::Formatter.new,
               filter: determine_filter
             )
-          elsif config.integrations.enable_color_output
+          elsif config.enable_color_output
             # Opt-in colorful human formatter in development
             ::SemanticLogger.add_appender(
               io: io,
               formatter: LogStruct::SemanticLogger::ColorFormatter.new(
-                color_map: config.integrations.color_map
+                color_map: config.color_map
               ),
               filter: determine_filter
             )
@@ -180,7 +180,7 @@ def self.determine_output(app)
       def self.determine_filter
         # Filter out noisy loggers if configured
         config = LogStruct.config
-        return nil unless config.integrations.filter_noisy_loggers
+        return nil unless config.filter_noisy_loggers
 
         # Common noisy loggers to filter
         /\A(ActionView|ActionController::RoutingError|ActiveRecord::SchemaMigration)/

rails_test_app/templates/test/test_helper.rb

@@ -61,7 +61,7 @@ def perform_enqueued_jobs
   LogStruct.configure do |config|
     config.enabled = true
     # Prefer production-style JSON in development/test
-    config.integrations.prefer_json_in_development = true
+    config.prefer_json_in_development = true
   end
 rescue NameError
   # LogStruct not loaded; ignore

scripts/all_check.sh

@@ -5,8 +5,8 @@ set -e
 echo "===> Running Sorbet"
 scripts/typecheck.sh
 
-echo "===> Running LogStruct TypeScript Export"
-scripts/export_typescript_types.rb
+echo "===> Checking LogStruct TypeScript structs"
+scripts/generate_typescript_structs.rb >/dev/null
 
 echo "===> Running TypeScript"
 (cd site && npx tsc --noEmit)

scripts/all_write.sh

@@ -5,8 +5,8 @@ set -e
 echo "===> Running Sorbet"
 scripts/typecheck.sh
 
-echo "===> Running LogStruct TypeScript Export"
-scripts/export_typescript_types.rb
+echo "===> Generating LogStruct TypeScript structs"
+scripts/generate_typescript_structs.rb
 
 echo "===> Running TypeScript"
 (cd site && npx tsc --noEmit)