prefab-cloud-ruby 1.5.1 → 1.6.0.pre1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0.pre1
 platform: ruby
 authors:
 - Jeff Dwyer
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: semantic_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -252,17 +266,13 @@ files:
 - lib/prefab/internal_logger.rb
 - lib/prefab/local_config_parser.rb
 - lib/prefab/log_path_aggregator.rb
-- lib/prefab/log_subscribers/action_controller_subscriber.rb
 - lib/prefab/logger_client.rb
-- lib/prefab/logging/formatter_base.rb
 - lib/prefab/murmer3.rb
 - lib/prefab/options.rb
 - lib/prefab/periodic_sync.rb
 - lib/prefab/prefab.rb
 - lib/prefab/rate_limit_cache.rb
 - lib/prefab/resolved_config_presenter.rb
-- lib/prefab/sse_logger.rb
-- lib/prefab/static_logger.rb
 - lib/prefab/time_helpers.rb
 - lib/prefab/weighted_value_resolver.rb
 - lib/prefab/yaml_config_parser.rb
@@ -276,7 +286,6 @@ files:
 - test/support/mock_base_client.rb
 - test/support/mock_config_client.rb
 - test/support/mock_config_loader.rb
-- test/test_action_controller.rb
 - test/test_client.rb
 - test/test_config_client.rb
 - test/test_config_loader.rb
@@ -294,6 +303,7 @@ files:
 - test/test_feature_flag_client.rb
 - test/test_helper.rb
 - test/test_integration.rb
+- test/test_internal_logger.rb
 - test/test_local_config_parser.rb
 - test/test_log_path_aggregator.rb
 - test/test_logger.rb
@@ -317,9 +327,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.32
 signing_key:

data/lib/prefab/log_subscribers/action_controller_subscriber.rb

@@ -1,55 +0,0 @@
-# Modified from https://github.com/reidmorrison/rails_semantic_logger/blob/master/lib/rails_semantic_logger/action_controller/log_subscriber.rb
-#
-# Copyright 2012, 2013, 2014, 2015 Reid Morrison
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-module Prefab
-  module LogSubscribers
-    class ActionControllerSubscriber < ActiveSupport::LogSubscriber
-
-      INTERNAL_PARAMS = %w[controller action format _method only_path].freeze
-
-      LOG = Prefab::StaticLogger.new("rails.controller.request")
-
-      # With great debt to https://github.com/reidmorrison/rails_semantic_logger/blob/master/lib/rails_semantic_logger/action_controller/log_subscriber.rb
-      def process_action(event)
-        payload = event.payload.dup
-        payload.delete(:headers)
-        payload.delete(:request)
-        payload.delete(:response)
-        payload[:req_path] = payload.delete(:path)
-        params = payload[:params]
-
-        if params.kind_of?(Hash) || params.kind_of?(::ActionController::Parameters)
-          payload[:params] = params.to_unsafe_h unless params.is_a?(Hash)
-          payload[:params] = params.except(*INTERNAL_PARAMS)
-
-          if payload[:params].empty?
-            payload.delete(:params)
-          elsif params["file"]
-            # When logging to JSON the entire tempfile is logged, so convert it to a string.
-            payload[:params]["file"] = params["file"].inspect
-          end
-        end
-
-        # Rounds off the runtimes. For example, :view_runtime, :mongo_runtime, etc.
-        payload.keys.each do |key|
-          payload[key] = payload[key].to_f.round(2) if key.to_s =~ /(.*)_runtime/
-        end
-
-        LOG.info "#{payload[:status]} #{payload[:controller]}##{payload[:action]}", **payload
-      end
-    end
-  end
-end

data/lib/prefab/logging/formatter_base.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Prefab
-  module Logging
-    # Shim class to quack like a Rails TaggedLogger
-    class FormatterBase < ::Logger
-      def initialize(formatter_proc:, logger_client:)
-        @formatter_proc = formatter_proc
-        @logger_client = logger_client
-      end
-
-      def call_proc(data)
-        @formatter_proc.call(data)
-      end
-
-      def current_tags
-        @logger_client.current_tags
-      end
-    end
-  end
-end

data/lib/prefab/sse_logger.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Prefab
-  class SseLogger < InternalLogger
-    def initialize()
-      super("sse")
-    end
-
-    # The SSE::Client warns on a perfectly normal stream disconnect, recast to info
-    def warn(msg = nil,**log_context,  &block)
-      Prefab::LoggerClient.instance.log_internal ::Logger::INFO, msg, @path, log_context, &block
-    end
-  end
-end

data/lib/prefab/static_logger.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Prefab
-  class StaticLogger < ::Logger
-    def initialize(path)
-      @path = path
-    end
-
-    def debug(msg = nil, **log_context, &block)
-      Prefab::LoggerClient.instance.log_internal ::Logger::DEBUG, msg, @path, log_context, &block
-    end
-
-    def info(msg = nil, **log_context, &block)
-      Prefab::LoggerClient.instance.log_internal ::Logger::INFO, msg, @path, log_context, &block
-    end
-
-    def warn(msg = nil, **log_context, &block)
-      Prefab::LoggerClient.instance.log_internal ::Logger::WARN, msg, @path, log_context, &block
-    end
-
-    def error(msg = nil, **log_context, &block)
-      Prefab::LoggerClient.instance.log_internal ::Logger::ERROR, msg, @path, log_context, &block
-    end
-
-    def fatal(msg = nil, **log_context, &block)
-      Prefab::LoggerClient.instance.log_internal ::Logger::FATAL, msg, @path, log_context, &block
-    end
-  end
-end

data/test/test_action_controller.rb

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class TestActionController < Minitest::Test
-  def setup
-    super
-  end
-
-  def test_load
-    new_client(config: log_level_config("log-level.rails.controller", "INFO"))
-    @subscriber = Prefab::LogSubscribers::ActionControllerSubscriber.new
-    @subscriber.process_action(event)
-    assert_logged ['INFO  2023-08-09 15:18:12 -0400: rails.controller.request 200 MyController#index action=index controller=MyController db_runtime=0.05 format=application/html method=GET params={"p1"=>"v1"} req_path=/my?p1=v1 status=200 view_runtime=0.02']
-  end
-
-  def test_json
-    new_client(config: log_level_config("log-level.rails.controller", "INFO"), log_formatter: Prefab::Options::JSON_LOG_FORMATTER)
-    @subscriber = Prefab::LogSubscribers::ActionControllerSubscriber.new
-    event = ActiveSupport::Notifications::Event.new(
-      'process_action.action_controller',
-      Time.now,
-      Time.now,
-      99,
-      path: '/original_path',
-      )
-    @subscriber.process_action(event)
-    assert_logged ["{\"severity\":\"INFO\",\"datetime\":\"2023-08-09 15:18:12 -0400\",\"path\":\"rails.controller.request\",\"message\":\" #\",\"req_path\":\"/original_path\"}"]
-
-  end
-
-  def test_funny_params
-    new_client(config: log_level_config("log-level.rails.controller", "INFO"))
-    @subscriber = Prefab::LogSubscribers::ActionControllerSubscriber.new
-    event = ActiveSupport::Notifications::Event.new(
-      'process_action.action_controller',
-      Time.now,
-      Time.now,
-      99,
-      params: "foo"
-      )
-    @subscriber.process_action(event)
-    assert_logged ['INFO  2023-08-09 15:18:12 -0400: rails.controller.request  # params=foo']
-  end
-
-
-  def event
-    ActiveSupport::Notifications::Event.new(
-      'process_action.action_controller',
-      Time.now,
-      Time.now,
-      99,
-      status: 200,
-      controller: 'MyController',
-      action: 'index',
-      format: 'application/html',
-      method: 'GET',
-      path: '/my?p1=v1',
-      params: { 'p1' => 'v1' },
-      db_runtime: 0.051123,
-      view_runtime: 0.024555
-    )
-  end
-
-  def log_level_config(path, level)
-    PrefabProto::Config.new(
-      id: 123,
-      key: path,
-      config_type: PrefabProto::ConfigType::LOG_LEVEL,
-      rows: [
-        PrefabProto::ConfigRow.new(
-          values: [
-            PrefabProto::ConditionalValue.new(
-              value: PrefabProto::ConfigValue.new(log_level: level)
-            )
-          ]
-        )
-      ]
-    )
-  end
-end