Merge branch 'main' into feat/transformer-serializer

.github/workflows/sbom.yml

@@ -0,0 +1,79 @@
+name: SBOM
+on:
+  release:
+    types: [published]
+
+permissions: read-all
+
+jobs:
+  generate-sboms:
+    runs-on: ubuntu-latest
+    env:
+      NPM_CONFIG_UNSAFE_PERM: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - run: npm install -g npm@latest
+
+      - name: Bootstrap
+        run: npm ci
+
+      - name: Generate SBOM for core packages
+        if: ${{ ! startsWith(github.ref, 'refs/tags/experimental') && ! startsWith(github.ref, 'refs/tags/api') }}
+        run: |
+          for dir in $(find packages -mindepth 1 -maxdepth 1 -type d)
+          do
+            dir_name=$(basename "$dir")
+            echo "Generating SBOM for $dir_name"
+            npm sbom --sbom-format=spdx --legacy-peer-deps --workspace ${dir} > "opentelemetry-js_${dir_name}.spdx.json"
+          done
+        
+      - name: Generate SBOM for the API package
+        if: startsWith(github.ref, 'refs/tags/api/')
+        run: |
+          npm sbom --sbom-format=spdx --legacy-peer-deps --workspace api > opentelemetry-js_api.spdx.json
+
+      - name: Generate SBOMs for experimental packages 
+        if: startsWith(github.ref, 'refs/tags/experimental/')
+        run: |
+          for dir in $(find experimental/packages -mindepth 1 -maxdepth 1 -type d)
+          do
+            dir_name=$(basename "$dir")
+            echo "Generating SBOM for $dir_name"
+            npm sbom --sbom-format=spdx --legacy-peer-deps --workspace ${dir} > "opentelemetry-js_${dir_name}.spdx.json"
+          done
+
+      - name: Zip all SBOM files
+        run: |
+          zip sbom.zip *.spdx.json
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: SBOM.zip
+          path: ./sbom.zip
+
+  add-release-artifact:
+    needs: generate-sboms
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Download artifact from generate-sboms
+        uses: actions/download-artifact@v4
+        with:
+          name: SBOM.zip
+      - name: Upload release asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./sbom.zip
+          asset_name: SBOM.zip
+          asset_content_type: application/zip

experimental/CHANGELOG.md

@@ -31,6 +31,7 @@ All notable changes to experimental packages in this project will be documented
 
 * 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.
+* fix(sdk-logs): ensure default resource attributes are used as fallbacks when a resource is passed to LoggerProvider.
 
 ### :books: (Refine Doc)
 

experimental/packages/sdk-logs/README.md

@@ -46,7 +46,7 @@ const logger = logsAPI.logs.getLogger('default');
 
 // emit a log record
 logger.emit({
-  severityNumber: SeverityNumber.INFO,
+  severityNumber: logsAPI.SeverityNumber.INFO,
   severityText: 'INFO',
   body: 'this is a log record body',
   attributes: { 'log.type': 'LogRecord' },

experimental/packages/sdk-logs/src/LoggerProvider.ts

@@ -33,15 +33,14 @@ export class LoggerProvider implements logsAPI.LoggerProvider {
   private readonly _sharedState: LoggerProviderSharedState;
 
   constructor(config: LoggerProviderConfig = {}) {
-    const {
-      resource = Resource.default(),
-      logRecordLimits,
-      forceFlushTimeoutMillis,
-    } = merge({}, loadDefaultConfig(), config);
+    const mergedConfig = merge({}, loadDefaultConfig(), config);
+    const resource = Resource.default().merge(
+      mergedConfig.resource ?? Resource.empty()
+    );
     this._sharedState = new LoggerProviderSharedState(
       resource,
-      forceFlushTimeoutMillis,
-      reconfigureLimits(logRecordLimits)
+      mergedConfig.forceFlushTimeoutMillis,
+      reconfigureLimits(mergedConfig.logRecordLimits)
     );
     this._shutdownOnce = new BindOnceFuture(this._shutdown, this);
   }

experimental/packages/sdk-logs/test/common/LoggerProvider.test.ts

@@ -63,6 +63,16 @@ describe('LoggerProvider', () => {
         assert.deepStrictEqual(resource, Resource.default());
       });
 
+      it('should fallback to default resource attrs', () => {
+        const passedInResource = new Resource({ foo: 'bar' });
+        const provider = new LoggerProvider({ resource: passedInResource });
+        const { resource } = provider['_sharedState'];
+        assert.deepStrictEqual(
+          resource,
+          Resource.default().merge(passedInResource)
+        );
+      });
+
       it('should have default forceFlushTimeoutMillis if not pass', () => {
         const provider = new LoggerProvider();
         const sharedState = provider['_sharedState'];