Skip to content

Commit 34b9f1b

Browse files
authored
Merge branch 'main' into fix-issue-2485-instrumentation-scope-name
2 parents 0576859 + d285b7f commit 34b9f1b

File tree

127 files changed

+1251
-447
lines changed

Some content is hidden

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

127 files changed

+1251
-447
lines changed

.flake8

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ ignore =
1212
# allow whitespace before ':' (https://github.com/psf/black#slices)
1313
E203
1414

15+
# conflicts with black
16+
E701
17+
E704
18+
1519
exclude =
1620
.bzr
1721
.git

.github/dependabot.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Keep GitHub Actions up to date with GitHub's Dependabot...
2+
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
3+
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
4+
version: 2
5+
updates:
6+
- package-ecosystem: github-actions
7+
directory: /
8+
groups:
9+
github-actions:
10+
patterns:
11+
- "*" # Group all Actions updates into a single larger pull request
12+
schedule:
13+
interval: weekly

.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
exit 1
1717
fi
1818
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
with:
2121
# history is needed to run git cherry-pick below
2222
fetch-depth: 0

.github/workflows/benchmarks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ jobs:
1818
os: [ubuntu-20.04, windows-2019]
1919
steps:
2020
- name: Checkout Core Repo @ SHA - ${{ github.sha }}
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v4
2222
- name: Set up Python ${{ env[matrix.python-version] }}
23-
uses: actions/setup-python@v2
23+
uses: actions/setup-python@v5
2424
with:
2525
python-version: ${{ env[matrix.python-version] }}
2626
architecture: 'x64'
2727
- name: Install tox
2828
run: pip install tox
2929
- name: Cache tox environment
3030
# Preserves .tox directory between runs for faster installs
31-
uses: actions/cache@v2
31+
uses: actions/cache@v4
3232
with:
3333
path: |
3434
.tox

.github/workflows/changelog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
&& github.actor != 'opentelemetrybot'
1919
2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222

2323
- name: Check for CHANGELOG changes
2424
run: |
@@ -33,4 +33,4 @@ jobs:
3333
echo "No CHANGELOG was modified."
3434
echo "Please add a CHANGELOG entry, or add the \"Skip Changelog\" label if not required."
3535
false
36-
fi
36+
fi

.github/workflows/check-links.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
md: ${{ steps.changes.outputs.md }}
1414
steps:
1515
- name: Checkout Repo
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
with:
1818
fetch-depth: 0
1919
- name: Get changed files
@@ -26,7 +26,7 @@ jobs:
2626
if: ${{needs.changedfiles.outputs.md}}
2727
steps:
2828
- name: Checkout Repo
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030
with:
3131
fetch-depth: 0
3232

@@ -39,4 +39,4 @@ jobs:
3939
--verbose \
4040
--config .github/workflows/check_links_config.json \
4141
${{needs.changedfiles.outputs.md}} \
42-
|| { echo "Check that anchor links are lowercase"; exit 1; }
42+
|| { echo "Check that anchor links are lowercase"; exit 1; }

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ jobs:
2020

2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
2424

2525
# Initializes the CodeQL tools for scanning.
2626
- name: Initialize CodeQL
27-
uses: github/codeql-action/init@v1
27+
uses: github/codeql-action/init@v3
2828
with:
2929
languages: python
3030

3131
- name: Autobuild
32-
uses: github/codeql-action/autobuild@v1
32+
uses: github/codeql-action/autobuild@v3
3333

3434
- name: Perform CodeQL Analysis
35-
uses: github/codeql-action/analyze@v1
35+
uses: github/codeql-action/analyze@v3

.github/workflows/prepare-patch-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
prepare-patch-release:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
9+
- uses: actions/checkout@v4
1010

1111
- run: |
1212
if [[ ! $GITHUB_REF_NAME =~ ^release/v[0-9]+\.[0-9]+\.x-0\.[0-9]+bx$ ]]; then

.github/workflows/prepare-release-branch.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
prereqs:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Verify prerequisites
1616
env:
@@ -39,7 +39,7 @@ jobs:
3939
runs-on: ubuntu-latest
4040
needs: prereqs
4141
steps:
42-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
4343

4444
- name: Create release branch
4545
env:
@@ -103,7 +103,7 @@ jobs:
103103
runs-on: ubuntu-latest
104104
needs: prereqs
105105
steps:
106-
- uses: actions/checkout@v3
106+
- uses: actions/checkout@v4
107107

108108
- name: Set environment variables
109109
env:

.github/workflows/public-api-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Checkout the repo
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0
2121

@@ -29,7 +29,7 @@ jobs:
2929
run: git checkout ${{ github.event.pull_request.head.sha }}
3030

3131
- name: Set up Python
32-
uses: actions/setup-python@v2
32+
uses: actions/setup-python@v5
3333
with:
3434
python-version: '3.10'
3535

0 commit comments

Comments
 (0)