Merge branch 'main' into logs-sdk

README.md

@@ -279,6 +279,11 @@ These instrumentations are hosted at <https://github.com/open-telemetry/opentele
 
 ## Upgrade guidelines
 
+### 0.37.x to 0.38.0
+
+- `@opentelemetry/sdk-node` `NodeSDKConfiguration.defaultAttributes` has been unused and was removed as the concept does not exist in OpenTelemetry anymore
+  - Please use `NodeSDKConfiguration.resource` instead.
+
 ### 0.35.x to 0.36.0
 
 - `@opentelemetry/sdk-node` changed `await start()` to now be synchronous

experimental/CHANGELOG.md

@@ -6,6 +6,9 @@ All notable changes to experimental packages in this project will be documented
 
 ### :boom: Breaking Change
 
+* fix(sdk-node)!: remove unused defaultAttributes option [#3724](https://github.com/open-telemetry/opentelemetry-js/pull/3724) @pichlermarc
+  * Please use `NodeSDKConfiguration.resource` instead
+
 ### :rocket: (Enhancement)
 
 * feat(api-logs): 1.`LogRecord` fields update: `traceFlags`/`traceId`/`spanId` -> `context`; 2.`Logger` supports configuring `includeTraceContext`; 3.The `onEmit` method of `LogRecordProcessor` supports the `context` field.  [#3549](https://github.com/open-telemetry/opentelemetry-js/pull/3549/) @fuaiyi

experimental/packages/opentelemetry-sdk-node/src/types.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { ContextManager, SpanAttributes } from '@opentelemetry/api';
+import type { ContextManager } from '@opentelemetry/api';
 import { TextMapPropagator } from '@opentelemetry/api';
 import { InstrumentationOption } from '@opentelemetry/instrumentation';
 import { Detector, DetectorSync, Resource } from '@opentelemetry/resources';
@@ -30,7 +30,6 @@ import {
 export interface NodeSDKConfiguration {
   autoDetectResources: boolean;
   contextManager: ContextManager;
-  defaultAttributes: SpanAttributes;
   textMapPropagator: TextMapPropagator;
   metricReader: MetricReader;
   views: View[];