Merge branch 'main' into tm-markdown-lint

README.md

@@ -205,7 +205,7 @@ We have a weekly SIG meeting! See the [community page](https://github.com/open-t
 
 #### Maintainers ([@open-telemetry/javascript-maintainers](https://github.com/orgs/open-telemetry/teams/javascript-maintainers))
 
-- [Amir Blum](https://github.com/blumamir), Keyval
+- [Amir Blum](https://github.com/blumamir), Odigos
 - [Chengzhong Wu](https://github.com/legendecas), Bloomberg
 - [Daniel Dyla](https://github.com/dyladan), Dynatrace
 - [Marc Pichler](https://github.com/pichlermarc), Dynatrace

experimental/CHANGELOG.md

@@ -18,6 +18,7 @@ All notable changes to experimental packages in this project will be documented
     * (internal) OTLPExporterBrowserBase: `RequestType` has been replaced by a `ResponseType` type-argument
     * (internal) OTLPExporterNodeBase: `ServiceRequest` has been replaced by a `ServiceResponse` type-argument
     * (internal) the `@opentelemetry/otlp-exporter-proto-base` package has been removed, and will from now on be deprecated in `npm`
+* feat(instrumentation): remove default value for config in base instrumentation constructor [#4695](https://github.com/open-telemetry/opentelemetry-js/pull/4695): @blumamir
 * fix(instrumentation)!: remove unused supportedVersions from Instrumentation interface [#4694](https://github.com/open-telemetry/opentelemetry-js/pull/4694) @blumamir
 
 ### :rocket: (Enhancement)

experimental/packages/opentelemetry-instrumentation-fetch/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opentelemetry/instrumentation-fetch",
   "version": "0.51.1",
-  "description": "OpenTelemetry fetch automatic instrumentation package.",
+  "description": "OpenTelemetry instrumentation for fetch http client in web browsers",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
   "esnext": "build/esnext/index.js",

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

@@ -79,7 +79,7 @@ export class FetchInstrumentation extends InstrumentationBase<FetchInstrumentati
   private _usedResources = new WeakSet<PerformanceResourceTiming>();
   private _tasksCount = 0;
 
-  constructor(config?: FetchInstrumentationConfig) {
+  constructor(config: FetchInstrumentationConfig = {}) {
     super('@opentelemetry/instrumentation-fetch', VERSION, config);
   }
 

experimental/packages/opentelemetry-instrumentation-grpc/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opentelemetry/instrumentation-grpc",
   "version": "0.51.1",
-  "description": "OpenTelemetry grpc automatic instrumentation package.",
+  "description": "OpenTelemetry instrumentation for `@grpc/grpc-js` rpc client and server for gRPC framework",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
   "repository": "open-telemetry/opentelemetry-js",

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

@@ -90,7 +90,7 @@ import { VERSION } from './version';
 export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentationConfig> {
   private _metadataCapture: metadataCaptureType;
 
-  constructor(config?: GrpcInstrumentationConfig) {
+  constructor(config: GrpcInstrumentationConfig = {}) {
     super('@opentelemetry/instrumentation-grpc', VERSION, config);
     this._metadataCapture = this._createMetadataCapture();
   }

experimental/packages/opentelemetry-instrumentation-http/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opentelemetry/instrumentation-http",
   "version": "0.51.1",
-  "description": "OpenTelemetry http/https automatic instrumentation package.",
+  "description": "OpenTelemetry instrumentation for `node:http` and `node:https` http client and server modules",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
   "repository": "open-telemetry/opentelemetry-js",

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

@@ -69,7 +69,7 @@ export class HttpInstrumentation extends InstrumentationBase<HttpInstrumentation
   private _httpServerDurationHistogram!: Histogram;
   private _httpClientDurationHistogram!: Histogram;
 
-  constructor(config?: HttpInstrumentationConfig) {
+  constructor(config: HttpInstrumentationConfig = {}) {
     super('@opentelemetry/instrumentation-http', VERSION, config);
     this._headerCapture = this._createHeaderCapture();
   }

experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opentelemetry/instrumentation-xml-http-request",
   "version": "0.51.1",
-  "description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.",
+  "description": "OpenTelemetry instrumentation for XMLHttpRequest http client in web browsers",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
   "esnext": "build/esnext/index.js",

experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts

@@ -90,7 +90,7 @@ export class XMLHttpRequestInstrumentation extends InstrumentationBase<XMLHttpRe
   private _xhrMem = new WeakMap<XMLHttpRequest, XhrMem>();
   private _usedResources = new WeakSet<PerformanceResourceTiming>();
 
-  constructor(config?: XMLHttpRequestInstrumentationConfig) {
+  constructor(config: XMLHttpRequestInstrumentationConfig = {}) {
     super('@opentelemetry/instrumentation-xml-http-request', VERSION, config);
   }
 

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

@@ -51,8 +51,10 @@ export abstract class InstrumentationAbstract<
   constructor(
     public readonly instrumentationName: string,
     public readonly instrumentationVersion: string,
-    config: ConfigType = {} as ConfigType // assuming ConfigType is an object with optional fields only
+    config: ConfigType
   ) {
+    // copy config first level properties to ensure they are immutable.
+    // nested properties are not copied, thus are mutable from the outside.
     this._config = {
       enabled: true,
       ...config,
@@ -144,10 +146,10 @@ export abstract class InstrumentationAbstract<
    * Sets InstrumentationConfig to this plugin
    * @param InstrumentationConfig
    */
-  public setConfig(config: ConfigType = {} as ConfigType): void {
-    // the assertion that {} is compatible with ConfigType may not be correct,
-    // ConfigType should contain only optional fields, but there is no enforcement in place for that
-    this._config = Object.assign({}, config);
+  public setConfig(config: ConfigType): void {
+    // copy config first level properties to ensure they are immutable.
+    // nested properties are not copied, thus are mutable from the outside.
+    this._config = { ...config };
   }
 
   /**

experimental/packages/opentelemetry-instrumentation/src/platform/browser/instrumentation.ts

@@ -30,7 +30,7 @@ export abstract class InstrumentationBase<
   constructor(
     instrumentationName: string,
     instrumentationVersion: string,
-    config: ConfigType = {} as ConfigType // The cast here may be wrong as ConfigType may contain required fields
+    config: ConfigType
   ) {
     super(instrumentationName, instrumentationVersion, config);
 

experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts

@@ -54,7 +54,7 @@ export abstract class InstrumentationBase<
   constructor(
     instrumentationName: string,
     instrumentationVersion: string,
-    config: ConfigType = {} as ConfigType // The cast here may be wrong as ConfigType may contain required fields
+    config: ConfigType
   ) {
     super(instrumentationName, instrumentationVersion, config);