Skip to content

Commit 5a8179e

Browse files
zhihalizhihali
authored
Merge branch 'main' into dev-bugfix
2 parents a317c5e + ba22b16 commit 5a8179e

File tree

57 files changed

+254
-198
lines changed

Some content is hidden

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

57 files changed

+254
-198
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

-19
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug_report.yaml

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
---
2+
name: Bug Report
3+
description: Create a report to help us improve
4+
labels: [bug]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report! Please make sure to fill out the entire form below, providing as much context as you can in order to help us triage and track down your bug as quickly as possible.
10+
11+
Before filing a bug, please be sure you have searched through [existing bugs](https://github.com/open-telemetry/opentelemetry-python/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3Abug) to see if your bug is already addressed.
12+
If your bug is related to an instrumentation or plugin in [opentelemetry-python-contrib](https://github.com/open-telemetry/opentelemetry-python-contrib) please be sure to file it there.
13+
14+
- type: textarea
15+
id: environment
16+
attributes:
17+
label: Describe your environment
18+
description: |
19+
Please describe any aspect of your environment relevant to the problem, including your Python version, [platform](https://docs.python.org/3/library/platform.html), version numbers of installed dependencies, information about your cloud hosting provider, etc. If you're reporting a problem with a specific version of a library in this repo, please check whether the problem has been fixed on main.
20+
value: |
21+
OS: (e.g, Ubuntu)
22+
Python version: (e.g., Python 3.8.10)
23+
SDK version: (e.g., 1.25.0)
24+
API version: (e.g., 1.25.0)
25+
26+
- type: textarea
27+
attributes:
28+
label: What happened?
29+
description: Please provide as much detail as you reasonably can.
30+
validations:
31+
required: true
32+
33+
- type: textarea
34+
attributes:
35+
label: Steps to Reproduce
36+
description: Provide a [minimal reproducible example](https://stackoverflow.com/help/minimal-reproducible-example). We will close the issue if the repro project you share with us is complex or we cannot reproduce the behavior you are reporting. We cannot investigate custom projects, so don't point us to such, please.
37+
validations:
38+
required: true
39+
40+
- type: textarea
41+
attributes:
42+
label: Expected Result
43+
description: What did you expect to see?
44+
validations:
45+
required: true
46+
47+
- type: textarea
48+
attributes:
49+
label: Actual Result
50+
description: What did you see instead?
51+
validations:
52+
required: true
53+
54+
- type: textarea
55+
id: additional-context
56+
attributes:
57+
label: Additional context
58+
description: Add any other context about the problem here.
59+
placeholder: Any additional information...
60+
61+
- type: dropdown
62+
id: contribute
63+
attributes:
64+
label: Would you like to implement a fix?
65+
description: For guidance on how to get started, refer to the [contribution guide](https://github.com/open-telemetry/opentelemetry-python/blob/main/CONTRIBUTING.md).
66+
options:
67+
- "No"
68+
- "Yes"

‎.github/ISSUE_TEMPLATE/config.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
contact_links:
2+
- name: Slack
3+
url: https://cloud-native.slack.com/archives/C01PD4HUVBL
4+
about: Or the `#otel-python` channel in the CNCF Slack instance.

‎.github/ISSUE_TEMPLATE/feature_request.md

-19
This file was deleted.

‎.github/ISSUE_TEMPLATE/feature_request.yaml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
name: Feature Request
3+
description: Suggest an idea for this project
4+
labels: [feature-request]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Before opening a feature request against this repo, consider whether the feature should/could be implemented in the [other OpenTelemetry client libraries](https://github.com/open-telemetry/). If so, please [open an issue on opentelemetry-specification](https://github.com/open-telemetry/opentelemetry-specification/issues/new) first.
10+
- type: textarea
11+
id: related-problem
12+
attributes:
13+
label: Is your feature request related to a problem?
14+
description: Is your feature request related to a problem? If so, provide a concise description of the problem.
15+
placeholder: Include the Issue ID from this or other repos.
16+
validations:
17+
required: true
18+
- type: textarea
19+
id: solution
20+
attributes:
21+
label: Describe the solution you'd like
22+
description: What do you want to happen instead? What is the expected behavior?
23+
placeholder: I'd like to ...
24+
validations:
25+
required: true
26+
- type: textarea
27+
id: alternatives
28+
attributes:
29+
label: Describe alternatives you've considered
30+
description: Which alternative solutions or features have you considered?
31+
placeholder: Some potential solutions
32+
validations:
33+
required: false
34+
- type: textarea
35+
id: additional-context
36+
attributes:
37+
label: Additional Context
38+
description: Add any other context about the feature request here.
39+
placeholder: Some related requests in other projects or upstream spec proposals.
40+
validations:
41+
required: false
42+
- type: dropdown
43+
id: contribute
44+
attributes:
45+
label: Would you like to implement a fix?
46+
description: |
47+
For guidance on how to get started, refer to the [contribution guide](https://github.com/open-telemetry/opentelemetry-python/blob/main/CONTRIBUTING.md).
48+
options:
49+
- "No"
50+
- "Yes"

‎.github/workflows/benchmarks.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ on:
77
jobs:
88
sdk-benchmarks:
99
env:
10-
py311: "3.11"
10+
py312: "3.12"
1111
RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-sdk-${{ matrix.os }}
1212
runs-on: self-hosted
1313
strategy:
1414
# Ensures the entire test matrix is run, even if one permutation fails
1515
fail-fast: false
1616
matrix:
17-
python-version: [py311]
17+
python-version: [py312]
1818
os: [ubuntu-20.04, windows-2019]
1919
steps:
2020
- name: Checkout Core Repo @ SHA - ${{ github.sha }}

‎.github/workflows/test.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ jobs:
3131
py39: 3.9
3232
py310: "3.10"
3333
py311: "3.11"
34+
py312: "3.12"
3435
pypy3: pypy-3.8
3536
RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{
3637
matrix.os }}
3738
runs-on: ${{ matrix.os }}
3839
strategy:
3940
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
4041
matrix:
41-
python-version: [py38, py39, py310, py311, pypy3]
42+
python-version: [py38, py39, py310, py311, py312, pypy3]
4243
package:
4344
- "api"
4445
- "sdk"

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ repos:
33
rev: 24.3.0
44
hooks:
55
- id: black
6-
language_version: python3.11
6+
language_version: python3.12
77
- repo: https://github.com/pycqa/isort
88
rev: 5.12.0
99
hooks:

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
- Fix RandomIdGenerator can generate invalid Span/Trace Ids
1111
([#3949](https://github.com/open-telemetry/opentelemetry-python/pull/3949))
12+
- Add Python 3.12 to tox
13+
([#3616](https://github.com/open-telemetry/opentelemetry-python/pull/3616))
1214

1315
## Version 1.25.0/0.46b0 (2024-05-30)
1416

‎CONTRIBUTING.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ on how to become a [**Member**](https://github.com/open-telemetry/community/blob
1010
[**Approver**](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
1111
and [**Maintainer**](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
1212

13+
Before you can contribute, you will need to sign the [Contributor License Agreement](https://docs.linuxfoundation.org/lfx/easycla/contributors).
14+
15+
Please also read the [OpenTelemetry Contributor Guide](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md).
16+
1317
# Find your right repo
1418

1519
This is the main repo for OpenTelemetry Python. Nevertheless, there are other repos that are related to this project.
@@ -50,7 +54,7 @@ You can run `tox` with the following arguments:
5054
under multiple Python versions
5155
- `tox -e docs` to regenerate the API docs
5256
- `tox -e opentelemetry-api` and `tox -e opentelemetry-sdk` to run the API and SDK unit tests
53-
- `tox -e py311-opentelemetry-api` to e.g. run the API unit tests under a specific
57+
- `tox -e py312-opentelemetry-api` to e.g. run the API unit tests under a specific
5458
Python version
5559
- `tox -e spellcheck` to run a spellcheck on all the code
5660
- `tox -e lint` to run lint checks on all code

‎dev-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ mypy==1.9.0
77
sphinx==7.1.2
88
sphinx-rtd-theme==2.0.0rc4
99
sphinx-autodoc-typehints==1.25.2
10-
pytest==7.1.3
10+
pytest==7.4.4
1111
pytest-cov==4.1.0
1212
readme-renderer==42.0
1313
markupsafe==2.1.3

‎docs/examples/error_handler/error_handler_0/pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ classifiers = [
2222
"Programming Language :: Python :: 3.9",
2323
"Programming Language :: Python :: 3.10",
2424
"Programming Language :: Python :: 3.11",
25+
"Programming Language :: Python :: 3.12",
2526
]
2627
dependencies = [
2728
"opentelemetry-sdk ~= 1.3",

‎docs/examples/error_handler/error_handler_1/pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ classifiers = [
2222
"Programming Language :: Python :: 3.9",
2323
"Programming Language :: Python :: 3.10",
2424
"Programming Language :: Python :: 3.11",
25+
"Programming Language :: Python :: 3.12",
2526
]
2627
dependencies = [
2728
"opentelemetry-sdk ~= 1.3",

‎docs/getting_started/tests/requirements.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ iniconfig==2.0.0
1212
itsdangerous==2.1.2
1313
Jinja2==3.1.4
1414
MarkupSafe==2.1.3
15-
packaging==23.2
15+
packaging==24.0
1616
pluggy==1.3.0
17-
py==1.11.0
1817
py-cpuinfo==9.0.0
19-
pytest==7.1.3
18+
pytest==7.4.4
2019
pytest-benchmark==4.0.0
2120
requests==2.31.0
2221
tomli==2.0.1

‎exporter/opentelemetry-exporter-opencensus/pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ classifiers = [
2424
"Programming Language :: Python :: 3.9",
2525
"Programming Language :: Python :: 3.10",
2626
"Programming Language :: Python :: 3.11",
27+
"Programming Language :: Python :: 3.12",
2728
"Typing :: Typed",
2829
]
2930
dependencies = [

‎exporter/opentelemetry-exporter-opencensus/test-requirements.txt

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
asgiref==3.7.2
2-
attrs==23.2.0
32
Deprecated==1.2.14
43
flaky==3.7.0
54
grpcio==1.62.0
65
importlib-metadata==6.11.0
76
iniconfig==2.0.0
87
opencensus-proto==0.1.0
9-
packaging==23.2
10-
pluggy==1.4.0
8+
packaging==24.0
9+
pluggy==1.5.0
1110
protobuf==3.20.3
12-
py==1.11.0
1311
py-cpuinfo==9.0.0
14-
pytest==7.1.3
12+
pytest==7.4.4
1513
pytest-benchmark==4.0.0
1614
tomli==2.0.1
1715
typing_extensions==4.10.0

‎exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ classifiers = [
2424
"Programming Language :: Python :: 3.9",
2525
"Programming Language :: Python :: 3.10",
2626
"Programming Language :: Python :: 3.11",
27+
"Programming Language :: Python :: 3.12",
2728
]
2829
dependencies = [
2930
"opentelemetry-proto == 1.26.0.dev",

‎exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
asgiref==3.7.2
2-
attrs==23.2.0
32
Deprecated==1.2.14
43
flaky==3.7.0
54
importlib-metadata==6.11.0
65
iniconfig==2.0.0
7-
packaging==23.2
8-
pluggy==1.4.0
6+
packaging==24.0
7+
pluggy==1.5.0
98
protobuf==3.20.3
10-
py==1.11.0
119
py-cpuinfo==9.0.0
12-
pytest==7.1.3
10+
pytest==7.4.4
1311
pytest-benchmark==4.0.0
1412
tomli==2.0.1
1513
typing_extensions==4.10.0

‎exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
asgiref==3.7.2
2-
attrs==23.2.0
32
Deprecated==1.2.14
43
flaky==3.7.0
54
importlib-metadata==6.11.0
65
iniconfig==2.0.0
7-
packaging==23.2
8-
pluggy==1.4.0
6+
packaging==24.0
7+
pluggy==1.5.0
98
protobuf==4.25.3
10-
py==1.11.0
119
py-cpuinfo==9.0.0
12-
pytest==7.1.3
10+
pytest==7.4.4
1311
pytest-benchmark==4.0.0
1412
tomli==2.0.1
1513
typing_extensions==4.10.0

‎exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ classifiers = [
2424
"Programming Language :: Python :: 3.9",
2525
"Programming Language :: Python :: 3.10",
2626
"Programming Language :: Python :: 3.11",
27+
"Programming Language :: Python :: 3.12",
2728
]
2829
dependencies = [
2930
"Deprecated >= 1.2.6",

‎exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
asgiref==3.7.2
2-
attrs==23.2.0
32
Deprecated==1.2.14
43
flaky==3.7.0
54
googleapis-common-protos==1.62.0
65
grpcio==1.62.0
76
importlib-metadata==6.11.0
87
iniconfig==2.0.0
9-
packaging==23.2
10-
pluggy==1.4.0
8+
packaging==24.0
9+
pluggy==1.5.0
1110
protobuf==3.20.3
12-
py==1.11.0
1311
py-cpuinfo==9.0.0
14-
pytest==7.1.3
12+
pytest==7.4.4
1513
pytest-benchmark==4.0.0
1614
tomli==2.0.1
1715
typing_extensions==4.10.0

0 commit comments

Comments
 (0)