Merge branch 'main' into release-1.9.1-0.35.1

open-telemetry · Jan 30, 2023 · 9ff7c09 · 9ff7c09
2 parents c09bd26 + 4978743
commit 9ff7c09
Show file tree

Hide file tree

Showing 34 changed files with 31 additions and 48 deletions.
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -22,6 +22,7 @@ All notable changes to experimental packages in this project will be documented
   * Fixes an error where the generated JS files were not included in the esnext package due to a failure of the tsconfig generation
 * fix(sdk-node): register instrumentations early [#3502](https://github.com/open-telemetry/opentelemetry-js/pull/3502) @flarna
 * fix: include tracestate in export [#3569](https://github.com/open-telemetry/opentelemetry-js/pull/3569) @flarna
+* fix(http) Remove outgoing headers normalization [#3557](https://github.com/open-telemetry/opentelemetry-js/pull/3557) @marcinjahn
 
 ## 0.35.0
 

diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json
@@ -58,7 +58,7 @@
     "cpx": "1.5.0",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json
@@ -81,7 +81,7 @@
     "karma-webpack": "4.0.2",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json
@@ -71,7 +71,7 @@
     "cpx": "1.5.0",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
@@ -57,7 +57,7 @@
     "cpx": "1.5.0",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
@@ -81,7 +81,7 @@
     "karma-webpack": "4.0.2",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
@@ -56,7 +56,7 @@
     "cpx": "1.5.0",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json
@@ -51,7 +51,7 @@
     "codecov": "3.8.3",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"

diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json
@@ -74,7 +74,7 @@
     "karma-webpack": "4.0.2",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json
@@ -61,7 +61,7 @@
     "mocha": "10.0.0",
     "node-pre-gyp": "0.17.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "semver": "7.3.5",
     "sinon": "15.0.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json
@@ -63,7 +63,7 @@
     "nyc": "15.1.0",
     "request": "2.88.2",
     "request-promise-native": "1.0.9",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "superagent": "8.0.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts
@@ -276,14 +276,6 @@ export const getRequestInfo = (
     origin = `${optionsParsed.protocol || 'http:'}//${hostname}`;
   }
 
-  const headers = optionsParsed.headers ?? {};
-  optionsParsed.headers = Object.keys(headers).reduce(
-    (normalizedHeader, key) => {
-      normalizedHeader[key.toLowerCase()] = headers[key];
-      return normalizedHeader;
-    },
-    {} as OutgoingHttpHeaders
-  );
   // some packages return method in lowercase..
   // ensure upperCase for consistency
   const method = optionsParsed.method

diff --git a/...rimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts b/...rimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts
@@ -508,11 +508,6 @@ describe('HttpInstrumentation', () => {
               'user-agent': testValue,
             },
           }),
-          httpRequest.get(`${protocol}://${hostname}:${serverPort}`, {
-            headers: {
-              'uSeR-aGeNt': testValue,
-            },
-          }),
         ]);
         const spans = memoryExporter.getFinishedSpans();
         assert.strictEqual(spans.length, 0);

diff --git a/...imental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts b/...imental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts
@@ -460,11 +460,6 @@ describe('HttpsInstrumentation', () => {
               'user-agent': testValue,
             },
           }),
-          httpsRequest.get(`${protocol}://${hostname}:${serverPort}`, {
-            headers: {
-              'uSeR-aGeNt': testValue,
-            },
-          }),
         ]);
         const spans = memoryExporter.getFinishedSpans();
         assert.strictEqual(spans.length, 0);

diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
@@ -74,7 +74,7 @@
     "karma-webpack": "4.0.2",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json
@@ -97,7 +97,7 @@
     "karma-webpack": "4.0.2",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json
@@ -61,7 +61,7 @@
     "cpx": "1.5.0",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json
@@ -67,7 +67,7 @@
     "mocha": "10.0.0",
     "nyc": "15.1.0",
     "protobufjs-cli": "1.0.2",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json
@@ -69,7 +69,7 @@
     "mkdirp": "2.1.3",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",

diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json
@@ -50,7 +50,7 @@
     "codecov": "3.8.3",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },

diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json
@@ -71,7 +71,7 @@
     "karma-webpack": "4.0.2",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json
@@ -64,7 +64,7 @@
     "karma-webpack": "4.0.2",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json
@@ -80,7 +80,7 @@
     "lerna": "6.0.3",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json
@@ -53,7 +53,7 @@
     "mocha": "10.0.0",
     "nock": "13.0.11",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"

diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json
@@ -78,7 +78,7 @@
     "mocha": "10.0.0",
     "nock": "13.0.11",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json
@@ -64,7 +64,7 @@
     "istanbul-instrumenter-loader": "3.0.1",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"

diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json
@@ -69,7 +69,7 @@
     "karma-webpack": "4.0.2",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json
@@ -77,7 +77,7 @@
     "mocha": "10.0.0",
     "nock": "13.0.11",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",

diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json
@@ -80,7 +80,7 @@
     "karma-webpack": "4.0.2",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json
@@ -55,7 +55,7 @@
     "codecov": "3.8.3",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"

diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json
@@ -78,7 +78,7 @@
     "karma-webpack": "4.0.2",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",

diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json
@@ -56,7 +56,7 @@
     "mocha": "10.0.0",
     "nock": "13.0.11",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"

diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json
@@ -51,7 +51,7 @@
     "codecov": "3.8.3",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },

diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json
@@ -68,7 +68,7 @@
     "karma-webpack": "4.0.2",
     "mocha": "10.0.0",
     "nyc": "15.1.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.1.2",
     "sinon": "15.0.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"