Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix!: span name on instrumentation-xml-http-request #3672

Merged
merged 8 commits into from
Mar 17, 2023
Merged

fix!: span name on instrumentation-xml-http-request #3672

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
36f75df
fix: remove HTTP in span name
jufab Mar 13, 2023
5b326de
fix: add entry in CHANGELOG.md
jufab Mar 13, 2023
4e90596
Merge branch 'open-telemetry:main' into fix-instru-xml-span-name
jufab Mar 14, 2023
d37c928
fix: add breaking change changelog
jufab Mar 14, 2023
2c9d711
Update experimental/packages/opentelemetry-instrumentation-xml-http-r…
jufab Mar 15, 2023
959061a
Merge branch 'main' into fix-instru-xml-span-name
dyladan Mar 17, 2023
5513c03
Remove duplicate changelog entry
dyladan Mar 17, 2023
9d2335a
Merge branch 'main' into fix-instru-xml-span-name
dyladan Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions experimental/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
dyladan marked this conversation as resolved.
Show resolved Hide resolved

### :books: (Refine Doc)

### :house: (Internal)
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}`;
jufab marked this conversation as resolved.
Show resolved Hide resolved

const currentSpan = this.tracer.startSpan(spanName, {
kind: api.SpanKind.CLIENT,
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down