removing deprecated references to fluentd sqs (#1644)

mozilla · Jun 24, 2020 · bfea37d · bfea37d
1 parent 3090d1f
commit bfea37d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 143 deletions.
diff --git a/mq/esworker_sqs.py b/mq/esworker_sqs.py
@@ -200,16 +200,6 @@ def run(self):
                     event = dict()
                     event = msgbody
 
-                    # Was this message sent by fluentd-sqs
-                    fluentd_sqs_specific_fields = {"az", "instance_id", "__tag"}
-                    if fluentd_sqs_specific_fields.issubset(set(msgbody.keys())):
-                        # Until we can influence fluentd-sqs to set the
-                        # 'customendpoint' key before submitting to SQS, we'll
-                        # need to do it here
-                        # TODO : Change nubis fluentd output to include
-                        # 'customendpoint'
-                        event["customendpoint"] = True
-
                     if "tags" in event:
                         event["tags"].extend([options.taskexchange])
                     else:

diff --git a/mq/plugins/fluentdSqsFixup.py b/mq/plugins/fluentdSqsFixup.py
diff --git a/mq/plugins/large_strings.py b/mq/plugins/large_strings.py
@@ -6,7 +6,7 @@
 
 class message(object):
     def __init__(self):
-        self.registration = ['nubis_events_prod', 'githubeventsqs']
+        self.registration = ['githubeventsqs']
         self.priority = 20
         self.MAX_STRING_LENGTH = 3000