From a398188e6986ddd681ab80627a7d0c97048fc464 Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Tue, 21 May 2024 10:03:31 +0100
Subject: [PATCH] Revert: Tempo: Always use time range even if timeShiftEnabled
 is false (#88095)

Revert "Tempo: Always use time range even if timeShiftEnabled is false (#85477)"

This reverts commit e91136338a24eed4be01d84a0d0c6dc914d689db.
---
 .../datasource/tempo/datasource.test.ts       |  4 +--
 .../plugins/datasource/tempo/datasource.ts    | 25 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/public/app/plugins/datasource/tempo/datasource.test.ts b/public/app/plugins/datasource/tempo/datasource.test.ts
index 85f67b97a44..957eefec24a 100644
--- a/public/app/plugins/datasource/tempo/datasource.test.ts
+++ b/public/app/plugins/datasource/tempo/datasource.test.ts
@@ -434,8 +434,8 @@ describe('Tempo data source', () => {
       [{ refId: 'refid1', queryType: 'traceql', query: '' } as TempoQuery]
     );
 
-    expect(request.range.from.unix()).toBe(dateTime(new Date(2022, 8, 13, 16, 0, 0, 0)).unix());
-    expect(request.range.to.unix()).toBe(dateTime(new Date(2022, 8, 13, 16, 15, 0, 0)).unix());
+    expect(request.range.from.unix()).toBe(dateTime(0).unix());
+    expect(request.range.to.unix()).toBe(dateTime(0).unix());
   });
 });
 
diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts
index 1624e47efb5..e69237518c0 100644
--- a/public/app/plugins/datasource/tempo/datasource.ts
+++ b/public/app/plugins/datasource/tempo/datasource.ts
@@ -12,6 +12,7 @@ import {
   DataQueryResponseData,
   DataSourceGetTagValuesOptions,
   DataSourceInstanceSettings,
+  dateTime,
   FieldType,
   LoadingState,
   rangeUtil,
@@ -665,18 +666,18 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
       targets,
     };
 
-    request.range = options.range && {
-      ...options.range,
-      from: this.traceQuery?.timeShiftEnabled
-        ? options.range.from.subtract(
-            rangeUtil.intervalToMs(this.traceQuery?.spanStartTimeShift || '30m'),
-            'milliseconds'
-          )
-        : options.range.from,
-      to: this.traceQuery?.timeShiftEnabled
-        ? options.range.to.add(rangeUtil.intervalToMs(this.traceQuery?.spanEndTimeShift || '30m'), 'milliseconds')
-        : options.range.to,
-    };
+    if (this.traceQuery?.timeShiftEnabled) {
+      request.range = options.range && {
+        ...options.range,
+        from: options.range.from.subtract(
+          rangeUtil.intervalToMs(this.traceQuery?.spanStartTimeShift || '30m'),
+          'milliseconds'
+        ),
+        to: options.range.to.add(rangeUtil.intervalToMs(this.traceQuery?.spanEndTimeShift || '30m'), 'milliseconds'),
+      };
+    } else {
+      request.range = { from: dateTime(0), to: dateTime(0), raw: { from: dateTime(0), to: dateTime(0) } };
+    }
 
     return request;
   }