frontend/src/container/SpanDetailsDrawer/__tests__/SpanDetailsDrawer.test.tsx

@@ -261,16 +261,18 @@ describe('SpanDetailsDrawer', () => {
 		const logsButton = screen.getByRole('radio', { name: /logs/i });
 		fireEvent.click(logsButton);
 
-		// Wait for logs view to open and logs to be displayed
+		// Wait for logs view to open
 		await waitFor(() => {
 			expect(screen.getByTestId('overlay-scrollbar')).toBeInTheDocument();
+		});
+
+		// Verify logs are displayed
+		await waitFor(() => {
 			// eslint-disable-next-line sonarjs/no-duplicate-string
 			expect(screen.getByTestId('raw-log-span-log-1')).toBeInTheDocument();
-			// eslint-disable-next-line sonarjs/no-duplicate-string
 			expect(screen.getByTestId('raw-log-span-log-2')).toBeInTheDocument();
 			// eslint-disable-next-line sonarjs/no-duplicate-string
 			expect(screen.getByTestId('raw-log-context-log-before')).toBeInTheDocument();
-			// eslint-disable-next-line sonarjs/no-duplicate-string
 			expect(screen.getByTestId('raw-log-context-log-after')).toBeInTheDocument();
 		});
 	});
@@ -283,9 +285,12 @@ describe('SpanDetailsDrawer', () => {
 		fireEvent.click(logsButton);
 
 		// Wait for all API calls to complete
-		await waitFor(() => {
+		await waitFor(
-			expect(GetMetricQueryRange).toHaveBeenCalledTimes(3);
+			() => {
-		});
+				expect(GetMetricQueryRange).toHaveBeenCalledTimes(3);
+			},
+			{ timeout: 5000 },
+		);
 
 		// Verify the three distinct queries were made
 		const [spanQuery, beforeQuery, afterQuery] = apiCallHistory;
@@ -314,9 +319,12 @@ describe('SpanDetailsDrawer', () => {
 		fireEvent.click(logsButton);
 
 		// Wait for all API calls to complete
-		await waitFor(() => {
+		await waitFor(
-			expect(GetMetricQueryRange).toHaveBeenCalledTimes(3);
+			() => {
-		});
+				expect(GetMetricQueryRange).toHaveBeenCalledTimes(3);
+			},
+			{ timeout: 5000 },
+		);
 
 		const [spanQuery, beforeQuery, afterQuery] = apiCallHistory;
 
@@ -476,17 +484,9 @@ describe('SpanDetailsDrawer', () => {
 		const logsButton = screen.getByRole('radio', { name: /logs/i });
 		fireEvent.click(logsButton);
 
-		// Wait for all API calls to complete first
+		// Wait for logs to load
-		await waitFor(() => {
-			expect(GetMetricQueryRange).toHaveBeenCalledTimes(3);
-		});
-
-		// Wait for all logs to be rendered - both span logs and context logs
 		await waitFor(() => {
 			expect(screen.getByTestId('raw-log-span-log-1')).toBeInTheDocument();
-			expect(screen.getByTestId('raw-log-span-log-2')).toBeInTheDocument();
-			expect(screen.getByTestId('raw-log-context-log-before')).toBeInTheDocument();
-			expect(screen.getByTestId('raw-log-context-log-after')).toBeInTheDocument();
 		});
 
 		// Verify span logs are highlighted