Fix null key and add test

DataDog · Feb 10, 2025 · d84d94d · d84d94d
1 parent 8c1de94
commit d84d94d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/tracer/src/Datadog.Trace/Debugger/Snapshots/Redaction.cs b/tracer/src/Datadog.Trace/Debugger/Snapshots/Redaction.cs
@@ -228,6 +228,12 @@ internal static bool IsRedactedType(Type? type)
                 return false;
             }
 
+            var redactedType = _redactedTypesCache.GetOrAdd(type, CheckForRedactedType);
+            return redactedType;
+        }
+
+        private static bool CheckForRedactedType(Type type)
+        {
             Type? genericDefinition = null;
             if (type.IsGenericType)
             {
@@ -271,20 +277,22 @@ internal static bool IsRedactedKeyword(string name)
                 return false;
             }
 
-            return !TryNormalize(name, out var result) || RedactKeywords.Contains(result);
+            var redactedKeyword = _redactedKeywordsCache.GetOrAdd(
+                name,
+                n => !TryNormalize(n, out var result) || RedactKeywords.Contains(result));
+
+            return redactedKeyword;
         }
 
         internal static bool ShouldRedact(string name, Type type, out RedactionReason redactionReason)
         {
-            var redactedKeyword = _redactedKeywordsCache.GetOrAdd(name, IsRedactedKeyword);
-            if (redactedKeyword)
+            if (IsRedactedKeyword(name))
             {
                 redactionReason = RedactionReason.Identifier;
                 return true;
             }
 
-            var redactedType = _redactedTypesCache.GetOrAdd(type, IsRedactedType);
-            if (redactedType)
+            if (IsRedactedType(type))
             {
                 redactionReason = RedactionReason.Type;
                 return true;

diff --git a/tracer/test/Datadog.Trace.Tests/Debugger/RedactionTests.cs b/tracer/test/Datadog.Trace.Tests/Debugger/RedactionTests.cs
@@ -215,7 +215,8 @@ public void SetConfig_DuplicateEntries_Test()
         }
 
         [Theory]
-        [InlineData("password", typeof(System.Security.SecureString), RedactionReason.Type)]
+        [InlineData("", typeof(System.Security.SecureString), RedactionReason.Type)]
+        [InlineData("password", typeof(System.Security.SecureString), RedactionReason.Identifier)]
         [InlineData("api_key", typeof(string), RedactionReason.Identifier)]
         [InlineData("normal", typeof(string), RedactionReason.None)]
         internal void ShouldRedact_CombinedScenarios_Test(string name, Type type, RedactionReason expectedReason)