Merge branch 'develop' into fix.bufferDpEvents-sdk-2862

Author: saikumarrs

.github/workflows/create-hotfix-branch.yml

@@ -8,10 +8,19 @@ on:
         required: true
 
 jobs:
+  validate-actor:
+    # Only allow creating hotfix branches from the main branch
+    if: github.ref == 'refs/heads/main'
+    uses: ./.github/workflows/validate-actor.yml
+    with:
+      team_names: 'js-sdk,integrations'
+    secrets:
+      PAT: ${{ secrets.PAT }}
+
   create-branch:
     name: Create a new hotfix branch
     runs-on: [self-hosted, Linux, X64]
-    if: github.ref == 'refs/heads/main'
+    needs: validate-actor
     steps:
       - name: Create branch
         uses: peterjgrainger/[email protected]

.github/workflows/deploy-npm.yml

@@ -66,11 +66,12 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
-      - name: Install dependencies
+      - name: Setup workspace
         env:
           HUSKY: 0
           REMOTE_MODULES_BASE_PATH: 'https://cdn.rudderlabs.com/v3/modern/plugins'
           BUGSNAG_API_KEY: ${{ secrets.RS_PROD_BUGSNAG_API_KEY }}
+          LOCK_DEPS_VERSION: 'true'
           BUGSNAG_RELEASE_STAGE: 'production'
         run: |
           npm run setup:ci
@@ -79,6 +80,7 @@ jobs:
         env:
           BUGSNAG_API_KEY: ${{ secrets.RS_PROD_BUGSNAG_API_KEY }}
           BUGSNAG_RELEASE_STAGE: 'production'
+          LOCK_DEPS_VERSION: 'true'
         run: |
           npm run build:package
           npm run build:package:modern
@@ -141,6 +143,16 @@ jobs:
           echo "CURRENT_NPM_VERSION_COOKIE_UTILS=${{ env.CURRENT_NPM_VERSION_COOKIE_UTILS }}"
           echo "NEW_NPM_VERSION_COOKIE_UTILS=${{ env.NEW_NPM_VERSION_COOKIE_UTILS }}"
 
+      - name: Deprecate the legacy SDK NPM package
+        continue-on-error: true
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_CONFIG_PROVENANCE: true
+        run: |
+          npm set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
+
+          npm deprecate rudder-sdk-js "This package is deprecated and no longer maintained. Please migrate to the latest package, @rudderstack/analytics-js (https://www.npmjs.com/package/@rudderstack/analytics-js), for the latest features, security updates, and improved performance. For more details, visit the migration guide: https://www.rudderstack.com/docs/sources/event-streams/sdks/rudderstack-javascript-sdk/migration-guide/."
+
       - name: Send message to Slack channel
         if: env.CURRENT_NPM_VERSION != env.NEW_NPM_VERSION && env.NEW_NPM_VERSION != 'not found'
         id: slack

.github/workflows/deploy-sanity-suite.yml

@@ -81,7 +81,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
-      - name: Install dependencies
+      - name: Setup workspace
         env:
           HUSKY: 0
         run: |

.github/workflows/deploy.yml

@@ -15,6 +15,8 @@ jobs:
     # Only allow to draft a new release from develop and hotfix branches
     if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')
     uses: ./.github/workflows/validate-actor.yml
+    with:
+      team_names: 'js-sdk,integrations'
     secrets:
       PAT: ${{ secrets.PAT }}
 
@@ -34,11 +36,11 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
-      - name: Install dependencies
+      - name: Setup workspace
         env:
           HUSKY: 0
         run: |
-          npm run setup:ci
+          npm run setup:deps
 
       # In order to make a commit, we need to initialize a user.
       # You may choose to write something less generic here if you want, it doesn't matter functionality wise.
@@ -110,14 +112,22 @@ jobs:
           source_branch: ${{ steps.create-release.outputs.branch_name }}
           destination_branch: 'main'
           github_token: ${{ secrets.PAT }}
-          pr_title: 'chore(release): pull ${{ steps.create-release.outputs.branch_name }} into main'
+          pr_title: 'chore(release): merge ${{ steps.create-release.outputs.branch_name }} into main [${{ github.event.inputs.release_ticket_id }}]'
           pr_body: |
-            :crown: *An automated PR*
+            :crown: **Automated Release PR**
 
-            This PR is created automatically by the GitHub Actions workflow to merge the release branch into the main branch.
+            This pull request was created automatically by the GitHub Actions workflow. It merges the release branch (`${{ steps.create-release.outputs.branch_name }}`) into the `main` branch.
+
+            This ensures that the latest release branch changes are incorporated into the `main` branch for production.
+
+            ### Details
+            - **Release Version**: v$NEW_VERSION_VALUE
+            - **Release Branch**: `${{ steps.create-release.outputs.branch_name }}`
+            - **Related Ticket**: [${{ github.event.inputs.release_ticket_id }}](https://linear.app/rudderstack/issue/${{ github.event.inputs.release_ticket_id }})
+
+            ---
+            Please review and merge when ready. :rocket:
 
-            Linear Ticket: 
-            https://linear.app/rudderstack/issue/${{ github.event.inputs.release_ticket_id }}
 
       - name: Delete hotfix release base branch
         continue-on-error: true

.github/workflows/draft-new-release.yml

@@ -31,6 +31,11 @@ jobs:
           VERSION=${BRANCH_NAME#hotfix-}
           VERSION=${VERSION#release/}
 
+          # Extract the ticket ID (case-insensitive match for -SDK-<ticket_number>)
+          RELEASE_TICKET_ID=$(echo "$BRANCH_NAME" | grep -oE '[sS][dD][kK]-[0-9]+')
+
+          echo "release_ticket_id=$RELEASE_TICKET_ID" >> $GITHUB_OUTPUT
+
           # Remove the -SDK-<ticket_number> suffix case insensitively
           VERSION=$(echo "$VERSION" | awk '{sub(/-[sS][dD][kK]-[0-9]+$/, ""); print}')
 
@@ -61,11 +66,11 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
-      - name: Install dependencies
+      - name: Setup workspace
         env:
           HUSKY: 0
         run: |
-          npm run setup:ci
+          npm run setup:deps
 
       - name: Get the two latest versions
         run: |
@@ -79,6 +84,7 @@ jobs:
 
       - name: Create GitHub releases
         id: create_release
+        continue-on-error: true
         env:
           HUSKY: 0
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -96,16 +102,31 @@ jobs:
           git checkout -- .nxignore
 
       - name: Create pull request into develop
+        if: always()
+        continue-on-error: true
         uses: repo-sync/pull-request@v2
         with:
           source_branch: 'main'
           destination_branch: 'develop'
           github_token: ${{ secrets.PAT }}
-          pr_title: 'chore(release): pull main into develop post release v${{ steps.extract-version.outputs.release_version }}'
-          pr_body: ':crown: *An automated PR*'
+          pr_title: 'chore(release): merge main into develop after release v${{ steps.extract-version.outputs.release_version }} [${{ steps.extract-version.outputs.release_ticket_id }}]'
+          pr_body: |
+            :crown: **Automated Post-Release PR**
+
+            This pull request was created automatically by the GitHub Actions workflow. It merges changes from the `main` branch into the `develop` branch after a release has been completed.
+
+            This ensures that the `develop` branch stays up to date with all release-related changes from the `main` branch.
+
+            ### Details
+            - **Release Version**: v${{ steps.extract-version.outputs.release_version }}
+            - **Related Ticket**: [${{ steps.extract-version.outputs.release_ticket_id }}](https://linear.app/rudderstack/issue/${{ steps.extract-version.outputs.release_ticket_id }})
+
+            ---
+            Please review and merge it before closing the release ticket. :rocket:
 
       - name: Send message to Slack channel
         id: slack
+        if: always()
         continue-on-error: true
         uses: slackapi/[email protected]
         env:

.github/workflows/publish-new-release.yml

@@ -8,6 +8,8 @@ jobs:
     # Only allow to be deployed from tags and main branch
     if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main'
     uses: ./.github/workflows/validate-actor.yml
+    with:
+      team_names: 'js-sdk,integrations'
     secrets:
       PAT: ${{ secrets.PAT }}
 
@@ -29,3 +31,44 @@ jobs:
       BUGSNAG_API_KEY: ${{ secrets.RS_PROD_BUGSNAG_API_KEY }}
       SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
       SLACK_RELEASE_CHANNEL_ID: ${{ secrets.SLACK_RELEASE_CHANNEL_ID }}
+  
+  # As we rollback to a previous version, we need to invalidate the CDN cache for the previous version's directory
+  # The above deploy action will invalidate the cache for the core SDK artifacts, so this step is needed for dependencies (plugins and integrations)
+  invalidate-cdn-cache:
+    needs: deploy
+    name: Invalidate CDN cache
+    runs-on: [self-hosted, Linux, X64]
+
+    steps:
+      - name: Install AWS CLI
+        uses: unfor19/install-aws-cli-action@master
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::${{ secrets.AWS_PROD_ACCOUNT_ID }}:role/${{ secrets.AWS_PROD_S3_SYNC_ROLE }}
+          aws-region: us-east-1
+
+      - name: Checkout source code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.sha }}
+
+      - name: Get new versions
+        run: |
+          current_version_v1=$(jq -r .version packages/analytics-v1.1/package.json)
+          current_version=$(jq -r .version packages/analytics-js/package.json)
+          echo "CURRENT_VERSION_V1_VALUE=$current_version_v1" >> $GITHUB_ENV
+          echo "CURRENT_VERSION_VALUE=$current_version" >> $GITHUB_ENV
+
+      - name: Invalidate CloudFront cache for all the SDK artifacts (versioned directory)
+        run: |
+          invalidation_id=$(AWS_MAX_ATTEMPTS=10 aws cloudfront create-invalidation --distribution-id ${{ secrets.AWS_PROD_CF_DISTRIBUTION_ID }} --paths "/${{ env.CURRENT_VERSION_VALUE }}/*" --query "Invalidation.Id" --output text)
+
+          aws cloudfront wait invalidation-completed --distribution-id ${{ secrets.AWS_PROD_CF_DISTRIBUTION_ID }} --id "$invalidation_id"
+
+      - name: Invalidate CloudFront cache for all the legacy SDK artifacts (versioned directory)
+        run: |
+          invalidation_id=$(AWS_MAX_ATTEMPTS=10 aws cloudfront create-invalidation --distribution-id ${{ secrets.AWS_PROD_CF_DISTRIBUTION_ID }} --paths "/${{ env.CURRENT_VERSION_V1_VALUE }}/*" --query "Invalidation.Id" --output text)
+
+          aws cloudfront wait invalidation-completed --distribution-id ${{ secrets.AWS_PROD_CF_DISTRIBUTION_ID }} --id "$invalidation_id"

.github/workflows/rollback.yml

@@ -54,7 +54,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
-      - name: Install dependencies
+      - name: Setup workspace
         env:
           HUSKY: 0
         run: |

.github/workflows/security-code-quality-and-bundle-size-checks.yml

@@ -68,6 +68,9 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.PAT }}
         run: |
+          # Sleep for 15 minutes to allow the sanity test suite to complete first
+          sleep 15m
+
           gh api \
             --method POST \
             -H "Accept: application/vnd.github+json" \

.github/workflows/trigger-test-suites.yml

@@ -29,7 +29,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
-      - name: Install dependencies
+      - name: Setup workspace
         env:
           HUSKY: 0
         run: |