Recover decoded attributes before scrubbing messages

mozilla · Aug 13, 2019 · dd09b4f · dd09b4f
1 parent e00728f
commit dd09b4f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/ingestion-beam/src/main/java/com/mozilla/telemetry/decoder/ParsePayload.java b/ingestion-beam/src/main/java/com/mozilla/telemetry/decoder/ParsePayload.java
@@ -89,15 +89,15 @@ protected PubsubMessage processElement(PubsubMessage message)
       throw e;
     }
 
+    // In case this message is being replayed from an error output where AddMetadata has already
+    // been applied, we strip out any existing metadata fields and put them into attributes.
+    AddMetadata.stripPayloadMetadataToAttributes(attributes, json);
+
     if (MessageScrubber.shouldScrub(attributes, json)) {
       // Prevent the message from going to success or error output.
       throw new MessageShouldBeDroppedException();
     }
 
-    // In case this message is being replayed from an error output where AddMetadata has already
-    // been applied, we strip out any existing metadata fields and put them into attributes.
-    AddMetadata.stripPayloadMetadataToAttributes(attributes, json);
-
     boolean validDocType = schemaStore.docTypeExists(attributes);
     if (!validDocType) {
       PerDocTypeCounter.inc(null, "error_invalid_doc_type");