Check for dictionary type first

elastic · Oct 22, 2020 · 01c23c5 · 01c23c5
1 parent 79077dd
commit 01c23c5
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/Elastic.Apm/Report/Serialization/ElasticApmContractResolver.cs b/src/Elastic.Apm/Report/Serialization/ElasticApmContractResolver.cs
@@ -40,11 +40,12 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
 						: new TruncateJsonConverter(maxLengthAttribute.Length);
 				}
 			}
-
-			var sanitizeAttribute = member.GetCustomAttribute<SanitizeAttribute>();
-
-			if (sanitizeAttribute != null && property.PropertyType == typeof(Dictionary<string, string>))
-				property.Converter = _headerDictionarySanitizerConverter;
+			else if (property.PropertyType == typeof(Dictionary<string, string>))
+			{
+				var sanitizeAttribute = member.GetCustomAttribute<SanitizeAttribute>();
+				if (sanitizeAttribute != null)
+					property.Converter = _headerDictionarySanitizerConverter;
+			}
 
 			return property;
 		}