Merge branch 'main' into deps/fixup

open-telemetry · Nov 22, 2022 · b43081a · b43081a
2 parents e3da68a + 3290b25
commit b43081a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 2 deletions.
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -13,10 +13,14 @@ 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)
 
+* chore(otlp-proto-exporter-base): upgrade protobufjs to 7.1.2 and relax versioning [#3433](https://github.com/open-telemetry/opentelemetry-js/pull/3433) @seemk
+
 ## 0.34.0
 
 * `@opentelemetry/sdk-metrics` moved to [packages/sdk-metrics](../packages/sdk-metrics)

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`
+            );
+          });
         });
 
       });

diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json
@@ -65,7 +65,7 @@
   "dependencies": {
     "@opentelemetry/core": "1.8.0",
     "@opentelemetry/otlp-exporter-base": "0.34.0",
-    "protobufjs": "7.1.1"
+    "protobufjs": "^7.1.2"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-proto-exporter-base",
   "sideEffects": false