prefab-cloud-ruby 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55134a75669f459bbb12d50cfa6e221937a5c00f53ca365e609f0cb436b24aff
-  data.tar.gz: f3507032152e1dfe7b48156e5b8795d3bfd9262e077fab18923fef7cbeb78e34
+  metadata.gz: 51803ee8ef4be86a0dbe2a7cbf678ea24c91eb5f023c37cc66ed9477d0132ae7
+  data.tar.gz: 43106c26d3dcb9c3736ef5d6b1ff69e90525cc34098d74406e183eff8c536222
 SHA512:
-  metadata.gz: 839db6777d5e6c3a76d34b7812787e8241779b2ede48d4ffddbf5e96bb493494e8d30e980582a5d06518e8f64f789287417ac5e6abc66c7789e17082992c83fb
-  data.tar.gz: fd26b0d5ceb02a17724ede1a3329bda2a1ca7ee1c8d49e0776c61498bfe7e1b41ca81158e395192c4c73c35970824e5eb2d319b241a9489e0e215febe9ea2bb6
+  metadata.gz: 3051706d0c390715de78a1fb2e8c02eb030801bb8923498a4fb12e6b3ec47c3a18b67fabae5bc3d189ed6fd3f7cd5d4589f5159f1474af61ce2b38444e524ac3
+  data.tar.gz: 7398e9212e21f4a10d5093b7b5c572e1f7f938b3a805bb41c694c38246123a1d464f67cbe86e04ea0581c8c830e1100429378c6d7c24351618a5e4b97c063e3c

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 1.3.2 - 2023-11-15
+- Send back cloud.prefab logging telemetry (#160)
+
+## 1.3.1 - 2023-11-14
+- Improve path of rails.controller logging & fix strong param include (#159)
+
 ## 1.3.0 - 2023-11-13
 - Less logging when wifi is off and we load from cache (#157)
 - Alpha: Add Provided & Secret Support (#152)

data/Gemfile

@@ -8,6 +8,7 @@ gem 'ld-eventsource'
 gem 'uuid'
 
 gem 'activesupport',  '>= 4'
+gem 'actionpack',  '>= 4'
 
 group :development do
   gem 'benchmark-ips'

data/Gemfile.lock

@@ -1,6 +1,22 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    actionpack (7.1.2)
+      actionview (= 7.1.2)
+      activesupport (= 7.1.2)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actionview (7.1.2)
+      activesupport (= 7.1.2)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
     activesupport (7.1.2)
       base64
       bigdecimal
@@ -20,6 +36,7 @@ GEM
     builder (3.2.4)
     concurrent-ruby (1.1.10)
     connection_pool (2.4.1)
+    crass (1.0.6)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.3.5)
@@ -27,6 +44,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     drb (2.2.0)
       ruby2_keywords
+    erubi (1.12.0)
     faraday (1.3.0)
       faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
@@ -81,6 +99,9 @@ GEM
     llhttp-ffi (0.3.1)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
+    loofah (2.21.4)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
     macaddr (1.7.2)
       systemu (~> 2.6.5)
     mini_portile2 (2.8.2)
@@ -109,6 +130,17 @@ GEM
     public_suffix (4.0.6)
     racc (1.7.0)
     rack (3.0.6.1)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rake (13.0.6)
     rchardet (1.8.0)
     rdoc (6.3.3)
@@ -134,6 +166,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  actionpack (>= 4)
   activesupport (>= 4)
   benchmark-ips
   bundler

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.2

data/lib/prefab/log_subscribers/action_controller_subscriber.rb

@@ -28,6 +28,7 @@ module Prefab
         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)

data/lib/prefab/logger_client.rb

@@ -56,8 +56,6 @@ module Prefab
       path_loc = get_loc_path(loc)
       path = @prefix + path_loc
 
-      @log_path_aggregator&.push(path_loc, severity)
-
       log(message, path, progname, severity, log_context, &block)
     end
 
@@ -73,6 +71,8 @@ module Prefab
 
     def log(message, path, progname, severity, log_context={})
       severity ||= ::Logger::UNKNOWN
+      @log_path_aggregator&.push(path, severity)
+
       return true if @logdev.nil? || severity < level_of(path) || @silences[local_log_id]
 
       progname = @progname if progname.nil?

data/lib/prefab-cloud-ruby.rb

@@ -44,6 +44,7 @@ require 'prefab/context'
 require 'prefab/logger_client'
 require 'active_support/deprecation'
 require 'active_support'
+require 'action_controller/metal/strong_parameters'
 require 'prefab/log_subscribers/action_controller_subscriber'
 require 'prefab/client'
 require 'prefab/config_client_presenter'

data/prefab-cloud-ruby.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: prefab-cloud-ruby 1.3.0 ruby lib
+# stub: prefab-cloud-ruby 1.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "1.3.0"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2023-11-13"
+  s.date = "2023-11-15"
   s.description = "Feature Flags, Live Config, and Dynamic Log Levels as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["console".freeze]
@@ -130,6 +130,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<ld-eventsource>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<uuid>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<activesupport>.freeze, [">= 4"])
+    s.add_runtime_dependency(%q<actionpack>.freeze, [">= 4"])
     s.add_development_dependency(%q<benchmark-ips>.freeze, [">= 0"])
     s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
     s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
@@ -143,6 +144,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ld-eventsource>.freeze, [">= 0"])
     s.add_dependency(%q<uuid>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, [">= 4"])
+    s.add_dependency(%q<actionpack>.freeze, [">= 4"])
     s.add_dependency(%q<benchmark-ips>.freeze, [">= 0"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
     s.add_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])

data/test/test_action_controller.rb

@@ -5,13 +5,42 @@ 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_load
+  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 200 MyController#index action=index controller=MyController db_runtime=0.05 format=application/html method=GET params={"p1"=>"v1"} path=/my?p1=v1 status=200 view_runtime=0.02']
+    assert_logged ['INFO  2023-08-09 15:18:12 -0400: rails.controller.request  # params=foo']
   end
 
 
@@ -34,19 +63,19 @@ class TestActionController < Minitest::Test
   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)
-              )
-            ]
-          )
-        ]
-      )
+    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

data/test/test_log_path_aggregator.rb

@@ -34,22 +34,19 @@ class TestLogPathAggregator < Minitest::Test
         client.log_path_aggregator.send(:sync)
       end
 
-      assert_equal [[
-        '/api/v1/known-loggers',
-        PrefabProto::Loggers.new(
-          loggers: [PrefabProto::Logger.new(logger_name: 'test.test_log_path_aggregator.test_sync',
-                                            infos: 2, errors: 3)],
-          start_at: Prefab::TimeHelpers.now_in_ms,
-          end_at: Prefab::TimeHelpers.now_in_ms,
-          instance_hash: client.instance_hash,
-          namespace: 'this.is.a.namespace'
-        )
-      ]], requests
+      assert_equal '/api/v1/known-loggers', requests[0][0]
+      sent_logger = requests[0][1]
+      assert_equal 'this.is.a.namespace', sent_logger.namespace
+      assert_equal Prefab::TimeHelpers.now_in_ms, sent_logger.start_at
+      assert_equal Prefab::TimeHelpers.now_in_ms, sent_logger.end_at
+      assert_equal client.instance_hash, sent_logger.instance_hash
+      assert_includes sent_logger.loggers, PrefabProto::Logger.new(logger_name: 'test.test_log_path_aggregator.test_sync', infos: 2, errors: 3)
+      assert_includes sent_logger.loggers, PrefabProto::Logger.new(logger_name: 'cloud.prefab.client.client', debugs: 1) # spot test that internal logging is here too
 
       assert_logged [
-        'WARN  2023-08-09 15:18:12 -0400: cloud.prefab.client.configclient No success loading checkpoints',
-        'ERROR 2023-08-09 15:18:12 -0400: test.test_log_path_aggregator.test_sync here is a message'
-      ]
+                      'WARN  2023-08-09 15:18:12 -0400: cloud.prefab.client.configclient No success loading checkpoints',
+                      'ERROR 2023-08-09 15:18:12 -0400: test.test_log_path_aggregator.test_sync here is a message'
+                    ]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-13 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -114,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement