Merge branch 'main' into domas-fix-parsing-relative-urls

open-telemetry · Mar 17, 2023 · 814af56 · 814af56
2 parents 44d6a51 + 52facfa
commit 814af56
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -6,6 +6,8 @@ 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)

diff --git 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<XMLHttpRe
       this._diag.debug('ignoring span as url matches ignored url');
       return;
     }
-    const spanName = `HTTP ${method.toUpperCase()}`;
+    const spanName = method.toUpperCase();
 
     const currentSpan = this.tracer.startSpan(spanName, {
       kind: api.SpanKind.CLIENT,

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
@@ -318,7 +318,7 @@ describe('xhr', () => {
 
         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', () => {

diff --git a/selenium-tests/package.json b/selenium-tests/package.json
@@ -40,7 +40,7 @@
     "babel-loader": "8.2.3",
     "babel-polyfill": "6.26.0",
     "browserstack-local": "1.4.8",
-    "chromedriver": "110.0.0",
+    "chromedriver": "111.0.0",
     "dotenv": "16.0.0",
     "fast-safe-stringify": "2.1.1",
     "geckodriver": "3.0.1",