Merge branch 'main' into update-otlp-proto-exporter-protobuf-7.1.2

open-telemetry · Nov 22, 2022 · 06a4969 · 06a4969
2 parents 6282882 + c9a3494
commit 06a4969
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -13,6 +13,8 @@ All notable changes to experimental packages in this project will be documented
 
 ### :bug: (Bug Fix)
 
+* fix(instrumentation-xhr): http.url attribute should be absolute [#3200](https://github.com/open-telemetry/opentelemetry-js/pull/3200) @t2t2
+
 ### :books: (Refine Doc)
 
 ### :house: (Internal)

diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts b/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts
@@ -837,6 +837,17 @@ describe('fetch', () => {
         `event ${PTN.REQUEST_START} is not defined`
       );
     });
+
+    it('should have an absolute http.url attribute', () => {
+      const span: tracing.ReadableSpan = exportSpy.args[0][0][0];
+      const attributes = span.attributes;
+
+      assert.strictEqual(
+        attributes[SemanticAttributes.HTTP_URL],
+        location.origin + '/get',
+        `attributes ${SemanticAttributes.HTTP_URL} is wrong`
+      );
+    });
   });
 
   describe('when PerformanceObserver is undefined', () => {

diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts
@@ -339,7 +339,7 @@ export class XMLHttpRequestInstrumentation extends InstrumentationBase<XMLHttpRe
       kind: api.SpanKind.CLIENT,
       attributes: {
         [SemanticAttributes.HTTP_METHOD]: method,
-        [SemanticAttributes.HTTP_URL]: url,
+        [SemanticAttributes.HTTP_URL]: parseUrl(url).toString(),
       },
     });
 

diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts
@@ -787,6 +787,17 @@ describe('xhr', () => {
               `event ${PTN.REQUEST_START} is not defined`
             );
           });
+
+          it('should have an absolute http.url attribute', () => {
+            const span: tracing.ReadableSpan = exportSpy.args[0][0][0];
+            const attributes = span.attributes;
+
+            assert.strictEqual(
+              attributes[SemanticAttributes.HTTP_URL],
+              location.origin + '/get',
+              `attributes ${SemanticAttributes.HTTP_URL} is wrong`
+            );
+          });
         });
 
       });