Merge branch 'master' into global

open-telemetry · May 18, 2020 · 4682772 · 4682772
2 parents ac6da8f + 637f982
commit 4682772
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/packages/opentelemetry-plugin-http/src/http.ts b/packages/opentelemetry-plugin-http/src/http.ts
@@ -406,6 +406,8 @@ export class HttpPlugin extends BasePlugin<Http> {
       );
 
       if (utils.isOpenTelemetryRequest(optionsParsed)) {
+        // clone the headers so delete will not modify the user's object
+        optionsParsed.headers = Object.assign({}, optionsParsed.headers);
         delete optionsParsed.headers[utils.OT_REQUEST_HEADER];
         return original.apply(this, [optionsParsed, ...args]);
       }

diff --git a/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts b/packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts
@@ -202,6 +202,7 @@ describe('HttpPlugin', () => {
         const spans = memoryExporter.getFinishedSpans();
         assert.strictEqual(result.data, 'Ok');
         assert.strictEqual(spans.length, 0);
+        assert.strictEqual(options.headers[OT_REQUEST_HEADER], 1);
       });
     });
     describe('with good plugin options', () => {