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: do not crash on fetch(new Request(url)) #1274

Merged
merged 4 commits into from
Jul 8, 2020
Merged

fix: do not crash on fetch(new Request(url)) #1274

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6096158
fix: do not crash on fetch(new Request(url))
dyladan Jul 2, 2020
ecbb6f1
chore: fix headers type
dyladan Jul 6, 2020
4e1a1bb
Merge branch 'master' into fix-fetch-request
dyladan Jul 7, 2020
177bfad
Merge branch 'master' into fix-fetch-request
dyladan Jul 7, 2020
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
18 changes: 12 additions & 6 deletions packages/opentelemetry-plugin-fetch/src/fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export class FetchPlugin extends core.BasePlugin<Promise<Response>> {
* @param options
* @param spanUrl
*/
private _addHeaders(options: RequestInit, spanUrl: string): void {
private _addHeaders(options: Request | RequestInit, spanUrl: string): void {
if (
!web.shouldPropagateTraceHeaders(
spanUrl,
Expand All @@ -107,9 +107,16 @@ export class FetchPlugin extends core.BasePlugin<Promise<Response>> {
) {
return;
}
const headers: { [key: string]: unknown } = {};
api.propagation.inject(headers);
options.headers = Object.assign({}, headers, options.headers || {});

if (options instanceof Request) {
api.propagation.inject(options.headers, (h, k, v) =>
h.set(k, typeof v === 'string' ? v : String(v))
);
} else {
const headers: { [key: string]: unknown } = {};
dyladan marked this conversation as resolved.
Show resolved Hide resolved
api.propagation.inject(headers);
options.headers = Object.assign({}, headers, options.headers || {});
}
}

/**
Expand Down Expand Up @@ -242,8 +249,7 @@ export class FetchPlugin extends core.BasePlugin<Promise<Response>> {
init?: RequestInit
): Promise<Response> {
const url = input instanceof Request ? input.url : input;
const options: RequestInit =
input instanceof Request ? input : init || {};
const options = input instanceof Request ? input : init || {};

const span = plugin._createSpan(url, options);
if (!span) {
Expand Down
8 changes: 7 additions & 1 deletion packages/opentelemetry-plugin-fetch/test/fetch.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ describe('fetch', () => {
sandbox.stub(core.otperformance, 'timeOrigin').value(0);
sandbox.stub(core.otperformance, 'now').callsFake(() => fakeNow);

function fakeFetch(input: RequestInfo, init: RequestInit = {}) {
function fakeFetch(input: RequestInfo | Request, init: RequestInit = {}) {
return new Promise((resolve, reject) => {
const response: any = {
args: {},
Expand Down Expand Up @@ -455,6 +455,12 @@ describe('fetch', () => {
);
});

it('should set trace headers with a request object', () => {
const r = new Request('url');
window.fetch(r);
assert.ok(typeof r.headers.get(core.X_B3_TRACE_ID) === 'string');
});

it('should NOT clear the resources', () => {
assert.strictEqual(
clearResourceTimingsSpy.args.length,
Expand Down