prefab-cloud-ruby 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0cc90e8b5acc15676a5101e6cbd902e37e38781ebb6d6fb33c892f938df3bbc
-  data.tar.gz: 68e1dbb144273aa9c54fb11efdf9333f2260a8805705d2aff47885719d995b7f
+  metadata.gz: f938b850265077b3ea456a8cab3d93eda3eadcba2d7807af03bae5be36b9c625
+  data.tar.gz: 5219784f5f6e30a0bddc1376ef102e3f2431639278c9225aa8000ac53cc9c4fa
 SHA512:
-  metadata.gz: 9518b4ab1b19e6f7532fd29146b26bd0fd4e3527dbc4fde041b61b712a843db95f6f9355d8afb0b2496436aab711ec5f4a57075dbaf80c7afd4bb85c35d92b53
-  data.tar.gz: d2f4806025b4c965792653149ac9976b47ed4f687bbbb9b73cf58af091a55d4ad03affe49e6cd55aba132fa1a49f422f73900a2d295abb3afb2867cf204bb533
+  metadata.gz: 16c8a0d94d3c267cc3ea7ff4be436e0dfe7a2b7124e8f7d5500194379d0a06e8f8985f790dbc128e70b8960f61c8ce56bc15025ed8872722ce6b9b729a36a760
+  data.tar.gz: 1eb81d70d7728b1f900a7a96ae344b7c2fc85a248eecc17ddb662ff1aec80c7704321e1b7e9fb8926090736ae3fe12f2a8f1d378c625900a94031b390cfcfba6

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.6.2 - 2024-03-29
+
+- Fix context telemetry when JIT and Block contexts are combined (#185)
+- Remove logger prefix (#186)
+
 ## 1.6.1 - 2024-03-28
 
 - Performance optimizations (#178)

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

data/lib/prefab/context.rb

@@ -31,7 +31,7 @@ module Prefab
     end
 
     THREAD_KEY = :prefab_context
-    attr_reader :contexts, :seen_at
+    attr_reader :contexts, :seen_at, :id, :parent
 
     class << self
       def global_context=(context)
@@ -173,6 +173,7 @@ module Prefab
 
     def clear
       @contexts = {}
+      @flattened = {}
     end
 
     def context(name)
@@ -187,6 +188,18 @@ module Prefab
       self
     end
 
+    def reportable_tree
+      ctx = self
+      reportables = []
+
+      while ctx
+        reportables.unshift(ctx)
+        ctx = ctx.parent
+      end
+
+      reportables
+    end
+
     def to_proto(namespace)
       prefab_context = {
         'current-time' => ConfigValueWrapper.wrap(Prefab::TimeHelpers.now_in_ms)
@@ -194,8 +207,16 @@ module Prefab
 
       prefab_context['namespace'] = ConfigValueWrapper.wrap(namespace) if namespace&.length&.positive?
 
+      reportable_contexts = {}
+
+      reportable_tree.each do |ctx|
+        ctx.contexts.each do |name, context|
+          reportable_contexts[name] = context
+        end
+      end
+
       PrefabProto::ContextSet.new(
-        contexts: contexts.map do |name, context|
+        contexts: reportable_contexts.map do |name, context|
           context.to_proto
         end.concat([PrefabProto::Context.new(type: 'prefab',
                                              values: prefab_context)])
@@ -224,9 +245,5 @@ module Prefab
         super
       end
     end
-
-    def id
-      @id
-    end
   end
 end

data/lib/prefab/logger_client.rb

@@ -28,13 +28,11 @@ module Prefab
 
     def semantic_filter(log)
       class_path = class_path_name(log.name)
-      lookup_path = "#{logger_prefix}.#{class_path}"
       level = SemanticLogger::Levels.index(log.level)
-      log.named_tags.merge!({ path: lookup_path })
-      should_log? level, lookup_path
+      log.named_tags.merge!({ path: class_path })
+      should_log? level, class_path
     end
 
-
     def config_client=(config_client)
       @config_client = config_client
     end
@@ -50,10 +48,6 @@ module Prefab
       end.gsub(/[^a-z_]/i, '.')
     end
 
-    def logger_prefix
-      Context.current.get("application.key") ||  "prefab-cloud-ruby"
-    end
-
     # Find the closest match to 'log_level.path' in config
     def level_of(path)
       closest_log_level_match = nil

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.6.1 ruby lib
+# stub: prefab-cloud-ruby 1.6.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "1.6.1"
+  s.version = "1.6.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 = "2024-03-28"
+  s.date = "2024-03-29"
   s.description = "Feature Flags, Live Config, and Dynamic Log Levels as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [

data/test/support/common_helpers.rb

@@ -7,6 +7,8 @@ module CommonHelpers
     $oldstderr, $stderr = $stderr, StringIO.new
 
     $logs = StringIO.new
+    Prefab::Context.global_context.clear
+    Prefab::Context.default_context.clear
     SemanticLogger.add_appender(io: $logs, filter: Prefab.log_filter)
     SemanticLogger.sync!
     Timecop.freeze('2023-08-09 15:18:12 -0400')

data/test/test_config_resolver.rb

@@ -449,6 +449,37 @@ class TestConfigResolver < Minitest::Test
     end
   end
 
+  def test_context_lookup_with_no_local_context
+    global_context = { cpu: { count: 4, speed: '2.4GHz' }, clock: { timezone: 'UTC' } }
+    default_context = { 'prefab-api-key' => { 'user-id' => 123 } }
+    jit_context = { user: { name: 'Frank' } }
+
+    config = PrefabProto::Config.new( key: 'example', rows: [ PrefabProto::ConfigRow.new( values: [ PrefabProto::ConditionalValue.new( value: PrefabProto::ConfigValue.new(string: 'valueB2')) ]) ])
+
+    client = new_client(global_context: global_context, config: [config])
+
+    # we fake getting the default context from the API
+    Prefab::Context.default_context = default_context
+
+    resolver = client.resolver
+
+    context = resolver.get("example", jit_context).context
+
+    # This digs all the way to the global context
+    assert_equal 4, context.get('cpu.count')
+    assert_equal '2.4GHz', context.get('cpu.speed')
+    assert_equal 'UTC', context.get('clock.timezone')
+
+    # This digs to the default context
+    assert_equal 123, context.get('prefab-api-key.user-id')
+
+    # This uses the jit context
+    assert_equal 'Frank', context.get('user.name')
+
+    # This is nil in the jit context because `user` was clobbered
+    assert_nil context.get('user.email')
+  end
+
   private
 
   def resolver_for_namespace(namespace, loader, project_env_id: TEST_ENV_ID)

data/test/test_context.rb

@@ -154,6 +154,93 @@ class TestContext < Minitest::Test
     ), contexts.to_proto(namespace)
   end
 
+  def test_to_proto_with_parent
+    global_context = { cpu: { count: 4, speed: '2.4GHz' }, clock: { timezone: 'UTC' }, magic: { key: "global-key" } }
+    default_context = { 'prefab-api-key' => { 'user-id' => 123 } }
+
+    Prefab::Context.global_context = global_context
+    Prefab::Context.default_context = default_context
+
+    Prefab::Context.current = {
+      user: { id: 2, email: 'parent-email' },
+      magic: { key: 'parent-key', rabbits: 3 },
+      clock: { timezone: 'PST' }
+    }
+
+    contexts = Prefab::Context.join(hash: {
+                                      user: {
+                                        id: 1,
+                                        email: 'user-email'
+                                      },
+                                      team: {
+                                        id: 2,
+                                        name: 'team-name'
+                                      }
+                                    }, id: :jit, parent: Prefab::Context.current)
+
+    expected = PrefabProto::ContextSet.new(
+      contexts: [
+        # Via global
+        PrefabProto::Context.new(
+          type: "cpu",
+          values: {
+            "count" => PrefabProto::ConfigValue.new(int: 4),
+            "speed" => PrefabProto::ConfigValue.new(string: "2.4GHz")
+          }
+        ),
+        # Via default
+        PrefabProto::Context.new(
+          type: "clock",
+          values: {
+            "timezone" => PrefabProto::ConfigValue.new(string: 'PST'),
+          }
+        ),
+        # via current
+        PrefabProto::Context.new(
+          type: "magic",
+          values: {
+            "key" => PrefabProto::ConfigValue.new(string: 'parent-key'),
+            "rabbits" => PrefabProto::ConfigValue.new(int: 3)
+          }
+        ),
+        # via default
+        PrefabProto::Context.new(
+          type: "prefab-api-key",
+          values: {
+            "user-id" => PrefabProto::ConfigValue.new(int: 123)
+          }
+        ),
+        # via jit
+        PrefabProto::Context.new(
+          type: "user",
+          values: {
+            "id" => PrefabProto::ConfigValue.new(int: 1),
+            "email" => PrefabProto::ConfigValue.new(string: "user-email")
+          }
+        ),
+        # via jit
+        PrefabProto::Context.new(
+          type: "team",
+          values: {
+            "id" => PrefabProto::ConfigValue.new(int: 2),
+            "name" => PrefabProto::ConfigValue.new(string: "team-name")
+          }
+        ),
+        # via to_proto
+        PrefabProto::Context.new(
+          type: "prefab",
+          values: {
+            'current-time' => PrefabProto::ConfigValue.new(int: Prefab::TimeHelpers.now_in_ms),
+          }
+        )
+      ]
+    )
+
+    actual = contexts.to_proto("")
+
+    assert_equal expected, actual
+  end
+
   def test_parent_lookup
     global_context = { cpu: { count: 4, speed: '2.4GHz' }, clock: { timezone: 'UTC' } }
     default_context = { 'prefab-api-key' => { 'user-id' => 123 } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-28 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby