diff --git a/docs/architecture/c4/notifhir/reporting/recorder/index.md b/docs/architecture/c4/notifhir/reporting/recorder/index.md
index 4aa2d0f9a..8ffd6fb15 100644
--- a/docs/architecture/c4/notifhir/reporting/recorder/index.md
+++ b/docs/architecture/c4/notifhir/reporting/recorder/index.md
@@ -8,7 +8,7 @@ is_not_draft: false
last_modified_date: 2025-10-24
owner: Tom D'Roza
author: Tom D'Roza
-diagrams: [c4code-tracker-listener, c4component-nhsapp-callback, sequence-nhsapp-callback]
+diagrams: [c4code-mesh-statusreporter-recorder, sequence-nhsapp-callback]
events-raised: []
events-consumed: [
mesh-inbox-message-downloaded,
diff --git a/docs/architecture/c4/notifhir/reporting/reportgenerator/index.md b/docs/architecture/c4/notifhir/reporting/reportgenerator/index.md
index be2ef625a..befb30d33 100644
--- a/docs/architecture/c4/notifhir/reporting/reportgenerator/index.md
+++ b/docs/architecture/c4/notifhir/reporting/reportgenerator/index.md
@@ -8,8 +8,8 @@ is_not_draft: false
last_modified_date: 2025-10-28
owner: Ross Buggins
author: Tom D'Roza
-diagrams: [c c4code-mesh-statusreporter-generator]
-events-raised: [reporting-daily-report-generated]
-events-consumed: [reporting-daily-report-timer-expired]
+diagrams: [c4code-mesh-statusreporter-generator]
+events-raised: [reporting-report-generated]
+events-consumed: [reporting-generate-report]
c4type: code
---
diff --git a/docs/architecture/c4/notifhir/reporting/reportscheduler/index.md b/docs/architecture/c4/notifhir/reporting/reportscheduler/index.md
index 11a7bb759..6de7bd935 100644
--- a/docs/architecture/c4/notifhir/reporting/reportscheduler/index.md
+++ b/docs/architecture/c4/notifhir/reporting/reportscheduler/index.md
@@ -9,7 +9,7 @@ last_modified_date: 2025-10-28
owner: Ross Buggins
author: Tom D'Roza
diagrams: [c4code-mesh-statusreporter-scheduler]
-events-raised: [reporting-daily-report-timer-expired]
+events-raised: [reporting-generate-report]
events-consumed: []
c4type: code
---
diff --git a/docs/architecture/c4/notifhir/reporting/reportsender/index.md b/docs/architecture/c4/notifhir/reporting/reportsender/index.md
new file mode 100644
index 000000000..0a61b775e
--- /dev/null
+++ b/docs/architecture/c4/notifhir/reporting/reportsender/index.md
@@ -0,0 +1,15 @@
+---
+
+title: Report Sender
+parent: Reporting
+nav_order: 4
+has_children: true
+is_not_draft: false
+last_modified_date: 2025-11-26
+owner: Ross Buggins
+author: Tom D'Roza
+diagrams: [c4code-mesh-statusreporter-sender]
+events-raised: [reporting-report-sent]
+events-consumed: [reporting-report-generated]
+c4type: code
+---
diff --git a/docs/assets/aws-icons-mermaid.json b/docs/assets/aws-icons-mermaid.json
index 4e4ae2fc5..0771b0abc 100644
--- a/docs/assets/aws-icons-mermaid.json
+++ b/docs/assets/aws-icons-mermaid.json
@@ -1076,6 +1076,11 @@
"height": 64,
"width": 64
},
+ "arch-amazon-athena": {
+ "body": "",
+ "height": 64,
+ "width": 64
+ },
"arch-amazon-dynamodb": {
"body": "",
"height": 64,
@@ -1091,11 +1096,6 @@
"height": 74,
"width": 74
},
- "athena": {
- "body": "",
- "height": 64,
- "width": 64
- },
"athena-data-source-connectors": {
"body": ""
},
diff --git a/docs/collections/_diagrams/c4code-mesh-statusreporter-generator.md b/docs/collections/_diagrams/c4code-mesh-statusreporter-generator.md
index e91630dbe..1fcdc84de 100644
--- a/docs/collections/_diagrams/c4code-mesh-statusreporter-generator.md
+++ b/docs/collections/_diagrams/c4code-mesh-statusreporter-generator.md
@@ -6,8 +6,8 @@ title: c4code-mesh-statusreporter-generator
## Decisions
-1. ReportScheulder lambda publishes a `GenerateReport` event for each trust that has new report data in the previous 24 hours.
-2. The event metadata contains the trust ID so the ReportGenerator lambda knows which trust to generate a report for.
+1. ReportSchedulder lambda publishes a `GenerateReport` event for every known client
+2. The event data payload contains the `senderId` so the ReportGenerator lambda knows which trust to generate a report for.
```mermaid
architecture-beta
@@ -16,7 +16,7 @@ architecture-beta
service sqs(logos:aws-sqs)[ReportGenerator Queue] in reportGenerator
service reportGeneratorLambda(logos:aws-lambda)[Report Generator] in reportGenerator
service s3(logos:aws-s3)[Reports] in reportGenerator
- service reportsdb(aws:arch-amazon-dynamodb)[Reports] in reportGenerator
+ service reportsdb(aws:arch-amazon-athena)[Reports] in reportGenerator
service reportGeneratedEvent(aws:res-amazon-eventbridge-event)[ReportGenerated Event]
generateReportEvent:R --> L:sqs
diff --git a/docs/collections/_diagrams/c4code-tracker-listener.md b/docs/collections/_diagrams/c4code-tracker-listener.md
deleted file mode 100644
index 15c7b10bd..000000000
--- a/docs/collections/_diagrams/c4code-tracker-listener.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-
-title: c4code-tracker-listener
-
----
-
-```mermaid
-architecture-beta
- group statusRecorder(cloud)[StatusRecorder]
- service report1Event(aws:res-amazon-eventbridge-event)[DigitalLetterRead Event]
- service report2Event(aws:res-amazon-eventbridge-event)[PrintingDispatched Event]
- service report3Event(aws:res-amazon-eventbridge-event)[NHSAppMessageRequested Event]
- service sqs(logos:aws-sqs)[StatusRecorder Queue] in statusRecorder
- service reportGeneratorLambda(logos:aws-lambda)[StatusRecorder] in statusRecorder
- service ddb(aws:arch-amazon-dynamodb)[Reports] in statusRecorder
- junction j1
- junction j2
-
- j2:B -- T:j1
- report1Event:R -- L:j2
- report2Event:R -- L:j1
- report3Event:R -- B:j1
-
- j1:R --> L:sqs
- sqs:R --> L:reportGeneratorLambda
- reportGeneratorLambda:B --> T:ddb
-
-```
diff --git a/src/cloudevents/readme-index.yaml b/src/cloudevents/readme-index.yaml
index 651ef0bfe..feda7f08b 100644
--- a/src/cloudevents/readme-index.yaml
+++ b/src/cloudevents/readme-index.yaml
@@ -3,7 +3,7 @@
# To regenerate, run: make update-readme
# To customize labels and purposes, edit: readme-metadata.yaml
-generated: '2025-11-26T12:32:47.898Z'
+generated: '2025-11-27T17:20:53.023Z'
common: null
domains:
- name: digital-letters