refactor: test using hr dates

esroyo · May 9, 2024 · 15dffcc · 15dffcc
1 parent 3bb8356
commit 15dffcc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/create-request-handler.ts b/src/create-request-handler.ts
@@ -2,6 +2,7 @@ import {
     calcExpires,
     cloneHeaders,
     denyHeaders,
+    getTime,
     isForbidden,
     isJsResponse,
     isNotFound,
@@ -56,6 +57,7 @@ export function createRequestHandler(
         if (willCache) {
             const cacheKey = [url, buildTarget];
             const cacheWriteSpan = tracer.startSpan('cache-write', {
+                startTime: getTime(),
                 attributes: {
                     'span.type': 'cache',
                     'systemjs.cache.key': cacheKey,
@@ -66,7 +68,7 @@ export function createRequestHandler(
                 responseProps,
                 { expireIn: calcExpires(headers, CACHE_REDIRECT) },
             );
-            cacheWriteSpan.end();
+            cacheWriteSpan.end(getTime());
         }
         if (
             CACHE_CLIENT_REDIRECT &&
@@ -100,6 +102,7 @@ export function createRequestHandler(
         }
         const cacheKey = [redirectLocation, buildTarget];
         const redirectCacheReadSpan = tracer.startSpan('redirect-cache-read', {
+            startTime: getTime(),
             attributes: {
                 'span.type': 'cache',
                 'systemjs.cache.key': cacheKey,
@@ -109,7 +112,7 @@ export function createRequestHandler(
         redirectCacheReadSpan.addEvent(
             cachedValue ? 'redirect-cache-hit' : 'redirect-cache-miss',
         );
-        redirectCacheReadSpan.end();
+        redirectCacheReadSpan.end(getTime());
         if (cachedValue) {
             return createFinalResponse(
                 {
@@ -189,14 +192,15 @@ export function createRequestHandler(
         if (CACHE) {
             const cacheKey = [publicSelfUrl, buildTarget];
             const cacheReadSpan = tracer.startSpan('cache-read', {
+                startTime: getTime(),
                 attributes: {
                     'span.type': 'cache',
                     'systemjs.cache.key': cacheKey,
                 },
             });
             const cachedValue = await cache?.get(cacheKey);
             cacheReadSpan.addEvent(cachedValue ? 'cache-hit' : 'cache-miss');
-            cacheReadSpan.end();
+            cacheReadSpan.end(getTime());
             if (cachedValue) {
                 const response = await createFinalResponse(
                     {
@@ -218,6 +222,7 @@ export function createRequestHandler(
         }
         const upstreamUrlString = upstreamUrl.toString();
         const upstreamSpan = tracer.startSpan('upstream', {
+            startTime: getTime(),
             attributes: {
                 'span.type': 'http',
                 'http.url': upstreamUrlString,
@@ -228,13 +233,15 @@ export function createRequestHandler(
             redirect: 'manual',
         });
         let body = await upstreamResponse.text();
-        upstreamSpan.end();
+        upstreamSpan.end(getTime());
         if (isJsResponse(upstreamResponse)) {
-            const buildSpan = tracer.startSpan('build');
+            const buildSpan = tracer.startSpan('build', {
+                startTime: getTime(),
+            });
             body = replaceOrigin(
                 await toSystemjs(body, { banner: OUTPUT_BANNER }, config),
             );
-            buildSpan.end();
+            buildSpan.end(getTime());
         } else {
             body = replaceOrigin(body);
         }

diff --git a/src/instrument-request-handler.ts b/src/instrument-request-handler.ts
@@ -8,6 +8,7 @@ import {
     SpanKind,
     SpanProcessor,
 } from '../deps.ts';
+import { getTime } from './utils.ts';
 
 export const instrumentRequestHandler = <T extends Deno.ServeHandler>(
     requestHandler: T,
@@ -42,6 +43,7 @@ export const instrumentRequestHandler = <T extends Deno.ServeHandler>(
     ): Promise<Response> => {
         // Create a new root span for this request
         const requestSpan = tracer.startSpan('total', {
+            startTime: getTime(),
             attributes: {
                 'http.client_ip':
                     (req.headers.get('x-forwarded-for') ?? '').split(',')
@@ -75,7 +77,7 @@ export const instrumentRequestHandler = <T extends Deno.ServeHandler>(
         );
 
         requestSpan.setAttribute('http.status_code', response.status);
-        requestSpan.end();
+        requestSpan.end(getTime());
 
         response.headers.set(
             ...serverTimingExporter.getServerTimingHeader(requestSpan),

diff --git a/src/utils.ts b/src/utils.ts
@@ -143,3 +143,8 @@ export const sanitizeUpstreamOrigin = (
     }
     return `${url.origin}${url.pathname}`;
 };
+
+// @ts-ignore
+export const variableTimeOrigin = () => new Date() - performance.now();
+
+export const getTime = () => variableTimeOrigin() + performance.now();