Skip to content

Commit 44c4f55

Browse files
committed
Merge branch 'main' into feat_Instrument_browser-document-url-full
2 parents a26d4ea + 99037a1 commit 44c4f55

46 files changed

Lines changed: 3144 additions & 1851 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
],
77
"schedule": ["before 8am on Monday"],
88
"rebaseWhen": "behind-base-branch",
9+
// Override :ignoreModulesAndTests (via config:base) which adds **/examples/** by default
10+
"ignorePaths": ["**/node_modules/**", "**/vendor/**", "**/test/**", "**/tests/**", "**/__tests__/**", "**/fixtures/**"],
911
"ignoreDeps": ["@types/node", "node", "npm"],
1012
"labels": ["dependencies"],
1113
"postUpdateOptions": ["npmDedupe"],
@@ -25,8 +27,7 @@
2527
{
2628
"description": "OpenTelemetry",
2729
"matchDepNames": ["@opentelemetry/**"],
28-
"groupName": "opentelemetry",
29-
"rangeStrategy": "replace"
30+
"groupName": "opentelemetry"
3031
}
3132
]
3233
}

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1818

19-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
19+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2020
with:
2121
node-version-file: package.json
2222
cache: "npm"

.github/workflows/deploy-sandbox.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2424

25-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
25+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2626
with:
2727
node-version-file: package.json
2828
cache: "npm"
@@ -31,9 +31,9 @@ jobs:
3131

3232
- run: npx turbo run build --filter=sandbox
3333

34-
- uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
34+
- uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
3535
with:
3636
path: sandbox/dist/
3737

3838
- id: deploy
39-
uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac2b3c603fc # v4.0.5
39+
uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1818

19-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
19+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2020
with:
2121
node-version-file: package.json
2222
cache: "npm"

.github/workflows/pr-title.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1818

19-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
19+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2020
with:
2121
node-version-file: package.json
2222
cache: "npm"

.github/workflows/release-please.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
2323
id: app-token
2424
with:
25-
app-id: ${{ vars.OTELBOT_BROWSER_APP_ID }}
25+
client-id: ${{ vars.OTELBOT_BROWSER_APP_ID }}
2626
private-key: ${{ secrets.OTELBOT_BROWSER_PRIVATE_KEY }}
2727

28-
- uses: googleapis/release-please-action@16a9c90856f42705d54a6fda1823352bdc62cf38 # v4.4.0
28+
- uses: googleapis/release-please-action@45996ed1f6d02564a971a2fa1b5860e934307cf7 # v5.0.0
2929
id: release
3030
with:
3131
token: ${{ steps.app-token.outputs.token }}
@@ -41,7 +41,7 @@ jobs:
4141
steps:
4242
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4343

44-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
44+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
4545
with:
4646
node-version-file: package.json
4747
cache: "npm"

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
45+
uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
4646
with:
4747
sarif_file: results.sarif

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1818

19-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
19+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2020
with:
2121
node-version-file: package.json
2222
cache: "npm"

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@ __screenshots__
55
dist
66
*.tgz
77

8+
# logs
9+
*.log
10+
811
# dotenv environment variable files
912
.env
13+
.env.local
14+
.env.*.local
1015

1116
# caches
1217
*.tsbuildinfo

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
lockfile-version=3
22
workspaces-update=true
33
engine-strict=true
4+
prefer-dedupe=true

0 commit comments

Comments
 (0)