killbill-aplcache

diff --git a/profiles/killbill/src/main/java/org/killbill/billing/server/log/obfuscators/PatternObfuscator.java b/profiles/killbill/src/main/java/org/killbill/billing/server/log/obfuscators/PatternObfuscator.java
index bed40f9..05f7991 100644
--- a/profiles/killbill/src/main/java/org/killbill/billing/server/log/obfuscators/PatternObfuscator.java
+++ b/profiles/killbill/src/main/java/org/killbill/billing/server/log/obfuscators/PatternObfuscator.java
@@ -35,6 +35,11 @@ public class PatternObfuscator extends Obfuscator {
             "bic",
             "cardvalidationnum",
             "cavv",
+            "ccFirstName",
+            "ccLastName",
+            "ccNumber",
+            "ccTrackData",
+            "ccVerificationValue",
             "ccvv",
             "cvNumber",
             "cvc",
@@ -59,6 +64,8 @@ public class PatternObfuscator extends Obfuscator {
             this.patterns.add(buildJSONPattern(sensitiveKey));
             this.patterns.add(buildXMLPattern(sensitiveKey));
             this.patterns.add(buildMultiValuesXMLPattern(sensitiveKey));
+            this.patterns.add(buildKeyValuePattern1(sensitiveKey));
+            this.patterns.add(buildKeyValuePattern2(sensitiveKey));
         }
         this.patterns.addAll(extraPatterns);
     }
@@ -79,4 +86,14 @@ public class PatternObfuscator extends Obfuscator {
     private Pattern buildMultiValuesXMLPattern(final String key) {
         return Pattern.compile(key + "</key>\\s*<value[^>]*>([^<\\n]+)</value>", DEFAULT_PATTERN_FLAGS);
     }
+
+    // Splunk-type logging
+    private Pattern buildKeyValuePattern1(final String key) {
+        return Pattern.compile(key + "\\s*=\\s*'([^\']+)'", DEFAULT_PATTERN_FLAGS);
+    }
+
+    // Splunk-type logging
+    private Pattern buildKeyValuePattern2(final String key) {
+        return Pattern.compile(key + "\\s*=\\s*\"([^\"]+)\"", DEFAULT_PATTERN_FLAGS);
+    }
 }

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/server/log/obfuscators/TestPatternObfuscator.java b/profiles/killbill/src/test/java/org/killbill/billing/server/log/obfuscators/TestPatternObfuscator.java
index 11d9162..c50ae34 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/server/log/obfuscators/TestPatternObfuscator.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/server/log/obfuscators/TestPatternObfuscator.java
@@ -278,6 +278,12 @@ public class TestPatternObfuscator extends ServerTestSuiteNoDB {
                event);
     }
 
+    @Test(groups = "fast")
+    public void testPluginProperties() throws Exception {
+        verify("ENTERING onSuccessCall paymentMethodId='e92a3bfd-0713-4396-a1e2-ff46cb051f8c' ccVerificationValue='123' ccNumber = '4111111111111111' ccTrackData=\"XXX\" ccFirstName = \"John\" ccLastName=\"'Smith'\"",
+               "ENTERING onSuccessCall paymentMethodId='e92a3bfd-0713-4396-a1e2-ff46cb051f8c' ccVerificationValue='***' ccNumber = '****************' ccTrackData=\"***\" ccFirstName = \"****\" ccLastName=\"*******\"");
+    }
+
     private void verify(final String input, final ILoggingEvent event) {
         verify(input, input, event);
     }