Skip to content

Commit 2e3ca96

Browse files
fcollonvalfcollonval
committed
Merge branch 'main' into prometheus_exporter
2 parents a4d4b47 + ca774ee commit 2e3ca96

File tree

17 files changed

+704
-39
lines changed

17 files changed

+704
-39
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
check-links:
2424
runs-on: ubuntu-latest
2525
needs: changedfiles
26-
if:
2726
if: |
2827
github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
2928
&& ${{needs.changedfiles.outputs.md}}
@@ -34,7 +33,7 @@ jobs:
3433
fetch-depth: 0
3534

3635
- name: Install markdown-link-check
37-
run: npm install -g markdown-link-check
36+
run: npm install -g markdown-link-check@v3.12.2
3837

3938
- name: Run markdown-link-check
4039
run: |

‎.github/workflows/contrib_0.yml‎

Lines changed: 152 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ env:
1616

1717
jobs:
1818

19-
py38-test-instrumentation-openai-v2:
20-
name: instrumentation-openai-v2
19+
py38-test-instrumentation-openai-v2-0:
20+
name: instrumentation-openai-v2-0
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -42,7 +42,35 @@ jobs:
4242
run: pip install tox
4343

4444
- name: Run tests
45-
run: tox -e py38-test-instrumentation-openai-v2 -- -ra
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
4674

4775
py38-test-resource-detector-container:
4876
name: resource-detector-container
@@ -72,8 +100,8 @@ jobs:
72100
- name: Run tests
73101
run: tox -e py38-test-resource-detector-container -- -ra
74102

75-
py38-test-resource-detector-azure:
76-
name: resource-detector-azure
103+
py38-test-resource-detector-azure-0:
104+
name: resource-detector-azure-0
77105
runs-on: ubuntu-latest
78106
steps:
79107
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -98,10 +126,10 @@ jobs:
98126
run: pip install tox
99127

100128
- name: Run tests
101-
run: tox -e py38-test-resource-detector-azure -- -ra
129+
run: tox -e py38-test-resource-detector-azure-0 -- -ra
102130

103-
py38-test-sdk-extension-aws:
104-
name: sdk-extension-aws
131+
py38-test-resource-detector-azure-1:
132+
name: resource-detector-azure-1
105133
runs-on: ubuntu-latest
106134
steps:
107135
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -126,7 +154,63 @@ jobs:
126154
run: pip install tox
127155

128156
- name: Run tests
129-
run: tox -e py38-test-sdk-extension-aws -- -ra
157+
run: tox -e py38-test-resource-detector-azure-1 -- -ra
158+
159+
py38-test-sdk-extension-aws-0:
160+
name: sdk-extension-aws-0
161+
runs-on: ubuntu-latest
162+
steps:
163+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
164+
uses: actions/checkout@v4
165+
with:
166+
repository: open-telemetry/opentelemetry-python-contrib
167+
ref: ${{ env.CONTRIB_REPO_SHA }}
168+
169+
- name: Checkout core repo @ SHA - ${{ github.sha }}
170+
uses: actions/checkout@v4
171+
with:
172+
repository: open-telemetry/opentelemetry-python
173+
path: opentelemetry-python-core
174+
175+
- name: Set up Python 3.8
176+
uses: actions/setup-python@v5
177+
with:
178+
python-version: "3.8"
179+
architecture: "x64"
180+
181+
- name: Install tox
182+
run: pip install tox
183+
184+
- name: Run tests
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
130214

131215
py38-test-distro:
132216
name: distro
@@ -1584,6 +1668,34 @@ jobs:
15841668
- name: Run tests
15851669
run: tox -e py38-test-instrumentation-sqlalchemy-1 -- -ra
15861670

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+
15871699
py38-test-instrumentation-redis:
15881700
name: instrumentation-redis
15891701
runs-on: ubuntu-latest
@@ -1864,8 +1976,36 @@ jobs:
18641976
- name: Run tests
18651977
run: tox -e py38-test-util-http -- -ra
18661978

1867-
py38-test-propagator-aws-xray:
1868-
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
18692009
runs-on: ubuntu-latest
18702010
steps:
18712011
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -1890,7 +2030,7 @@ jobs:
18902030
run: pip install tox
18912031

18922032
- name: Run tests
1893-
run: tox -e py38-test-propagator-aws-xray -- -ra
2033+
run: tox -e py38-test-propagator-aws-xray-1 -- -ra
18942034

18952035
py38-test-propagator-ot-trace:
18962036
name: propagator-ot-trace

‎.github/workflows/lint_0.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
env:
1313
CORE_REPO_SHA: main
14-
CONTRIB_REPO_SHA: be0c78c8c11d05787edb53104c92a3a959f6a70c
14+
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

1717
jobs:

‎.github/workflows/misc_0.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
env:
1313
CORE_REPO_SHA: main
14-
CONTRIB_REPO_SHA: be0c78c8c11d05787edb53104c92a3a959f6a70c
14+
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

1717
jobs:
@@ -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

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

Lines changed: 3 additions & 0 deletions
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

‎.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 }}

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ jobs:
1414
1515
- uses: actions/checkout@v4
1616

17+
- name: Install toml
18+
run: pip install toml
19+
1720
- name: Set environment variables
1821
run: |
1922
stable_version=$(./scripts/eachdist.py version --mode stable)

‎.readthedocs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
33
version: 2
44

5-
sphinx:
6-
configuration: docs/conf.py
7-
85
build:
96
os: "ubuntu-22.04"
107
tools:
118
python: "3.8"
9+
10+
sphinx:
11+
configuration: docs/conf.py
1212

1313
python:
1414
install:

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
- Fix metrics export with exemplar and no context and filtering observable instruments
11+
([#4251](https://github.com/open-telemetry/opentelemetry-python/pull/4251))
12+
- Fix recursion error with sdk disabled and handler added to root logger
13+
([#4259](https://github.com/open-telemetry/opentelemetry-python/pull/4259))
1014
- sdk: Add exemplars to the Prometheus exporter
1115
([#4178](https://github.com/open-telemetry/opentelemetry-python/pull/4178))
1216

0 commit comments

Comments
 (0)