From 336a57062f9bea843080c5774e174118929e618a Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <ys@uber.com>
Date: Sat, 23 Dec 2017 13:25:11 -0500
Subject: [PATCH 1/4] Add View Option for raw/unadjusted trace

Signed-off-by: Yuri Shkuro <ys@uber.com>
---
 src/components/TracePage/TracePageHeader.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/TracePage/TracePageHeader.js b/src/components/TracePage/TracePageHeader.js
index 089cf3ede6..503cade02c 100644
--- a/src/components/TracePage/TracePageHeader.js
+++ b/src/components/TracePage/TracePageHeader.js
@@ -104,7 +104,12 @@ export default function TracePageHeader(props: TracePageHeaderProps) {
               <Dropdown.Menu>
                 <Dropdown.Item>
                   <a rel="noopener noreferrer" target="_blank" href={`/api/traces/${traceID}`}>
-                    View Trace JSON
+                    Trace JSON
+                  </a>
+                </Dropdown.Item>
+                <Dropdown.Item>
+                  <a rel="noopener noreferrer" target="_blank" href={`/api/traces/${traceID}/?raw=true`}>
+                    Trace JSON (unadjusted)
                   </a>
                 </Dropdown.Item>
               </Dropdown.Menu>

From 575114d5f24ba25653c6e50dfca64ce9a14b2bd3 Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <ys@uber.com>
Date: Sat, 23 Dec 2017 19:15:40 -0500
Subject: [PATCH 2/4] Remove /

Signed-off-by: Yuri Shkuro <ys@uber.com>
---
 src/components/TracePage/TracePageHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TracePage/TracePageHeader.js b/src/components/TracePage/TracePageHeader.js
index 503cade02c..d581ec95dd 100644
--- a/src/components/TracePage/TracePageHeader.js
+++ b/src/components/TracePage/TracePageHeader.js
@@ -108,7 +108,7 @@ export default function TracePageHeader(props: TracePageHeaderProps) {
                   </a>
                 </Dropdown.Item>
                 <Dropdown.Item>
-                  <a rel="noopener noreferrer" target="_blank" href={`/api/traces/${traceID}/?raw=true`}>
+                  <a rel="noopener noreferrer" target="_blank" href={`/api/traces/${traceID}?raw=true`}>
                     Trace JSON (unadjusted)
                   </a>
                 </Dropdown.Item>

From 27c168a7579798dd5662a0c2ac446ae27295887f Mon Sep 17 00:00:00 2001
From: Joe Farro <joef@uber.com>
Date: Sat, 23 Dec 2017 22:51:38 -0500
Subject: [PATCH 3/4] Add missing prefixUrl adjustment

Signed-off-by: Joe Farro <joef@uber.com>
---
 src/components/TracePage/TracePageHeader.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/TracePage/TracePageHeader.js b/src/components/TracePage/TracePageHeader.js
index d581ec95dd..b0302e6b08 100644
--- a/src/components/TracePage/TracePageHeader.js
+++ b/src/components/TracePage/TracePageHeader.js
@@ -20,6 +20,7 @@ import { Dropdown, Menu } from 'semantic-ui-react';
 import KeyboardShortcutsHelp from './KeyboardShortcutsHelp';
 import { FALLBACK_TRACE_NAME } from '../../constants';
 import { formatDatetime, formatDuration } from '../../utils/date';
+import prefixUrl from '../../utils/prefix-url';
 
 type TracePageHeaderProps = {
   traceID: string,
@@ -103,12 +104,16 @@ export default function TracePageHeader(props: TracePageHeaderProps) {
             <Dropdown text="View Options" className="item">
               <Dropdown.Menu>
                 <Dropdown.Item>
-                  <a rel="noopener noreferrer" target="_blank" href={`/api/traces/${traceID}`}>
+                  <a rel="noopener noreferrer" target="_blank" href={prefixUrl(`/api/traces/${traceID}`)}>
                     Trace JSON
                   </a>
                 </Dropdown.Item>
                 <Dropdown.Item>
-                  <a rel="noopener noreferrer" target="_blank" href={`/api/traces/${traceID}?raw=true`}>
+                  <a
+                    rel="noopener noreferrer"
+                    target="_blank"
+                    href={prefixUrl(`/api/traces/${traceID}?raw=true`)}
+                  >
                     Trace JSON (unadjusted)
                   </a>
                 </Dropdown.Item>

From fa904d111243a6786ae09f2feb65b94254736638 Mon Sep 17 00:00:00 2001
From: Joe Farro <joef@uber.com>
Date: Sat, 23 Dec 2017 22:52:01 -0500
Subject: [PATCH 4/4] Fix failing unit test

Signed-off-by: Joe Farro <joef@uber.com>
---
 src/components/SearchTracePage/TraceSearchForm.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/SearchTracePage/TraceSearchForm.js b/src/components/SearchTracePage/TraceSearchForm.js
index ada0fa5add..3719c98070 100644
--- a/src/components/SearchTracePage/TraceSearchForm.js
+++ b/src/components/SearchTracePage/TraceSearchForm.js
@@ -68,14 +68,14 @@ export function convertQueryParamsToFormDates({ start, end }) {
   let queryEndDate;
   let queryEndDateTime;
   if (end) {
-    const endUnix = moment(parseInt(end.replace('000', ''), 10));
-    queryEndDate = formatDate(endUnix * 1000);
-    queryEndDateTime = formatTime(endUnix * 1000);
+    const endUnixNs = parseInt(end, 10);
+    queryEndDate = formatDate(endUnixNs);
+    queryEndDateTime = formatTime(endUnixNs);
   }
   if (start) {
-    const startUnix = moment(parseInt(start.replace('000', ''), 10));
-    queryStartDate = formatDate(startUnix * 1000);
-    queryStartDateTime = formatTime(startUnix * 1000);
+    const startUnixNs = parseInt(start, 10);
+    queryStartDate = formatDate(startUnixNs);
+    queryStartDateTime = formatTime(startUnixNs);
   }
 
   return {