GH-48623: [CI][Archery][Dev] Add missing headers to email reports

Author: kou

dev/archery/archery/ci/cli.py

@@ -16,6 +16,7 @@
 # under the License.
 
 import click
+import email.utils
 
 from .core import Workflow
 from ..crossbow.reports import ChatReport, EmailReport, ReportUtils
@@ -105,12 +106,15 @@ def report_email(obj, workflow_id, sender_name, sender_email, recipient_email,
     """
     output = obj['output']
 
+    workflow = Workflow(workflow_id, repository,
+                        ignore_job=ignore, gh_token=obj['github_token'])
     email_report = EmailReport(
-        report=Workflow(workflow_id, repository,
-                        ignore_job=ignore, gh_token=obj['github_token']),
-        sender_name=sender_name,
+        date=email.utils.formatdate(workflow.datetime),
+        message_id=email.utils.make_msgid(),
+        recipient_email=recipient_email,
+        report=workflow,
         sender_email=sender_email,
-        recipient_email=recipient_email
+        sender_name=sender_name,
     )
 
     if send:

dev/archery/archery/crossbow/cli.py

@@ -16,6 +16,7 @@
 # under the License.
 
 from datetime import date
+import email.utils
 from pathlib import Path
 import time
 import sys
@@ -382,11 +383,14 @@ def report(obj, job_name, sender_name, sender_email, recipient_email,
         queue.fetch()
 
     job = queue.get(job_name)
+    report = Report(job)
     email_report = EmailReport(
-        report=Report(job),
-        sender_name=sender_name,
+        date=email.utils.formatdate(),
+        message_id=email.utils.make_msgid(),
+        recipient_email=recipient_email,
+        report=report,
         sender_email=sender_email,
-        recipient_email=recipient_email
+        sender_name=sender_name,
     )
 
     if poll:
@@ -645,15 +649,18 @@ def __init__(self, token_expiration_date, days_left):
             self.token_expiration_date = token_expiration_date
             self.days_left = days_left
 
+    report = TokenExpirationReport(
+        token_expiration_date or "ALREADY_EXPIRED", days_left)
     email_report = EmailReport(
-        report=TokenExpirationReport(
-            token_expiration_date or "ALREADY_EXPIRED", days_left),
-        sender_name=sender_name,
+        date=email.utils.formatdate(),
+        message_id=email.utils.make_msgid(),
+        recipient_email=recipient_email,
+        report=report,
         sender_email=sender_email,
-        recipient_email=recipient_email
+        sender_name=sender_name,
     )
 
-    message = email_report.render("token_expiration").strip()
+    message = email_report.render("token_expiration")
     if send:
         ReportUtils.send_email(
             smtp_user=smtp_user,

dev/archery/archery/crossbow/reports.py

@@ -277,10 +277,12 @@ class EmailReport(JinjaReport):
         'workflow_report': 'email_workflow_report.txt.j2',
     }
     fields = [
+        'date',
+        'message_id',
+        'recipient_email',
         'report',
-        'sender_name',
         'sender_email',
-        'recipient_email',
+        'sender_name',
     ]
 
 

dev/archery/archery/crossbow/tests/fixtures/email-report.txt

@@ -1,3 +1,7 @@
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Message-Id: <[email protected]>
+Date: Mon, 22 Dec 2025 22:12:00 -0000
 From: Sender Reporter <[email protected]>
 To: [email protected]
 Subject: [NIGHTLY] Arrow Build Report for Job ursabot-1: 2 failed, 1 pending

dev/archery/archery/crossbow/tests/test_reports.py

@@ -76,9 +76,12 @@ def test_crossbow_email_report(load_fixture):
     job = load_fixture('crossbow-job.yaml', decoder=yaml.load)
     report = Report(job)
     assert report.tasks_by_state is not None
-    email_report = EmailReport(report=report, sender_name="Sender Reporter",
+    email_report = EmailReport(date="Mon, 22 Dec 2025 22:12:00 -0000",
+                               message_id="<[email protected]>",
+                               recipient_email="[email protected]",
+                               report=report,
                                sender_email="[email protected]",
-                               recipient_email="[email protected]")
+                               sender_name="Sender Reporter")
 
     assert (
         email_report.render("nightly_report") == textwrap.dedent(expected_msg)

dev/archery/archery/templates/email_nightly_report.txt.j2

@@ -15,9 +15,11 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#}
-{%- if True -%}
-{%- endif -%}
+-#}
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Message-Id: {{ message_id }}
+Date: {{ date }}
 From: {{ sender_name }} <{{ sender_email }}>
 To: {{ recipient_email }}
 Subject: [NIGHTLY] Arrow Build Report for Job {{report.job.branch}}: {{ (report.tasks_by_state["error"] | length) +  (report.tasks_by_state["failure"] | length) }} failed, {{ report.tasks_by_state["pending"] | length }} pending
@@ -58,4 +60,4 @@ Succeeded Tasks:
 - {{ task_name }}
   {{ report.task_url(task) }}
 {% endfor %}
-{%- endif -%}
+{%- endif -%}

dev/archery/archery/templates/email_token_expiration.txt.j2

@@ -15,7 +15,11 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#}
+-#}
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Message-Id: {{ message_id }}
+Date: {{ date }}
 From: {{ sender_name }} <{{ sender_email }}>
 To: {{ recipient_email }}
 Subject: [CI] Arrow Crossbow Token Expiration in {{ report.token_expiration_date }}

dev/archery/archery/templates/email_workflow_report.txt.j2

@@ -15,9 +15,11 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#}
-{%- if True -%}
-{%- endif -%}
+-#}
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Message-Id: {{ message_id }}
+Date: {{ date }}
 From: {{ sender_name }} <{{ sender_email }}>
 To: {{ recipient_email }}
 Subject: [{{ report.datetime.strftime('%Y-%m-%d') }}] Arrow Build Report for {{ report.name }}: {{ report.failed_jobs() | length }} failed
@@ -42,4 +44,4 @@ Succeeded Jobs:
 - {{ job.name }}
   {{ job.url }}
 {% endfor %}
-{%- endif -%}
+{%- endif -%}