fix(plugin-http): http.url attribute (#580)

closes #579 Signed-off-by: Olivier Albertini <olivier.albertini@montreal.ca>
open-telemetry · Dec 2, 2019 · 06d21e3 · 06d21e3
1 parent 2e4136c
commit 06d21e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/opentelemetry-plugin-http/src/utils.ts b/packages/opentelemetry-plugin-http/src/utils.ts
@@ -40,7 +40,7 @@ export const getAbsoluteUrl = (
   const port = (reqUrlObject.port || '').toString();
   const path = reqUrlObject.path || '/';
   let host =
-    headers.host || reqUrlObject.hostname || headers.host || 'localhost';
+    reqUrlObject.host || reqUrlObject.hostname || headers.host || 'localhost';
 
   // if there is no port in host and there is a port
   // it should be displayed if it's not 80 and 443 (default ports)

diff --git a/packages/opentelemetry-plugin-http/test/utils/assertSpan.ts b/packages/opentelemetry-plugin-http/test/utils/assertSpan.ts
@@ -69,7 +69,7 @@ export const assertSpan = (
     span.attributes[AttributeNames.HTTP_STATUS_CODE],
     validations.httpStatusCode
   );
-  assert.ok(span.endTime);
+
   assert.strictEqual(span.links.length, 0);
   assert.strictEqual(span.events.length, 0);
 
@@ -79,6 +79,13 @@ export const assertSpan = (
       utils.parseResponseStatus(validations.httpStatusCode)
   );
 
+  assert.ok(
+    (span.attributes[AttributeNames.HTTP_URL] as string).indexOf(
+      span.attributes[AttributeNames.HTTP_HOSTNAME] as string
+    ) > -1,
+    'should be consistent'
+  );
+  assert.ok(span.endTime, 'must be finished');
   assert.ok(hrTimeToNanoseconds(span.duration), 'must have positive duration');
 
   if (validations.reqHeaders) {