Skip to content

Commit 20bcfc6

Browse files
emdnetoemdneto
authored
Merge branch 'main' into third
2 parents efe0966 + a94eab9 commit 20bcfc6

File tree

62 files changed

+1035
-277
lines changed

Some content is hidden

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

62 files changed

+1035
-277
lines changed

‎.github/scripts/update-version-patch.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash -e
2+
3+
sed -i "/\[stable\]/{n;s/version=.*/version=$1/}" eachdist.ini
4+
sed -i "/\[prerelease\]/{n;s/version=.*/version=$2/}" eachdist.ini
5+
6+
./scripts/eachdist.py update_patch_versions \
7+
--stable_version=$1 \
8+
--unstable_version=$2 \
9+
--stable_version_prev=$3 \
10+
--unstable_version_prev=$4
11+

‎.github/workflows/check-links.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,17 @@ jobs:
2323
check-links:
2424
runs-on: ubuntu-latest
2525
needs: changedfiles
26-
if: ${{needs.changedfiles.outputs.md}}
26+
if: |
27+
github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
28+
&& ${{needs.changedfiles.outputs.md}}
2729
steps:
2830
- name: Checkout Repo
2931
uses: actions/checkout@v4
3032
with:
3133
fetch-depth: 0
3234

3335
- name: Install markdown-link-check
34-
run: npm install -g markdown-link-check
36+
run: npm install -g markdown-link-check@v3.12.2
3537

3638
- name: Run markdown-link-check
3739
run: |

‎.github/workflows/contrib_0.yml‎

Lines changed: 177 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,62 @@ env:
1616

1717
jobs:
1818

19+
py38-test-instrumentation-openai-v2-0:
20+
name: instrumentation-openai-v2-0
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
24+
uses: actions/checkout@v4
25+
with:
26+
repository: open-telemetry/opentelemetry-python-contrib
27+
ref: ${{ env.CONTRIB_REPO_SHA }}
28+
29+
- name: Checkout core repo @ SHA - ${{ github.sha }}
30+
uses: actions/checkout@v4
31+
with:
32+
repository: open-telemetry/opentelemetry-python
33+
path: opentelemetry-python-core
34+
35+
- name: Set up Python 3.8
36+
uses: actions/setup-python@v5
37+
with:
38+
python-version: "3.8"
39+
architecture: "x64"
40+
41+
- name: Install tox
42+
run: pip install tox
43+
44+
- name: Run tests
45+
run: tox -e py38-test-instrumentation-openai-v2-0 -- -ra
46+
47+
py38-test-instrumentation-openai-v2-1:
48+
name: instrumentation-openai-v2-1
49+
runs-on: ubuntu-latest
50+
steps:
51+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
52+
uses: actions/checkout@v4
53+
with:
54+
repository: open-telemetry/opentelemetry-python-contrib
55+
ref: ${{ env.CONTRIB_REPO_SHA }}
56+
57+
- name: Checkout core repo @ SHA - ${{ github.sha }}
58+
uses: actions/checkout@v4
59+
with:
60+
repository: open-telemetry/opentelemetry-python
61+
path: opentelemetry-python-core
62+
63+
- name: Set up Python 3.8
64+
uses: actions/setup-python@v5
65+
with:
66+
python-version: "3.8"
67+
architecture: "x64"
68+
69+
- name: Install tox
70+
run: pip install tox
71+
72+
- name: Run tests
73+
run: tox -e py38-test-instrumentation-openai-v2-1 -- -ra
74+
1975
py38-test-resource-detector-container:
2076
name: resource-detector-container
2177
runs-on: ubuntu-latest
@@ -44,8 +100,36 @@ jobs:
44100
- name: Run tests
45101
run: tox -e py38-test-resource-detector-container -- -ra
46102

47-
py38-test-resource-detector-azure:
48-
name: resource-detector-azure
103+
py38-test-resource-detector-azure-0:
104+
name: resource-detector-azure-0
105+
runs-on: ubuntu-latest
106+
steps:
107+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
108+
uses: actions/checkout@v4
109+
with:
110+
repository: open-telemetry/opentelemetry-python-contrib
111+
ref: ${{ env.CONTRIB_REPO_SHA }}
112+
113+
- name: Checkout core repo @ SHA - ${{ github.sha }}
114+
uses: actions/checkout@v4
115+
with:
116+
repository: open-telemetry/opentelemetry-python
117+
path: opentelemetry-python-core
118+
119+
- name: Set up Python 3.8
120+
uses: actions/setup-python@v5
121+
with:
122+
python-version: "3.8"
123+
architecture: "x64"
124+
125+
- name: Install tox
126+
run: pip install tox
127+
128+
- name: Run tests
129+
run: tox -e py38-test-resource-detector-azure-0 -- -ra
130+
131+
py38-test-resource-detector-azure-1:
132+
name: resource-detector-azure-1
49133
runs-on: ubuntu-latest
50134
steps:
51135
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -70,10 +154,10 @@ jobs:
70154
run: pip install tox
71155

72156
- name: Run tests
73-
run: tox -e py38-test-resource-detector-azure -- -ra
157+
run: tox -e py38-test-resource-detector-azure-1 -- -ra
74158

75-
py38-test-sdk-extension-aws:
76-
name: sdk-extension-aws
159+
py38-test-sdk-extension-aws-0:
160+
name: sdk-extension-aws-0
77161
runs-on: ubuntu-latest
78162
steps:
79163
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -98,7 +182,35 @@ jobs:
98182
run: pip install tox
99183

100184
- name: Run tests
101-
run: tox -e py38-test-sdk-extension-aws -- -ra
185+
run: tox -e py38-test-sdk-extension-aws-0 -- -ra
186+
187+
py38-test-sdk-extension-aws-1:
188+
name: sdk-extension-aws-1
189+
runs-on: ubuntu-latest
190+
steps:
191+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
192+
uses: actions/checkout@v4
193+
with:
194+
repository: open-telemetry/opentelemetry-python-contrib
195+
ref: ${{ env.CONTRIB_REPO_SHA }}
196+
197+
- name: Checkout core repo @ SHA - ${{ github.sha }}
198+
uses: actions/checkout@v4
199+
with:
200+
repository: open-telemetry/opentelemetry-python
201+
path: opentelemetry-python-core
202+
203+
- name: Set up Python 3.8
204+
uses: actions/setup-python@v5
205+
with:
206+
python-version: "3.8"
207+
architecture: "x64"
208+
209+
- name: Install tox
210+
run: pip install tox
211+
212+
- name: Run tests
213+
run: tox -e py38-test-sdk-extension-aws-1 -- -ra
102214

103215
py38-test-distro:
104216
name: distro
@@ -1556,6 +1668,34 @@ jobs:
15561668
- name: Run tests
15571669
run: tox -e py38-test-instrumentation-sqlalchemy-1 -- -ra
15581670

1671+
py38-test-instrumentation-sqlalchemy-2:
1672+
name: instrumentation-sqlalchemy-2
1673+
runs-on: ubuntu-latest
1674+
steps:
1675+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
1676+
uses: actions/checkout@v4
1677+
with:
1678+
repository: open-telemetry/opentelemetry-python-contrib
1679+
ref: ${{ env.CONTRIB_REPO_SHA }}
1680+
1681+
- name: Checkout core repo @ SHA - ${{ github.sha }}
1682+
uses: actions/checkout@v4
1683+
with:
1684+
repository: open-telemetry/opentelemetry-python
1685+
path: opentelemetry-python-core
1686+
1687+
- name: Set up Python 3.8
1688+
uses: actions/setup-python@v5
1689+
with:
1690+
python-version: "3.8"
1691+
architecture: "x64"
1692+
1693+
- name: Install tox
1694+
run: pip install tox
1695+
1696+
- name: Run tests
1697+
run: tox -e py38-test-instrumentation-sqlalchemy-2 -- -ra
1698+
15591699
py38-test-instrumentation-redis:
15601700
name: instrumentation-redis
15611701
runs-on: ubuntu-latest
@@ -1836,8 +1976,36 @@ jobs:
18361976
- name: Run tests
18371977
run: tox -e py38-test-util-http -- -ra
18381978

1839-
py38-test-propagator-aws-xray:
1840-
name: propagator-aws-xray
1979+
py38-test-propagator-aws-xray-0:
1980+
name: propagator-aws-xray-0
1981+
runs-on: ubuntu-latest
1982+
steps:
1983+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
1984+
uses: actions/checkout@v4
1985+
with:
1986+
repository: open-telemetry/opentelemetry-python-contrib
1987+
ref: ${{ env.CONTRIB_REPO_SHA }}
1988+
1989+
- name: Checkout core repo @ SHA - ${{ github.sha }}
1990+
uses: actions/checkout@v4
1991+
with:
1992+
repository: open-telemetry/opentelemetry-python
1993+
path: opentelemetry-python-core
1994+
1995+
- name: Set up Python 3.8
1996+
uses: actions/setup-python@v5
1997+
with:
1998+
python-version: "3.8"
1999+
architecture: "x64"
2000+
2001+
- name: Install tox
2002+
run: pip install tox
2003+
2004+
- name: Run tests
2005+
run: tox -e py38-test-propagator-aws-xray-0 -- -ra
2006+
2007+
py38-test-propagator-aws-xray-1:
2008+
name: propagator-aws-xray-1
18412009
runs-on: ubuntu-latest
18422010
steps:
18432011
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -1862,7 +2030,7 @@ jobs:
18622030
run: pip install tox
18632031

18642032
- name: Run tests
1865-
run: tox -e py38-test-propagator-aws-xray -- -ra
2033+
run: tox -e py38-test-propagator-aws-xray-1 -- -ra
18662034

18672035
py38-test-propagator-ot-trace:
18682036
name: propagator-ot-trace

‎.github/workflows/misc_0.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ jobs:
109109
docs:
110110
name: docs
111111
runs-on: ubuntu-latest
112+
if: |
113+
github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
112114
steps:
113115
- name: Checkout repo @ SHA - ${{ github.sha }}
114116
uses: actions/checkout@v4
@@ -215,7 +217,7 @@ jobs:
215217
runs-on: ubuntu-latest
216218
if: |
217219
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
218-
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
220+
&& github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
219221
steps:
220222
- name: Checkout repo @ SHA - ${{ github.sha }}
221223
uses: actions/checkout@v4

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ jobs:
88
steps:
99
- uses: actions/checkout@v4
1010

11+
- name: Install toml
12+
run: pip install toml
13+
1114
- run: |
1215
if [[ ! $GITHUB_REF_NAME =~ ^release/v[0-9]+\.[0-9]+\.x-0\.[0-9]+bx$ ]]; then
1316
echo this workflow should only be run against long-term release branches
@@ -40,14 +43,18 @@ jobs:
4043
exit 1
4144
fi
4245
46+
stable_version_prev="$stable_major_minor.$((stable_patch))"
47+
unstable_version_prev="0.${unstable_minor}b$((unstable_patch))"
4348
stable_version="$stable_major_minor.$((stable_patch + 1))"
4449
unstable_version="0.${unstable_minor}b$((unstable_patch + 1))"
4550
4651
echo "STABLE_VERSION=$stable_version" >> $GITHUB_ENV
4752
echo "UNSTABLE_VERSION=$unstable_version" >> $GITHUB_ENV
53+
echo "STABLE_VERSION_PREV=$stable_version_prev" >> $GITHUB_ENV
54+
echo "UNSTABLE_VERSION_PREV=$unstable_version_prev" >> $GITHUB_ENV
4855
4956
- name: Update version
50-
run: .github/scripts/update-version.sh $STABLE_VERSION $UNSTABLE_VERSION
57+
run: .github/scripts/update-version-patch.sh $STABLE_VERSION $UNSTABLE_VERSION $STABLE_VERSION_PREV $UNSTABLE_VERSION_PREV
5158

5259
- name: Update the change log with the approximate release date
5360
run: |

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414

15+
- name: Install toml
16+
run: pip install toml
17+
1518
- name: Verify prerequisites
1619
env:
1720
PRERELEASE_VERSION: ${{ github.event.inputs.prerelease_version }}

0 commit comments

Comments
 (0)