From 36f75dff0d02b677c2684b1514e5d9968f457fde Mon Sep 17 00:00:00 2001 From: Julien Fabre Date: Mon, 13 Mar 2023 22:56:33 +0000 Subject: [PATCH 1/5] fix: remove HTTP in span name --- .../opentelemetry-instrumentation-xml-http-request/src/xhr.ts | 2 +- .../test/xhr.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts index 238119f09d2..63c9c8b60d5 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts @@ -329,7 +329,7 @@ export class XMLHttpRequestInstrumentation extends InstrumentationBase { it('span should have correct name', () => { const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; - assert.strictEqual(span.name, 'HTTP GET', 'span has wrong name'); + assert.strictEqual(span.name, 'GET', 'span has wrong name'); }); it('span should have correct kind', () => { From 5b326de06530fe5d8c28d768420bff1dc4b1839c Mon Sep 17 00:00:00 2001 From: Julien Fabre Date: Mon, 13 Mar 2023 23:00:08 +0000 Subject: [PATCH 2/5] fix: add entry in CHANGELOG.md --- experimental/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index ddf59a324bb..c2c19416e28 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -10,6 +10,8 @@ All notable changes to experimental packages in this project will be documented ### :bug: (Bug Fix) +* fix: remove HTTP/HTTPS prefix from span name in instrumentation-xml-http-request + ### :books: (Refine Doc) ### :house: (Internal) From d37c928a4b6451b006cc06163503e403abada188 Mon Sep 17 00:00:00 2001 From: Julien Fabre Date: Tue, 14 Mar 2023 21:31:44 +0100 Subject: [PATCH 3/5] fix: add breaking change changelog --- experimental/CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index c2c19416e28..4a900885e91 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -6,11 +6,13 @@ All notable changes to experimental packages in this project will be documented ### :boom: Breaking Change +* fix: remove HTTP/HTTPS prefix from span name in instrumentation-xml-http-request [#3672](https://github.com/open-telemetry/opentelemetry-js/pull/3672) @jufab + ### :rocket: (Enhancement) ### :bug: (Bug Fix) -* fix: remove HTTP/HTTPS prefix from span name in instrumentation-xml-http-request +* fix: remove HTTP/HTTPS prefix from span name in instrumentation-xml-http-request [#3672](https://github.com/open-telemetry/opentelemetry-js/pull/3672) @jufab ### :books: (Refine Doc) From 2c9d711e032363c7f3736f13538e4402425e686d Mon Sep 17 00:00:00 2001 From: Julien Fabre Date: Wed, 15 Mar 2023 21:25:36 +0100 Subject: [PATCH 4/5] Update experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gerhard Stöbich --- .../opentelemetry-instrumentation-xml-http-request/src/xhr.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts index 63c9c8b60d5..42eb9abb0bb 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts @@ -329,7 +329,7 @@ export class XMLHttpRequestInstrumentation extends InstrumentationBase Date: Fri, 17 Mar 2023 10:07:28 -0400 Subject: [PATCH 5/5] Remove duplicate changelog entry --- experimental/CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 4a900885e91..fb483c71728 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -12,8 +12,6 @@ All notable changes to experimental packages in this project will be documented ### :bug: (Bug Fix) -* fix: remove HTTP/HTTPS prefix from span name in instrumentation-xml-http-request [#3672](https://github.com/open-telemetry/opentelemetry-js/pull/3672) @jufab - ### :books: (Refine Doc) ### :house: (Internal)