Apply suggestions from code review

newrelic · Dec 20, 2023 · 2c837aa · 2c837aa
1 parent 81d1f44
commit 2c837aa
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/newrelic/core/config.py b/newrelic/core/config.py
@@ -902,10 +902,10 @@ def default_otlp_host(host):
 _settings.application_logging.forwarding.context_data.enabled = _environ_as_bool(
     "NEW_RELIC_APPLICATION_LOGGING_FORWARDING_CONTEXT_DATA_ENABLED", default=False
 )
-_settings.application_logging.forwarding.context_data.include = _environ_as_bool(
+_settings.application_logging.forwarding.context_data.include = _environ_as_set(
     "NEW_RELIC_APPLICATION_LOGGING_FORWARDING_CONTEXT_DATA_INCLUDE", default=""
 )
-_settings.application_logging.forwarding.context_data.exclude = _environ_as_bool(
+_settings.application_logging.forwarding.context_data.exclude = _environ_as_set(
     "NEW_RELIC_APPLICATION_LOGGING_FORWARDING_CONTEXT_DATA_EXCLUDE", default=""
 )
 _settings.application_logging.metrics.enabled = _environ_as_bool(

diff --git a/tests/testing_support/validators/validate_log_events.py b/tests/testing_support/validators/validate_log_events.py
@@ -85,11 +85,13 @@ def _check_log_attributes(expected, required_attrs, forgone_attrs, captured, mis
                 return False
 
         for key in forgone_attrs:
-            if hasattr(captured, key):
-                mismatches.append("forgone_key: %s, value:<%s>" % (key, getattr(captured, key, None)))
-                return False
-            elif key in captured.attributes:
-                mismatches.append("forgone_key: %s, value:<%s>" % (key, captured.attributes[key]))
+            if hasattr(captured, key) or key in captured.attributes:
+                if hasattr(captured, key):
+                    captured_value = getattr(captured, key, None)
+                elif key in captured.attributes:
+                    captured_value = captured.attributes[key]
+
+                mismatches.append("forgone_key: %s, value:<%s>" % (key, captured_value))
                 return False
 
         return True

diff --git a/tests/testing_support/validators/validate_log_events_outside_transaction.py b/tests/testing_support/validators/validate_log_events_outside_transaction.py
@@ -82,11 +82,13 @@ def _check_log_attributes(expected, required_attrs, forgone_attrs, captured, mis
                 return False
 
         for key in forgone_attrs:
-            if hasattr(captured, key):
-                mismatches.append("forgone_key: %s, value:<%s>" % (key, getattr(captured, key, None)))
-                return False
-            elif key in captured.attributes:
-                mismatches.append("forgone_key: %s, value:<%s>" % (key, captured.attributes[key]))
+            if hasattr(captured, key) or key in captured.attributes:
+                if hasattr(captured, key):
+                    captured_value = getattr(captured, key, None)
+                elif key in captured.attributes:
+                    captured_value = captured.attributes[key]
+
+                mismatches.append("forgone_key: %s, value:<%s>" % (key, captured_value))
                 return False
 
         return True