Skip to content

Commit 57f5fcf

Browse files
committed
Merge branch 'main' into NR-526518-notify-experiment-changes
2 parents edbf42d + 24199ee commit 57f5fcf

49 files changed

Lines changed: 240 additions & 151 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,17 @@ module.exports = {
55
'build/**/*',
66
'coverage/**/*',
77
'**/node_modules/**/*',
8+
'tests/assets/frameworks/**/*',
9+
'tests/assets/js/internal/**/*',
10+
'tests/assets/js/vendor/**/*',
11+
'tests/assets/scripts/**/*',
812
'tests/assets/test-builds/**/*',
9-
'tests/dts/**/*'
13+
'tests/assets/modular/js-errors/js/vendor/**/*',
14+
'tests/dts/**/*',
15+
16+
// Ignore old JIL test code since they are being migrated to WDIO
17+
'tests/browser/**/*',
18+
'tests/functional/**/*'
1019
],
1120
parser: '@babel/eslint-parser',
1221
parserOptions: {

.github/actions/build-ab/templates/postamble.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,18 @@ try {
2323
tags: { isParent: true, nested: true, dataTypes: 'all' }
2424
})
2525

26-
const MfeToMfeChild = MfeToMfeParent.register({
26+
const MfeToMfeChild = newrelic.initializedAgents[agentIdentifier].register({
2727
id: 'mfe-to-mfe-child',
2828
name: 'MFE_TEST_CHILD',
29-
tags: { isChild: true, isParent: true, nested: true, dataTypes: 'all' }
29+
tags: { isChild: true, isParent: true, nested: true, dataTypes: 'all' },
30+
parent: MfeToMfeParent.metadata.target
3031
})
3132

32-
const MfeToMfeGrandchild = MfeToMfeChild.register({
33+
const MfeToMfeGrandchild = newrelic.initializedAgents[agentIdentifier].register({
3334
id: 'mfe-to-mfe-grandchild',
3435
name: 'MFE_TEST_GRANDCHILD',
35-
tags: { isChild: true, isParent: false, nested: true, dataTypes: 'all' }
36+
tags: { isChild: true, isParent: false, nested: true, dataTypes: 'all' },
37+
parent: MfeToMfeChild.metadata.target
3638
})
3739

3840
const jseOnlyMfe = newrelic.initializedAgents[agentIdentifier].register({

.github/workflows/branch-cleanup.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ name: Branch Cleanup
44

55
on: delete
66

7+
permissions:
8+
contents: read
9+
id-token: write
10+
711
jobs:
812
branch-delete:
913
if: github.event.ref_type == 'branch'

.github/workflows/delete-experiment.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ on:
1919
- staging
2020
- standalone
2121

22+
permissions:
23+
contents: read
24+
id-token: write
25+
2226
jobs:
2327
delete-experiment-on-s3:
2428
runs-on: ubuntu-latest

.github/workflows/eslint.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
required: false
1212
type: string
1313

14+
permissions:
15+
contents: read
16+
1417
jobs:
1518
lint:
1619
name: Run ESLint

.github/workflows/jest.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ on:
2323
type: boolean
2424
default: false
2525

26+
permissions:
27+
contents: read
28+
2629
jobs:
2730
run:
2831
name: Run Jest

.github/workflows/manual-change-tracking.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ jobs:
7474
create-change-tracking-event:
7575
runs-on: Browser-Agent-Assigned-IP-Linux
7676
timeout-minutes: 5
77+
environment: staging
7778
defaults:
7879
run:
7980
shell: bash

.github/workflows/nightly.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
# Runs every day at 4AM
66
- cron: '0 4 * * *'
77
workflow_dispatch:
8+
9+
permissions:
10+
contents: read
811

912
jobs:
1013
wdio-smoke:

.github/workflows/post-release-updates.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
release:
99
types: [published]
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
post-release-updates:
1316
runs-on: ubuntu-latest

.github/workflows/publish-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ jobs:
281281

282282
# Create change tracking events for staging environment
283283
create-staging-change-tracking:
284+
environment: staging
284285
if: always() && !cancelled() && !contains(needs.*.result, 'failure')
285286
needs: [publish-dev-to-s3]
286287
continue-on-error: true

0 commit comments

Comments
 (0)