Skip to content

Commit a3ec2f0

Browse files
committed
chore: Merge remote-tracking branch 'origin/main'
2 parents 943c9de + 3836da8 commit a3ec2f0

File tree

290 files changed

+11019
-1422
lines changed

Some content is hidden

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

290 files changed

+11019
-1422
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/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 68 additions & 0 deletions
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

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

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 50 additions & 0 deletions
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/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/pull_request_template.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Description
22

3+
<!--
34
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
5+
-->
46

57
Fixes # (issue)
68

@@ -21,6 +23,7 @@ Please describe the tests that you ran to verify your changes. Provide instructi
2123

2224
# Does This PR Require a Contrib Repo Change?
2325

26+
<!--
2427
Answer the following question based on these examples of changes that would require a Contrib Repo Change:
2528
- [The OTel specification](https://github.com/open-telemetry/opentelemetry-specification) has changed which prompted this PR to update the method interfaces of `opentelemetry-api/` or `opentelemetry-sdk/`
2629
- The method interfaces of `test/util` have changed
@@ -33,6 +36,7 @@ Answer the following question based on these examples of changes that would requ
3336
- Major changes to project information, such as in:
3437
- `README.md`
3538
- `CONTRIBUTING.md`
39+
-->
3640

3741
- [ ] Yes. - Link to PR:
3842
- [ ] No.

.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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,36 @@ 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 }}
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
3535
~/.cache/pip
3636
key: v3-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini',
3737
'dev-requirements.txt') }}-core
3838
- name: Run tox
39-
run: tox -f ${{ matrix.python-version }}-sdk -- -k opentelemetry-sdk/tests/performance/benchmarks --benchmark-json=output.json
39+
run: tox -f ${{ matrix.python-version }}-sdk -- -k opentelemetry-sdk/tests/performance/benchmarks --benchmark-json=opentelemetry-sdk/tests/output.json
4040
- name: Report on SDK benchmark results
4141
uses: benchmark-action/github-action-benchmark@v1
4242
with:

0 commit comments

Comments
 (0)