Merge branch 'open-telemetry:main' into clintonb/synchronous-gauge

Author: clintonb

CONTRIBUTING.md

@@ -104,7 +104,7 @@ An entry into `CHANGELOG.md` or `experimental/CHANGELOG.md` is required for the
 - Changes to default settings
 - New components being added
 
-It is reasonable to omit an entry to the changelog under these circuimstances:
+It is reasonable to omit an entry to the changelog under these circumstances:
 
 - Updating test to remove flakiness or improve coverage
 - Updates to the CI/CD process

api/README.md

@@ -36,7 +36,7 @@ npm install @opentelemetry/api @opentelemetry/sdk-trace-base
 
 ### Trace Your Application
 
-In order to get started with tracing, you will need to first register an SDK. The SDK you are using may provide a convenience method which calls the registration methods for you, but if you would like to call them directly they are documented here: [sdk registration methods][docs-sdk-registration].
+In order to get started with tracing, you will need to first register an SDK. The SDK you are using may provide a convenience method which calls the registration methods for you, but if you would like to call them directly they are documented here: [SDK registration methods][docs-sdk-registration].
 
 Once you have registered an SDK, you can start and end spans. A simple example of basic SDK registration and tracing a simple operation is below. The example should export spans to the console once per second. For more information, see the [tracing documentation][docs-tracing].
 

api/test/common/metrics/Metric.test.ts

@@ -42,7 +42,7 @@ describe('Metric', () => {
       const counter: Counter<Attributes> = {
         add(_value: number, _attribute: Attributes) {},
       };
-      // @ts-expect-error Expacting the type of Attributes
+      // @ts-expect-error Expecting the type of Attributes
       counter.add(1, { 'another-attribute': 'value' });
     });
   });
@@ -72,7 +72,7 @@ describe('Metric', () => {
       const counter: UpDownCounter<Attributes> = {
         add(_value: number, _attribute: Attributes) {},
       };
-      // @ts-expect-error Expacting the type of Attributes
+      // @ts-expect-error Expecting the type of Attributes
       counter.add(1, { 'another-attribute': 'value' });
     });
   });
@@ -102,7 +102,7 @@ describe('Metric', () => {
       const counter: Histogram<Attributes> = {
         record(_value: number, _attribute: Attributes) {},
       };
-      // @ts-expect-error Expacting the type of Attributes
+      // @ts-expect-error Expecting the type of Attributes
       counter.record(1, { 'another-attribute': 'value' });
     });
   });

doc/upgrade-guide.md

@@ -107,7 +107,7 @@ Collector exporter packages and types are renamed:
 
 - All plugins have been removed in favor of instrumentations.
 
-- The `@opentelemetry/propagator-b3` package previously exported three propagators: `B3Propagator`,`B3SinglePropagator`, and `B3MultiPropagator`, but now only exports the `B3Propagator`. It extracts b3 context in single and multi-header encodings, and injects context using the single-header encoding by default, but can be configured to inject context using the multi-header endcoding during construction: `new B3Propagator({ injectEncoding: B3InjectEncoding.MULTI_HEADER })`. If you were previously using the `B3SinglePropagator` or `B3MultiPropagator` directly, you should update your code to use the `B3Propagator` with the appropriate configuration. See the [readme][otel-propagator-b3] for full details and usage.
+- The `@opentelemetry/propagator-b3` package previously exported three propagators: `B3Propagator`,`B3SinglePropagator`, and `B3MultiPropagator`, but now only exports the `B3Propagator`. It extracts b3 context in single and multi-header encodings, and injects context using the single-header encoding by default, but can be configured to inject context using the multi-header encoding during construction: `new B3Propagator({ injectEncoding: B3InjectEncoding.MULTI_HEADER })`. If you were previously using the `B3SinglePropagator` or `B3MultiPropagator` directly, you should update your code to use the `B3Propagator` with the appropriate configuration. See the [README][otel-propagator-b3] for full details and usage.
 
 - Sampling configuration via environment variable has changed. If you were using `OTEL_SAMPLING_PROBABILITY` then you should replace it with `OTEL_TRACES_SAMPLER=parentbased_traceidratio` and `OTEL_TRACES_SAMPLER_ARG=<number>` where `<number>` is a number in the [0..1] range, e.g. "0.25". Default is 1.0 if unset.
 
@@ -232,7 +232,7 @@ Some types exported from `"@opentelemetry/api"` have been changed to be more spe
 
 ## 0.15.0 to 0.16.0
 
-[PR-1863](https://github.com/open-telemetry/opentelemetry-js/pull/1863) removed public attributes `keepAlive` and `httpAgentOptions` from nodejs `CollectorTraceExporter` and `CollectorMetricExporter`
+[PR-1863](https://github.com/open-telemetry/opentelemetry-js/pull/1863) removed public attributes `keepAlive` and `httpAgentOptions` from Node.js `CollectorTraceExporter` and `CollectorMetricExporter`
 
 ## 0.14.0 to 0.15.0
 

experimental/CHANGELOG.md

@@ -10,6 +10,9 @@ All notable changes to experimental packages in this project will be documented
 
 ### :bug: (Bug Fix)
 
+* fix(exporter-*-otlp-*): use parseHeaders() to ensure header-values are not 'undefined' #4540
+  * Fixes a bug where passing `undefined` as a header value would crash the end-user app after the export timeout elapsed.
+
 ### :books: (Refine Doc)
 
 ### :house: (Internal)

experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts

@@ -21,7 +21,10 @@ import type {
 import type { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base';
 import type { IExportLogsServiceRequest } from '@opentelemetry/otlp-transformer';
 import { getEnv, baggageUtils } from '@opentelemetry/core';
-import { OTLPExporterNodeBase } from '@opentelemetry/otlp-exporter-base';
+import {
+  OTLPExporterNodeBase,
+  parseHeaders,
+} from '@opentelemetry/otlp-exporter-base';
 import { createExportLogsServiceRequest } from '@opentelemetry/otlp-transformer';
 
 import { getDefaultUrl } from '../config';
@@ -50,7 +53,7 @@ export class OTLPLogExporter
       ...baggageUtils.parseKeyPairsIntoRecord(
         getEnv().OTEL_EXPORTER_OTLP_LOGS_HEADERS
       ),
-      ...config.headers,
+      ...parseHeaders(config?.headers),
     };
   }
 

experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogExporter.ts

@@ -19,6 +19,7 @@ import {
   OTLPExporterConfigBase,
   appendResourcePathToUrl,
   appendRootPathToUrlIfNeeded,
+  parseHeaders,
 } from '@opentelemetry/otlp-exporter-base';
 import {
   OTLPProtoExporterNodeBase,
@@ -57,7 +58,7 @@ export class OTLPLogExporter
       ...baggageUtils.parseKeyPairsIntoRecord(
         getEnv().OTEL_EXPORTER_OTLP_LOGS_HEADERS
       ),
-      ...config.headers,
+      ...parseHeaders(config?.headers),
     };
   }
   convert(logs: ReadableLogRecord[]): IExportLogsServiceRequest {

experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts

@@ -16,7 +16,10 @@
 
 import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base';
 import { getEnv, baggageUtils } from '@opentelemetry/core';
-import { OTLPExporterNodeBase } from '@opentelemetry/otlp-exporter-base';
+import {
+  OTLPExporterNodeBase,
+  parseHeaders,
+} from '@opentelemetry/otlp-exporter-base';
 import {
   OTLPExporterNodeConfigBase,
   appendResourcePathToUrl,
@@ -49,7 +52,7 @@ export class OTLPTraceExporter
       ...baggageUtils.parseKeyPairsIntoRecord(
         getEnv().OTEL_EXPORTER_OTLP_TRACES_HEADERS
       ),
-      ...config.headers,
+      ...parseHeaders(config?.headers),
     };
   }
 

experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts

@@ -20,6 +20,7 @@ import {
   OTLPExporterNodeConfigBase,
   appendResourcePathToUrl,
   appendRootPathToUrlIfNeeded,
+  parseHeaders,
 } from '@opentelemetry/otlp-exporter-base';
 import {
   OTLPProtoExporterNodeBase,
@@ -52,7 +53,7 @@ export class OTLPTraceExporter
       ...baggageUtils.parseKeyPairsIntoRecord(
         getEnv().OTEL_EXPORTER_OTLP_TRACES_HEADERS
       ),
-      ...config.headers,
+      ...parseHeaders(config?.headers),
     };
   }
 

experimental/packages/opentelemetry-browser-detector/README.md

@@ -51,4 +51,4 @@ start().then(()=> console.log("Instrumentation started"));
 
 The browser identification attributes will be added to the resource spans when traces are created.
 These attributes include platform, brands, mobile, language if the browser supports
-the userAgentData api, otherwise it will contain only the user_agent informations
+the userAgentData api, otherwise it will contain only the user_agent information

experimental/packages/opentelemetry-browser-detector/src/types.ts

@@ -20,7 +20,7 @@ export type UserAgentData = {
 };
 
 export const BROWSER_ATTRIBUTES = {
-  PLATFORM: 'browser.platform', //TODO replace with SemantecConventions attribute when available
+  PLATFORM: 'browser.platform', //TODO replace with SemanticConventions attribute when available
   BRANDS: 'browser.brands',
   MOBILE: 'browser.mobile',
   LANGUAGE: 'browser.language',

experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts

@@ -33,6 +33,7 @@ import {
   IExportMetricsServiceResponse,
 } from '@opentelemetry/otlp-transformer';
 import { VERSION } from './version';
+import { parseHeaders } from '@opentelemetry/otlp-exporter-base';
 
 const USER_AGENT = {
   'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`,
@@ -49,7 +50,7 @@ class OTLPMetricExporterProxy extends OTLPGRPCExporterNodeBase<
       ...baggageUtils.parseKeyPairsIntoRecord(
         getEnv().OTEL_EXPORTER_OTLP_METRICS_HEADERS
       ),
-      ...config?.headers,
+      ...parseHeaders(config?.headers),
     };
     super(
       config,

experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts

@@ -23,6 +23,7 @@ import {
   OTLPExporterNodeConfigBase,
   appendResourcePathToUrl,
   appendRootPathToUrlIfNeeded,
+  parseHeaders,
 } from '@opentelemetry/otlp-exporter-base';
 import {
   createExportMetricsServiceRequest,
@@ -48,7 +49,7 @@ class OTLPExporterNodeProxy extends OTLPExporterNodeBase<
       ...baggageUtils.parseKeyPairsIntoRecord(
         getEnv().OTEL_EXPORTER_OTLP_METRICS_HEADERS
       ),
-      ...config?.headers,
+      ...parseHeaders(config?.headers),
     };
   }
 

experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/OTLPMetricExporter.ts

@@ -26,6 +26,7 @@ import {
   OTLPExporterNodeConfigBase,
   appendResourcePathToUrl,
   appendRootPathToUrlIfNeeded,
+  parseHeaders,
 } from '@opentelemetry/otlp-exporter-base';
 import {
   createExportMetricsServiceRequest,
@@ -51,7 +52,7 @@ class OTLPMetricExporterNodeProxy extends OTLPProtoExporterNodeBase<
       ...baggageUtils.parseKeyPairsIntoRecord(
         getEnv().OTEL_EXPORTER_OTLP_METRICS_HEADERS
       ),
-      ...config?.headers,
+      ...parseHeaders(config?.headers),
     };
   }
 

experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts

@@ -654,7 +654,7 @@ describe('fetch', () => {
       clearData();
     });
 
-    it('applies attributes when the request is succesful', async () => {
+    it('applies attributes when the request is successful', async () => {
       await prepare(url, span => {
         span.setAttribute(CUSTOM_ATTRIBUTE_KEY, 'custom value');
       });

experimental/packages/opentelemetry-instrumentation-grpc/src/clientUtils.ts

@@ -152,7 +152,7 @@ export function patchResponseStreamEvents(span: Span, call: EventEmitter) {
 }
 
 /**
- * Execute grpc client call. Apply completitionspan properties and end the
+ * Execute grpc client call. Apply completion span properties and end the
  * span on callback or receiving an emitted event.
  */
 export function makeGrpcClientRemoteCall(

experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts

@@ -136,7 +136,7 @@ export async function startServer(proto: any, port: number) {
   server.addService(proto.GrpcTester.service, {
     // An error is emitted every time
     // request.num <= MAX_ERROR_STATUS = (status.UNAUTHENTICATED)
-    // in those cases, erro.code = request.num
+    // in those cases, error.code = request.num
 
     // This method returns the request
     // This method returns the request

experimental/packages/opentelemetry-instrumentation-http/README.md

@@ -67,7 +67,7 @@ The following options are deprecated:
 | Options | Type | Description |
 | ------- | ---- | ----------- |
 | `ignoreIncomingPaths` | `IgnoreMatcher[]` | Http instrumentation will not trace all incoming requests that match paths |
-| `ignoreOutgoingUrls` | `IgnoreMatcher[]` | Http instrumentation will not trace all outgoing requests that match urls |
+| `ignoreOutgoingUrls` | `IgnoreMatcher[]` | Http instrumentation will not trace all outgoing requests that match URLs |
 
 ## Useful links
 

experimental/packages/opentelemetry-instrumentation-http/src/utils.ts

@@ -373,7 +373,7 @@ export const getOutgoingRequestMetricAttributes = (
     spanAttributes[SemanticAttributes.HTTP_METHOD];
   metricAttributes[SemanticAttributes.NET_PEER_NAME] =
     spanAttributes[SemanticAttributes.NET_PEER_NAME];
-  //TODO: http.url attribute, it should susbtitute any parameters to avoid high cardinality.
+  //TODO: http.url attribute, it should substitute any parameters to avoid high cardinality.
   return metricAttributes;
 };
 
@@ -514,7 +514,7 @@ export const getIncomingRequestMetricAttributes = (
     spanAttributes[SemanticAttributes.NET_HOST_NAME];
   metricAttributes[SemanticAttributes.HTTP_FLAVOR] =
     spanAttributes[SemanticAttributes.HTTP_FLAVOR];
-  //TODO: http.target attribute, it should susbtitute any parameters to avoid high cardinality.
+  //TODO: http.target attribute, it should substitute any parameters to avoid high cardinality.
   return metricAttributes;
 };
 

experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts

@@ -555,7 +555,7 @@ describe('HttpInstrumentation', () => {
       });
 
       for (const arg of ['string', {}, new Date()]) {
-        it(`should be tracable and not throw exception in ${protocol} instrumentation when passing the following argument ${JSON.stringify(
+        it(`should be traceable and not throw exception in ${protocol} instrumentation when passing the following argument ${JSON.stringify(
           arg
         )}`, async () => {
           try {
@@ -1101,10 +1101,10 @@ describe('HttpInstrumentation', () => {
 
       it('should set rpc metadata for incoming http request', async () => {
         server = http.createServer((request, response) => {
-          const rpcMemadata = getRPCMetadata(context.active());
-          assert(typeof rpcMemadata !== 'undefined');
-          assert(rpcMemadata.type === RPCType.HTTP);
-          assert(rpcMemadata.span.setAttribute('key', 'value'));
+          const rpcMetadata = getRPCMetadata(context.active());
+          assert(typeof rpcMetadata !== 'undefined');
+          assert(rpcMetadata.type === RPCType.HTTP);
+          assert(rpcMetadata.span.setAttribute('key', 'value'));
           response.end('Test Server Response');
         });
         await new Promise<void>(resolve => server.listen(serverPort, resolve));

experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts

@@ -465,7 +465,7 @@ describe('HttpsInstrumentation', () => {
       });
 
       for (const arg of ['string', {}, new Date()]) {
-        it(`should be tracable and not throw exception in ${protocol} instrumentation when passing the following argument ${JSON.stringify(
+        it(`should be traceable and not throw exception in ${protocol} instrumentation when passing the following argument ${JSON.stringify(
           arg
         )}`, async () => {
           try {

experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts

@@ -311,7 +311,7 @@ describe('Utility', () => {
       );
     });
 
-    it('should succesfully process without middleware stack', () => {
+    it('should successfully process without middleware stack', () => {
       const request = {
         socket: {},
       } as IncomingMessage;

experimental/packages/opentelemetry-instrumentation/README.md

@@ -216,13 +216,13 @@ registerInstrumentations({
 The `registerInstrumentations()` API allows to specify which `TracerProvider` and/or `MeterProvider` to use by the given options object.
 If nothing is specified the global registered provider is used. Usually this is what most users want therefore it's recommended to keep this default.
 
-There might be usecase where someone has the need for more providers within an application. Please note that special care must be takes in such setups
+There might be use case where someone has the need for more providers within an application. Please note that special care must be takes in such setups
 to avoid leaking information from one provider to the other because there are a lot places where e.g. the global `ContextManager` or `Propagator` is used.
 
-## Instrumentation for ES Modules In NodeJS (experimental)
+## Instrumentation for ES Modules In Node.js (experimental)
 
-As the module loading mechanism for ESM is different than CJS, you need to select a custom loader so instrumentation can load hook on the esm module it want to patch. To do so, you must provide the `--experimental-loader=@opentelemetry/instrumentation/hook.mjs` flag to the `node` binary. Alternatively you can set the `NODE_OPTIONS` environment variable to `NODE_OPTIONS="--experimental-loader=@opentelemetry/instrumentation/hook.mjs"`.
-As the ESM module loader from NodeJS is experimental, so is our support for it. Feel free to provide feedback or report issues about it.
+As the module loading mechanism for ESM is different than CJS, you need to select a custom loader so instrumentation can load hook on the ESM module it want to patch. To do so, you must provide the `--experimental-loader=@opentelemetry/instrumentation/hook.mjs` flag to the `node` binary. Alternatively you can set the `NODE_OPTIONS` environment variable to `NODE_OPTIONS="--experimental-loader=@opentelemetry/instrumentation/hook.mjs"`.
+As the ESM module loader from Node.js is experimental, so is our support for it. Feel free to provide feedback or report issues about it.
 
 **Note**: ESM Instrumentation is not yet supported for Node 20.
 

experimental/packages/opentelemetry-sdk-node/README.md

@@ -132,7 +132,7 @@ An array of span processors to register to the tracer provider.
 
 ### traceExporter
 
-Configure a trace exporter. If an exporter is configured, it will be used with a [BatchSpanProcessor](../../../packages/opentelemetry-sdk-trace-base/src/platform/node/export/BatchSpanProcessor.ts). If an exporter OR span processor is not configured programatically, this package will auto setup the default `otlp` exporter  with `http/protobuf` protocol with a `BatchSpanProcessor`.
+Configure a trace exporter. If an exporter is configured, it will be used with a [BatchSpanProcessor](../../../packages/opentelemetry-sdk-trace-base/src/platform/node/export/BatchSpanProcessor.ts). If an exporter OR span processor is not configured programmatically, this package will auto setup the default `otlp` exporter  with `http/protobuf` protocol with a `BatchSpanProcessor`.
 
 ### spanLimits
 

experimental/packages/opentelemetry-sdk-node/test/TracerProviderWithEnvExporter.test.ts

@@ -132,7 +132,7 @@ describe('set up trace exporter with env exporters', () => {
       assert(listOfProcessors === undefined);
       delete env.OTEL_TRACES_EXPORTER;
     });
-    it('log warning that sdk will not be initalized when exporter is set to none', async () => {
+    it('log warning that sdk will not be initialized when exporter is set to none', async () => {
       env.OTEL_TRACES_EXPORTER = 'none';
       new TracerProviderWithEnvExporters();
 

experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts

@@ -951,7 +951,7 @@ describe('setup exporter from env', () => {
     assert(activeProcessor instanceof NoopSpanProcessor);
     delete env.OTEL_TRACES_EXPORTER;
   });
-  it('log warning that sdk will not be initalized when exporter is set to none', async () => {
+  it('log warning that sdk will not be initialized when exporter is set to none', async () => {
     env.OTEL_TRACES_EXPORTER = 'none';
     const sdk = new NodeSDK();
     sdk.start();

experimental/packages/otlp-exporter-base/src/util.ts

@@ -35,7 +35,9 @@ export function parseHeaders(
     if (typeof value !== 'undefined') {
       headers[key] = String(value);
     } else {
-      diag.warn(`Header "${key}" has wrong value and will be ignored`);
+      diag.warn(
+        `Header "${key}" has invalid value (${value}) and will be ignored`
+      );
     }
   });
   return headers;