Data 36553 include ad size as a field that in the data collected by the client side analytics adapter

.github/actions/install-deb/action.yml

@@ -0,0 +1,35 @@
+name: Install deb
+description: Download and install a .deb package
+inputs:
+  url:
+    description: URL to the .deb file
+    required: true
+  name:
+    description: A local name for the package. Required if using this action multiple times in the same context.
+    default: package.deb
+    required: false
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Restore deb
+      id: deb-restore
+      uses: actions/cache/restore@v4
+      with:
+        path: "${{ runner.temp }}/${{ inputs.name }}"
+        key: ${{ inputs.url }}
+    - name: Download deb
+      if: ${{ steps.deb-restore.outputs.cache-hit != 'true'  }}
+      shell: bash
+      run: |
+        wget --no-verbose "${{ inputs.url }}" -O "${{ runner.temp }}/${{ inputs.name }}"
+    - name: Cache deb
+      if: ${{ steps.deb-restore.outputs.cache-hit != 'true' }}
+      uses: actions/cache/save@v4
+      with:
+        path: "${{ runner.temp }}/${{ inputs.name }}"
+        key: ${{ inputs.url }}
+    - name: Install deb
+      shell: bash
+      run: |
+        sudo apt-get install -y --allow-downgrades "${{ runner.temp }}/${{ inputs.name }}"

.github/actions/npm-ci/action.yml

@@ -0,0 +1,23 @@
+name: NPM install
+description: Run npm install and cache dependencies
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Restore dependencies
+      id: restore-modules
+      uses: actions/cache/restore@v4
+      with:
+        path: "node_modules"
+        key: node_modules-${{ hashFiles('package-lock.json') }}
+    - name: Run npm ci
+      if: ${{ steps.restore-modules.outputs.cache-hit != 'true'  }}
+      shell: bash
+      run: |
+        npm ci
+    - name: Cache dependencies
+      if: ${{ steps.restore-modules.outputs.cache-hit != 'true' }}
+      uses: actions/cache/save@v4
+      with:
+        path: "node_modules"
+        key: node_modules-${{ hashFiles('package-lock.json') }}

.github/actions/wait-for-browserstack/action.yml

@@ -1,6 +1,9 @@
 name: Wait for browserstack sessions
 description: Wait until enough browserstack sessions have become available
-
+inputs:
+  sessions:
+    description: Number of sessions needed to continue
+    default: "6"
 runs:
   using: 'composite'
   steps:
@@ -14,7 +17,7 @@ runs:
           queued=$(jq '.queued_sessions' <<< $status)
           max_queued=$(jq '.queued_sessions_max_allowed' <<< $status)
           spare=$(( ${max_running} + ${max_queued} - ${running} - ${queued} ))
-          required=6
+          required=${{ inputs.sessions }}
           echo "Browserstack status: ${running} sessions running, ${queued} queued, ${spare} free"
           (( ${required} > ${spare} ))
         do

.github/codeql/queries/jsonRequestContentType.ql

@@ -12,7 +12,8 @@ from Property prop
 where
   prop.getName() = "contentType" and
   prop.getInit() instanceof StringLiteral and
-  prop.getInit().(StringLiteral).getStringValue() = "application/json"
+  prop.getInit().(StringLiteral).getStringValue() = "application/json" and
+  prop.getFile().getBaseName().matches("%BidAdapter.%")
 select prop,
   "application/json request type triggers preflight requests and may increase bidder timeouts"
 

.github/workflows/PR-assignment.yml

@@ -0,0 +1,60 @@
+name: Assign PR reviewers
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  assign_reviewers:
+    name: Assign reviewers
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Generate app token
+        id: token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ vars.PR_BOT_ID }}
+          private-key: ${{ secrets.PR_BOT_PEM }}
+
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          ref: refs/pull/${{ github.event.pull_request.number }}/head
+
+      - name: Install dependencies
+        uses: ./.github/actions/npm-ci
+      - name: Build
+        run: |
+          npx gulp build
+      - name: Install s3 client
+        run: |
+          npm install @aws-sdk/client-s3
+      - name: Get PR properties
+        id: get-props
+        uses: actions/github-script@v8
+        env:
+          AWS_ACCESS_KEY_ID: ${{ vars.PR_BOT_AWS_AK }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.PR_BOT_AWS_SAK }}
+        with:
+          github-token: ${{ steps.token.outputs.token }}
+          script: |
+            const getProps = require('./.github/workflows/scripts/getPRProperties.js')
+            const props = await getProps({
+              github, 
+              context, 
+              prNo: ${{ github.event.pull_request.number }},
+              reviewerTeam: '${{ vars.REVIEWER_TEAM }}',
+              engTeam: '${{ vars.ENG_TEAM }}',
+              authReviewTeam: '${{ vars.AUTH_REVIEWER_TEAM }}'
+            });
+            console.log('PR properties:', JSON.stringify(props, null, 2));
+            return props;
+      - name: Assign reviewers
+        if: ${{ !fromJSON(steps.get-props.outputs.result).review.ok }}
+        uses: actions/github-script@v8
+        with:
+          github-token: ${{ steps.token.outputs.token }}
+          script: |
+            const assignReviewers = require('./.github/workflows/scripts/assignReviewers.js')
+            const reviewers = await assignReviewers({github, context, prData: ${{ steps.get-props.outputs.result }} });
+            console.log('Assigned reviewers:', JSON.stringify(reviewers, null, 2));

.github/workflows/browser-tests.yml

@@ -1,29 +1,10 @@
 name: Run unit tests on all browsers
 on:
   workflow_call:
-    inputs:
-      chunks:
-        description: Number of chunks to split tests into
-        required: false
-        type: number
-        default: 1
-      build-cmd:
-        description: Build command, run once
-        required: false
-        type: string
-      test-cmd:
-        description: Test command, run once per chunk
-        required: true
-        type: string
-      timeout:
-        description: Timeout on test run
-        required: false
-        type: number
-        default: 10
     outputs:
       coverage:
         description: Artifact name for coverage results
-        value: ${{ jobs.browser-tests.outputs.coverage }}
+        value: ${{ jobs.unit-tests.outputs.coverage }}
     secrets:
       BROWSERSTACK_USER_NAME:
         description: "Browserstack user name"
@@ -33,15 +14,17 @@ jobs:
   build:
     uses: ./.github/workflows/build.yml
     with:
-      build-cmd: ${{ inputs.build-cmd }}
+      build-cmd: npx gulp build
 
   setup:
     needs: build
-    name: "Setup environment"
+    name: "Define testing strategy"
     runs-on: ubuntu-latest
     outputs:
       browsers: ${{ toJSON(fromJSON(steps.define.outputs.result).browsers) }}
+      latestBrowsers: ${{ toJSON(fromJSON(steps.define.outputs.result).latestBrowsers) }}
       bstack-key: ${{ steps.bstack-save.outputs.name }}
+      bstack-sessions: ${{ fromJSON(steps.define.outputs.result).bsBrowsers }}
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -55,23 +38,35 @@ jobs:
         with:
           script: |
             const fs = require('node:fs/promises');
-            const browsers = require('./.github/workflows/browser_testing.json');
-            const excludeFromBstack = Object.values(browsers).map(browser => browser.bsName);
+            const browsers = Object.entries(
+              require('./.github/workflows/browser_testing.json')
+            ).flatMap(([name, browser]) => {
+              browser = Object.assign({name, version: 'latest'}, browser);
+              const browsers = [browser];
+              const versions = browser.versions;
+              if (versions) {
+                 delete browser.versions;
+                 browsers.push(...Object.entries(versions).map(([version, def]) => Object.assign({}, browser, {version, ...def})))
+              }
+              return browsers;
+            })
             const bstackBrowsers = Object.fromEntries(
-              // exlude "latest" version of browsers that we can test on GH actions
+              // exclude versions of browsers that we can test on GH actions
               Object.entries(require('./browsers.json'))
-              .filter(([name, def]) => !excludeFromBstack.includes(def.browser) || def.browser_version !== 'latest')
+              .filter(([name, def]) => browsers.find(({bsName, version}) => bsName === def.browser && version === def.browser_version) == null)
             )
             const updatedBrowsersJson = JSON.stringify(bstackBrowsers, null,  2);
             console.log("Using browsers.json:", updatedBrowsersJson);
+            console.log("Browsers to be tested directly on runners:", JSON.stringify(browsers, null, 2))
             await fs.writeFile('./browsers.json', updatedBrowsersJson);
             return {
-              hasBSBrowsers: Object.keys(bstackBrowsers).length > 0,
-              browsers: Object.entries(browsers).map(([name, def]) => Object.assign({name}, def))
+              bsBrowsers: Object.keys(bstackBrowsers).length,
+              browsers,
+              latestBrowsers: browsers.filter(browser => browser.version === 'latest') 
             }
       - name: "Save working directory"
         id: bstack-save
-        if: ${{ fromJSON(steps.define.outputs.result).hasBSBrowsers }}
+        if: ${{ fromJSON(steps.define.outputs.result).bsBrowsers > 0 }}
         uses: ./.github/actions/save
         with:
           prefix: browserstack-
@@ -85,19 +80,40 @@ jobs:
       built-key: ${{ needs.build.outputs.built-key }}
       test-cmd: gulp test-build-logic
 
-  browser-tests:
+  e2e-tests:
     needs: [setup, build]
-    name: "Browser: ${{ matrix.browser.name }}"
+    name: "E2E (browser: ${{ matrix.browser.wdioName }})"
     strategy:
       fail-fast: false
       matrix:
         browser: ${{ fromJSON(needs.setup.outputs.browsers) }}
     uses:
       ./.github/workflows/run-tests.yml
     with:
+      browser: ${{ matrix.browser.wdioName }}
       built-key: ${{ needs.build.outputs.built-key }}
-      test-cmd: ${{ inputs.test-cmd }} --browsers ${{ matrix.browser.name }} ${{ matrix.browser.coverage && '--coverage' || '--no-coverage' }}
-      chunks: ${{ inputs.chunks }}
+      test-cmd: npx gulp e2e-test-nobuild --local
+      chunks: 1
+      runs-on: ${{ matrix.browser.runsOn || 'ubuntu-latest' }}
+      install-safari: ${{ matrix.browser.runsOn == 'macos-latest' }}
+      run-npm-install: ${{ matrix.browser.runsOn == 'windows-latest' }}
+      browserstack: false
+
+  unit-tests:
+    needs: [setup, build]
+    name: "Unit (browser: ${{ matrix.browser.name }} ${{ matrix.browser.version }})"
+    strategy:
+      fail-fast: false
+      matrix:
+        browser: ${{ fromJSON(needs.setup.outputs.browsers) }}
+    uses:
+      ./.github/workflows/run-tests.yml
+    with:
+      install-deb: ${{ matrix.browser.deb }}
+      install-chrome: ${{ matrix.browser.chrome }}
+      built-key: ${{ needs.build.outputs.built-key }}
+      test-cmd: npx gulp test-only-nobuild --browsers ${{ matrix.browser.name }} ${{ matrix.browser.coverage && '--coverage' || '--no-coverage' }}
+      chunks: 8
       runs-on: ${{ matrix.browser.runsOn || 'ubuntu-latest' }}
 
   browserstack-tests:
@@ -108,9 +124,10 @@ jobs:
       ./.github/workflows/run-tests.yml
     with:
       built-key: ${{ needs.setup.outputs.bstack-key }}
-      test-cmd: ${{ inputs.test-cmd }} --browserstack --no-coverage
-      chunks: ${{ inputs.chunks }}
+      test-cmd: npx gulp test-only-nobuild --browserstack --no-coverage
+      chunks: 8
       browserstack: true
+      browserstack-sessions: ${{ fromJSON(needs.setup.outputs.bstack-sessions) }}
     secrets:
       BROWSERSTACK_USER_NAME: ${{ secrets.BROWSERSTACK_USER_NAME }}
       BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}

.github/workflows/browser_testing.json

@@ -1,17 +1,28 @@
 {
   "ChromeHeadless": {
     "bsName": "chrome",
-    "coverage": true
+    "wdioName": "chrome",
+    "coverage": true,
+    "versions": {
+      "113.0": {
+        "coverage": false,
+        "chrome": "113.0.5672.0",
+        "name": "ChromeNoSandbox"
+      }
+    }
   },
   "EdgeHeadless": {
     "bsName": "edge",
+    "wdioName": "msedge",
     "runsOn": "windows-latest"
   },
   "SafariNative": {
+    "wdioName": "safari technology preview",
     "bsName": "safari",
     "runsOn": "macos-latest"
   },
   "FirefoxHeadless": {
+    "wdioName": "firefox",
     "bsName": "firefox"
   }
 }