Add lookback time adjustment for Office 365 source plugin partition execution

Alekhya Parisha · Alekhya Parisha · commit 41df5412686d · 2025-11-13T09:48:52.000-08:00
Signed-off-by: Alekhya Parisha &lt;aparisha@amazon.com&gt;
diff --git a/data-prepper-plugins/saas-source-plugins/microsoft-office365-source/src/main/java/org/opensearch/dataprepper/plugins/source/microsoft_office365/service/Office365Service.java b/data-prepper-plugins/saas-source-plugins/microsoft-office365-source/src/main/java/org/opensearch/dataprepper/plugins/source/microsoft_office365/service/Office365Service.java
@@ -63,11 +63,11 @@ public AuditLogsResponse searchAuditLogs(final String logType,
                 return office365RestClient.searchAuditLogs(logType, startTime, endTime, nextPageUri);
             }
 
-            // Check and adjust start time for 7-day limit
+            // Adjust start time based on configured lookback hours
             Instant adjustedStartTime = startTime;
-            Instant sevenDaysAgo = Instant.now().minus(SEVEN_DAYS);
-            if (startTime.isBefore(sevenDaysAgo)) {
-                adjustedStartTime = sevenDaysAgo;
+            Instant lookBackHoursAgo = Instant.now().minus(Duration.ofHours(office365SourceConfig.getLookBackHours()));
+            if (startTime.isBefore(lookBackHoursAgo) && lookBackHoursAgo.isBefore(endTime)) {
+                adjustedStartTime = lookBackHoursAgo;
             }
 
             AuditLogsResponse response =

Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,11 @@ public AuditLogsResponse searchAuditLogs(final String logType,`
`63`	`63`	`return office365RestClient.searchAuditLogs(logType, startTime, endTime, nextPageUri);`
`64`	`64`	`}`
`65`	`65`
`66`		`- // Check and adjust start time for 7-day limit`
	`66`	`+ // Adjust start time based on configured lookback hours`
`67`	`67`	`Instant adjustedStartTime = startTime;`
`68`		`- Instant sevenDaysAgo = Instant.now().minus(SEVEN_DAYS);`
`69`		`- if (startTime.isBefore(sevenDaysAgo)) {`
`70`		`- adjustedStartTime = sevenDaysAgo;`
	`68`	`+ Instant lookBackHoursAgo = Instant.now().minus(Duration.ofHours(office365SourceConfig.getLookBackHours()));`
	`69`	`+ if (startTime.isBefore(lookBackHoursAgo) && lookBackHoursAgo.isBefore(endTime)) {`
	`70`	`+ adjustedStartTime = lookBackHoursAgo;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`AuditLogsResponse response =`