fixup: debug, not info

Signed-off-by: Todd Baert <[email protected]>

Author: toddbaert

src/main/java/dev/openfeature/sdk/HookSupport.java

@@ -17,19 +17,28 @@
 @SuppressWarnings({ "unchecked", "rawtypes" })
 class HookSupport {
 
-    public void errorHooks(FlagValueType flagValueType, HookContext hookCtx, Exception e, List<Hook> hooks,
+    public EvaluationContext beforeHooks(FlagValueType flagValueType, HookContext hookCtx, List<Hook> hooks,
             Map<String, Object> hints) {
-        executeHooks(flagValueType, hooks, "error", hook -> hook.error(hookCtx, e, hints));
+        Stream<EvaluationContext> result = callBeforeHooks(flagValueType, hookCtx, hooks, hints);
+        return hookCtx.getCtx().merge(
+                result.reduce(hookCtx.getCtx(), (EvaluationContext accumulated, EvaluationContext current) -> {
+                    return accumulated.merge(current);
+                }));
+    }
+
+    public void afterHooks(FlagValueType flagValueType, HookContext hookContext, FlagEvaluationDetails details,
+            List<Hook> hooks, Map<String, Object> hints) {
+        executeHooksUnchecked(flagValueType, hooks, hook -> hook.after(hookContext, details, hints));
     }
 
     public void afterAllHooks(FlagValueType flagValueType, HookContext hookCtx, List<Hook> hooks,
             Map<String, Object> hints) {
         executeHooks(flagValueType, hooks, "finally", hook -> hook.finallyAfter(hookCtx, hints));
     }
 
-    public void afterHooks(FlagValueType flagValueType, HookContext hookContext, FlagEvaluationDetails details,
-            List<Hook> hooks, Map<String, Object> hints) {
-        executeHooksUnchecked(flagValueType, hooks, hook -> hook.after(hookContext, details, hints));
+    public void errorHooks(FlagValueType flagValueType, HookContext hookCtx, Exception e, List<Hook> hooks,
+            Map<String, Object> hints) {
+        executeHooks(flagValueType, hooks, "error", hook -> hook.error(hookCtx, e, hints));
     }
 
     private <T> void executeHooks(
@@ -44,6 +53,17 @@ private <T> void executeHooks(
         }
     }
 
+    // before, error, and finally hooks shouldn't throw
+    private <T> void executeChecked(Hook<T> hook, Consumer<Hook<T>> hookCode, String hookMethod) {
+        try {
+            hookCode.accept(hook);
+        } catch (Exception exception) {
+            log.error("Unhandled exception when running {} hook {} (only 'after' hooks should throw)", hookMethod,
+                    hook.getClass(), exception);
+        }
+    }
+
+    // after hooks can throw in order to do validation
     private <T> void executeHooksUnchecked(
             FlagValueType flagValueType, List<Hook> hooks,
             Consumer<Hook<T>> hookCode) {
@@ -55,23 +75,6 @@ private <T> void executeHooksUnchecked(
         }
     }
 
-    private <T> void executeChecked(Hook<T> hook, Consumer<Hook<T>> hookCode, String hookMethod) {
-        try {
-            hookCode.accept(hook);
-        } catch (Exception exception) {
-            log.error("Exception when running {} hooks {}", hookMethod, hook.getClass(), exception);
-        }
-    }
-
-    public EvaluationContext beforeHooks(FlagValueType flagValueType, HookContext hookCtx, List<Hook> hooks,
-            Map<String, Object> hints) {
-        Stream<EvaluationContext> result = callBeforeHooks(flagValueType, hookCtx, hooks, hints);
-        return hookCtx.getCtx().merge(
-                result.reduce(hookCtx.getCtx(), (EvaluationContext accumulated, EvaluationContext current) -> {
-                    return accumulated.merge(current);
-                }));
-    }
-
     private Stream<EvaluationContext> callBeforeHooks(FlagValueType flagValueType, HookContext hookCtx,
             List<Hook> hooks, Map<String, Object> hints) {
         // These traverse backwards from normal.

src/main/java/dev/openfeature/sdk/hooks/logging/LoggingHook.java

@@ -35,13 +35,15 @@ public class LoggingHook implements Hook<Object> {
 
     /**
      * Construct a new LoggingHook.
+     * Flag evaluation data is logged at debug and error in before/after stages and error stages, respectively.
      */
     public LoggingHook() {
         this(false);
     }
 
     /**
      * Construct a new LoggingHook.
+     * Flag evaluation data is logged at debug and error in before/after stages and error stages, respectively.
      * @param includeEvaluationContext include a serialized evaluation context in the log message (defaults to false)
      */
     public LoggingHook(boolean includeEvaluationContext) {
@@ -50,7 +52,7 @@ public LoggingHook(boolean includeEvaluationContext) {
 
     @Override
     public Optional<EvaluationContext> before(HookContext<Object> hookContext, Map<String, Object> hints) {
-        LoggingEventBuilder builder = log.atInfo();
+        LoggingEventBuilder builder = log.atDebug();
         addCommonProps(builder, hookContext);
         builder.log("Before stage");
 
@@ -60,7 +62,7 @@ public Optional<EvaluationContext> before(HookContext<Object> hookContext, Map<S
     @Override
     public void after(HookContext<Object> hookContext, FlagEvaluationDetails<Object> details,
             Map<String, Object> hints) {
-        LoggingEventBuilder builder = log.atInfo()
+        LoggingEventBuilder builder = log.atDebug()
                 .addKeyValue(REASON_KEY, details.getReason())
                 .addKeyValue(VARIANT_KEY, details.getVariant())
                 .addKeyValue(VALUE_KEY, details.getValue());

src/test/java/dev/openfeature/sdk/hooks/logging/LoggingHookTest.java

@@ -62,7 +62,7 @@ public String getName() {
         logger = mock(Logger.class);
         mockBuilder = mock(LoggingEventBuilder.class);
         when(mockBuilder.addKeyValue(anyString(), anyString())).thenReturn(mockBuilder);
-        when(logger.atInfo()).thenReturn(mockBuilder);
+        when(logger.atDebug()).thenReturn(mockBuilder);
         when(logger.atError()).thenReturn(mockBuilder);
         LoggerMock.setMock(LoggingHook.class, logger);
     }
@@ -73,7 +73,7 @@ void beforeLogsAllPropsExceptEvaluationContext() {
         LoggingHook hook = new LoggingHook();
         hook.before(hookContext, null);
 
-        verify(logger).atInfo();
+        verify(logger).atDebug();
         verifyCommonProps(mockBuilder);
         verify(mockBuilder, never()).addKeyValue(anyString(), any(EvaluationContext.class));
         verify(mockBuilder).log(argThat((String s) -> s.contains("Before")));
@@ -85,7 +85,7 @@ void beforeLogsAllPropsAndEvaluationContext() {
         LoggingHook hook = new LoggingHook(true);
         hook.before(hookContext, null);
 
-        verify(logger).atInfo();
+        verify(logger).atDebug();
         verifyCommonProps(mockBuilder);
         verify(mockBuilder).addKeyValue(contains(LoggingHook.EVALUATION_CONTEXT_KEY), any(EvaluationContext.class));
         verify(mockBuilder).log(argThat((String s) -> s.contains("Before")));
@@ -98,7 +98,7 @@ void afterLogsAllPropsExceptEvaluationContext() {
         FlagEvaluationDetails<Object> details = FlagEvaluationDetails.builder().reason(REASON).variant(VARIANT).value(VALUE).build();
         hook.after(hookContext, details, null);
 
-        verify(logger).atInfo();
+        verify(logger).atDebug();
         verifyAfterProps(mockBuilder);
         verifyCommonProps(mockBuilder);
         verify(mockBuilder, never()).addKeyValue(anyString(), any(EvaluationContext.class));
@@ -112,7 +112,7 @@ void afterLogsAllPropsAndEvaluationContext() {
         FlagEvaluationDetails<Object> details = FlagEvaluationDetails.builder().reason(REASON).variant(VARIANT).value(VALUE).build();
         hook.after(hookContext, details, null);
 
-        verify(logger).atInfo();
+        verify(logger).atDebug();
         verifyAfterProps(mockBuilder);
         verifyCommonProps(mockBuilder);
         verify(mockBuilder).addKeyValue(contains(LoggingHook.EVALUATION_CONTEXT_KEY), any(EvaluationContext.class));