Skip to content

Commit 53e3340

Browse files
aabmassaabmass
authored
Merge branch 'main' into feat/datapoint-flags
2 parents b8ae1cd + 50218b9 commit 53e3340

39 files changed

Lines changed: 4511 additions & 905 deletions

File tree

‎.github/workflows/add-to-project.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Add PR to project board
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, reopened, ready_for_review]
6+
7+
permissions:
8+
contents: read
9+
10+
jobs:
11+
add-to-project:
12+
name: add to project board
13+
runs-on: ubuntu-latest
14+
if: github.event.pull_request.draft == false
15+
steps:
16+
# NOTE: do NOT add an actions/checkout step here. This workflow uses
17+
# pull_request_target (which has access to secrets) but must never
18+
# execute code from the fork branch. See PR #4955 for context.
19+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
20+
id: otelbot-token
21+
with:
22+
app-id: ${{ vars.OTELBOT_PYTHON_APP_ID }}
23+
private-key: ${{ secrets.OTELBOT_PYTHON_PRIVATE_KEY }}
24+
25+
- uses: actions/add-to-project@v1.0.2
26+
with:
27+
project-url: https://github.com/orgs/open-telemetry/projects/88
28+
github-token: ${{ steps.otelbot-token.outputs.token }}

‎.github/workflows/lint.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,25 @@ jobs:
233233
- name: Run tests
234234
run: tox -e lint-opentelemetry-exporter-otlp-proto-common
235235

236+
lint-opentelemetry-exporter-otlp-json-common:
237+
name: opentelemetry-exporter-otlp-json-common
238+
runs-on: ubuntu-latest
239+
timeout-minutes: 30
240+
steps:
241+
- name: Checkout repo @ SHA - ${{ github.sha }}
242+
uses: actions/checkout@v4
243+
244+
- name: Set up Python 3.14
245+
uses: actions/setup-python@v5
246+
with:
247+
python-version: "3.14"
248+
249+
- name: Install tox
250+
run: pip install tox-uv
251+
252+
- name: Run tests
253+
run: tox -e lint-opentelemetry-exporter-otlp-json-common
254+
236255
lint-opentelemetry-exporter-otlp-combined:
237256
name: opentelemetry-exporter-otlp-combined
238257
runs-on: ubuntu-latest

‎.github/workflows/test.yml‎

Lines changed: 280 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1642,6 +1642,139 @@ jobs:
16421642
- name: Run tests
16431643
run: tox -e pypy3-test-opentelemetry-exporter-otlp-proto-common -- -ra
16441644

1645+
py310-test-opentelemetry-exporter-otlp-json-common_ubuntu-latest:
1646+
name: opentelemetry-exporter-otlp-json-common 3.10 Ubuntu
1647+
runs-on: ubuntu-latest
1648+
timeout-minutes: 30
1649+
steps:
1650+
- name: Checkout repo @ SHA - ${{ github.sha }}
1651+
uses: actions/checkout@v4
1652+
1653+
- name: Set up Python 3.10
1654+
uses: actions/setup-python@v5
1655+
with:
1656+
python-version: "3.10"
1657+
1658+
- name: Install tox
1659+
run: pip install tox-uv
1660+
1661+
- name: Run tests
1662+
run: tox -e py310-test-opentelemetry-exporter-otlp-json-common -- -ra
1663+
1664+
py311-test-opentelemetry-exporter-otlp-json-common_ubuntu-latest:
1665+
name: opentelemetry-exporter-otlp-json-common 3.11 Ubuntu
1666+
runs-on: ubuntu-latest
1667+
timeout-minutes: 30
1668+
steps:
1669+
- name: Checkout repo @ SHA - ${{ github.sha }}
1670+
uses: actions/checkout@v4
1671+
1672+
- name: Set up Python 3.11
1673+
uses: actions/setup-python@v5
1674+
with:
1675+
python-version: "3.11"
1676+
1677+
- name: Install tox
1678+
run: pip install tox-uv
1679+
1680+
- name: Run tests
1681+
run: tox -e py311-test-opentelemetry-exporter-otlp-json-common -- -ra
1682+
1683+
py312-test-opentelemetry-exporter-otlp-json-common_ubuntu-latest:
1684+
name: opentelemetry-exporter-otlp-json-common 3.12 Ubuntu
1685+
runs-on: ubuntu-latest
1686+
timeout-minutes: 30
1687+
steps:
1688+
- name: Checkout repo @ SHA - ${{ github.sha }}
1689+
uses: actions/checkout@v4
1690+
1691+
- name: Set up Python 3.12
1692+
uses: actions/setup-python@v5
1693+
with:
1694+
python-version: "3.12"
1695+
1696+
- name: Install tox
1697+
run: pip install tox-uv
1698+
1699+
- name: Run tests
1700+
run: tox -e py312-test-opentelemetry-exporter-otlp-json-common -- -ra
1701+
1702+
py313-test-opentelemetry-exporter-otlp-json-common_ubuntu-latest:
1703+
name: opentelemetry-exporter-otlp-json-common 3.13 Ubuntu
1704+
runs-on: ubuntu-latest
1705+
timeout-minutes: 30
1706+
steps:
1707+
- name: Checkout repo @ SHA - ${{ github.sha }}
1708+
uses: actions/checkout@v4
1709+
1710+
- name: Set up Python 3.13
1711+
uses: actions/setup-python@v5
1712+
with:
1713+
python-version: "3.13"
1714+
1715+
- name: Install tox
1716+
run: pip install tox-uv
1717+
1718+
- name: Run tests
1719+
run: tox -e py313-test-opentelemetry-exporter-otlp-json-common -- -ra
1720+
1721+
py314-test-opentelemetry-exporter-otlp-json-common_ubuntu-latest:
1722+
name: opentelemetry-exporter-otlp-json-common 3.14 Ubuntu
1723+
runs-on: ubuntu-latest
1724+
timeout-minutes: 30
1725+
steps:
1726+
- name: Checkout repo @ SHA - ${{ github.sha }}
1727+
uses: actions/checkout@v4
1728+
1729+
- name: Set up Python 3.14
1730+
uses: actions/setup-python@v5
1731+
with:
1732+
python-version: "3.14"
1733+
1734+
- name: Install tox
1735+
run: pip install tox-uv
1736+
1737+
- name: Run tests
1738+
run: tox -e py314-test-opentelemetry-exporter-otlp-json-common -- -ra
1739+
1740+
py314t-test-opentelemetry-exporter-otlp-json-common_ubuntu-latest:
1741+
name: opentelemetry-exporter-otlp-json-common 3.14t Ubuntu
1742+
runs-on: ubuntu-latest
1743+
timeout-minutes: 30
1744+
steps:
1745+
- name: Checkout repo @ SHA - ${{ github.sha }}
1746+
uses: actions/checkout@v4
1747+
1748+
- name: Set up Python 3.14t
1749+
uses: actions/setup-python@v5
1750+
with:
1751+
python-version: "3.14t"
1752+
1753+
- name: Install tox
1754+
run: pip install tox-uv
1755+
1756+
- name: Run tests
1757+
run: tox -e py314t-test-opentelemetry-exporter-otlp-json-common -- -ra
1758+
1759+
pypy3-test-opentelemetry-exporter-otlp-json-common_ubuntu-latest:
1760+
name: opentelemetry-exporter-otlp-json-common pypy-3.10 Ubuntu
1761+
runs-on: ubuntu-latest
1762+
timeout-minutes: 30
1763+
steps:
1764+
- name: Checkout repo @ SHA - ${{ github.sha }}
1765+
uses: actions/checkout@v4
1766+
1767+
- name: Set up Python pypy-3.10
1768+
uses: actions/setup-python@v5
1769+
with:
1770+
python-version: "pypy-3.10"
1771+
1772+
- name: Install tox
1773+
run: pip install tox-uv
1774+
1775+
- name: Run tests
1776+
run: tox -e pypy3-test-opentelemetry-exporter-otlp-json-common -- -ra
1777+
16451778
py310-test-opentelemetry-exporter-otlp-combined_ubuntu-latest:
16461779
name: opentelemetry-exporter-otlp-combined 3.10 Ubuntu
16471780
runs-on: ubuntu-latest
@@ -4786,6 +4919,153 @@ jobs:
47864919
- name: Run tests
47874920
run: tox -e pypy3-test-opentelemetry-exporter-otlp-proto-common -- -ra
47884921

4922+
py310-test-opentelemetry-exporter-otlp-json-common_windows-latest:
4923+
name: opentelemetry-exporter-otlp-json-common 3.10 Windows
4924+
runs-on: windows-latest
4925+
timeout-minutes: 30
4926+
steps:
4927+
- name: Configure git to support long filenames
4928+
run: git config --system core.longpaths true
4929+
- name: Checkout repo @ SHA - ${{ github.sha }}
4930+
uses: actions/checkout@v4
4931+
4932+
- name: Set up Python 3.10
4933+
uses: actions/setup-python@v5
4934+
with:
4935+
python-version: "3.10"
4936+
4937+
- name: Install tox
4938+
run: pip install tox-uv
4939+
4940+
- name: Run tests
4941+
run: tox -e py310-test-opentelemetry-exporter-otlp-json-common -- -ra
4942+
4943+
py311-test-opentelemetry-exporter-otlp-json-common_windows-latest:
4944+
name: opentelemetry-exporter-otlp-json-common 3.11 Windows
4945+
runs-on: windows-latest
4946+
timeout-minutes: 30
4947+
steps:
4948+
- name: Configure git to support long filenames
4949+
run: git config --system core.longpaths true
4950+
- name: Checkout repo @ SHA - ${{ github.sha }}
4951+
uses: actions/checkout@v4
4952+
4953+
- name: Set up Python 3.11
4954+
uses: actions/setup-python@v5
4955+
with:
4956+
python-version: "3.11"
4957+
4958+
- name: Install tox
4959+
run: pip install tox-uv
4960+
4961+
- name: Run tests
4962+
run: tox -e py311-test-opentelemetry-exporter-otlp-json-common -- -ra
4963+
4964+
py312-test-opentelemetry-exporter-otlp-json-common_windows-latest:
4965+
name: opentelemetry-exporter-otlp-json-common 3.12 Windows
4966+
runs-on: windows-latest
4967+
timeout-minutes: 30
4968+
steps:
4969+
- name: Configure git to support long filenames
4970+
run: git config --system core.longpaths true
4971+
- name: Checkout repo @ SHA - ${{ github.sha }}
4972+
uses: actions/checkout@v4
4973+
4974+
- name: Set up Python 3.12
4975+
uses: actions/setup-python@v5
4976+
with:
4977+
python-version: "3.12"
4978+
4979+
- name: Install tox
4980+
run: pip install tox-uv
4981+
4982+
- name: Run tests
4983+
run: tox -e py312-test-opentelemetry-exporter-otlp-json-common -- -ra
4984+
4985+
py313-test-opentelemetry-exporter-otlp-json-common_windows-latest:
4986+
name: opentelemetry-exporter-otlp-json-common 3.13 Windows
4987+
runs-on: windows-latest
4988+
timeout-minutes: 30
4989+
steps:
4990+
- name: Configure git to support long filenames
4991+
run: git config --system core.longpaths true
4992+
- name: Checkout repo @ SHA - ${{ github.sha }}
4993+
uses: actions/checkout@v4
4994+
4995+
- name: Set up Python 3.13
4996+
uses: actions/setup-python@v5
4997+
with:
4998+
python-version: "3.13"
4999+
5000+
- name: Install tox
5001+
run: pip install tox-uv
5002+
5003+
- name: Run tests
5004+
run: tox -e py313-test-opentelemetry-exporter-otlp-json-common -- -ra
5005+
5006+
py314-test-opentelemetry-exporter-otlp-json-common_windows-latest:
5007+
name: opentelemetry-exporter-otlp-json-common 3.14 Windows
5008+
runs-on: windows-latest
5009+
timeout-minutes: 30
5010+
steps:
5011+
- name: Configure git to support long filenames
5012+
run: git config --system core.longpaths true
5013+
- name: Checkout repo @ SHA - ${{ github.sha }}
5014+
uses: actions/checkout@v4
5015+
5016+
- name: Set up Python 3.14
5017+
uses: actions/setup-python@v5
5018+
with:
5019+
python-version: "3.14"
5020+
5021+
- name: Install tox
5022+
run: pip install tox-uv
5023+
5024+
- name: Run tests
5025+
run: tox -e py314-test-opentelemetry-exporter-otlp-json-common -- -ra
5026+
5027+
py314t-test-opentelemetry-exporter-otlp-json-common_windows-latest:
5028+
name: opentelemetry-exporter-otlp-json-common 3.14t Windows
5029+
runs-on: windows-latest
5030+
timeout-minutes: 30
5031+
steps:
5032+
- name: Configure git to support long filenames
5033+
run: git config --system core.longpaths true
5034+
- name: Checkout repo @ SHA - ${{ github.sha }}
5035+
uses: actions/checkout@v4
5036+
5037+
- name: Set up Python 3.14t
5038+
uses: actions/setup-python@v5
5039+
with:
5040+
python-version: "3.14t"
5041+
5042+
- name: Install tox
5043+
run: pip install tox-uv
5044+
5045+
- name: Run tests
5046+
run: tox -e py314t-test-opentelemetry-exporter-otlp-json-common -- -ra
5047+
5048+
pypy3-test-opentelemetry-exporter-otlp-json-common_windows-latest:
5049+
name: opentelemetry-exporter-otlp-json-common pypy-3.10 Windows
5050+
runs-on: windows-latest
5051+
timeout-minutes: 30
5052+
steps:
5053+
- name: Configure git to support long filenames
5054+
run: git config --system core.longpaths true
5055+
- name: Checkout repo @ SHA - ${{ github.sha }}
5056+
uses: actions/checkout@v4
5057+
5058+
- name: Set up Python pypy-3.10
5059+
uses: actions/setup-python@v5
5060+
with:
5061+
python-version: "pypy-3.10"
5062+
5063+
- name: Install tox
5064+
run: pip install tox-uv
5065+
5066+
- name: Run tests
5067+
run: tox -e pypy3-test-opentelemetry-exporter-otlp-json-common -- -ra
5068+
47895069
py310-test-opentelemetry-exporter-otlp-combined_windows-latest:
47905070
name: opentelemetry-exporter-otlp-combined 3.10 Windows
47915071
runs-on: windows-latest

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4848
([#5149](https://github.com/open-telemetry/opentelemetry-python/pull/5149))
4949
- `opentelemetry-sdk`: only load entrypoints for resource detectors if they are configured via `OTEL_EXPERIMENTAL_RESOURCE_DETECTORS`
5050
([#5145](https://github.com/open-telemetry/opentelemetry-python/pull/5145))
51+
- `opentelemetry-exporter-otlp-json-common`: add 'opentelemetry-exporter-otlp-json-common' package for OTLP JSON exporters
52+
([#4996](https://github.com/open-telemetry/opentelemetry-python/pull/4996))
53+
- `opentelemetry-exporter-otlp-proto-grpc`: make retryable gRPC error codes configurable for gRPC exporters
54+
([#4917](https://github.com/open-telemetry/opentelemetry-python/pull/4917))
5155
- [BREAKING] `opentelemetry-sdk`, `opentelemetry-exporter-otlp-proto-common`: Add support for metric data-point flags
5256
([#4916](https://github.com/open-telemetry/opentelemetry-python/pull/4916))
5357

‎eachdist.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ packages=
3434
opentelemetry-opencensus-shim
3535
opentelemetry-exporter-opencensus
3636
opentelemetry-exporter-prometheus
37+
opentelemetry-exporter-otlp-json-common
3738
opentelemetry-distro
3839
opentelemetry-proto-json
3940
opentelemetry-semantic-conventions

0 commit comments

Comments
 (0)