Skip to content

Commit fac7127

Browse files
ocelotlocelotl
authored
Merge branch 'main' into fix-1781-alt
2 parents c26f203 + c3e9f75 commit fac7127

File tree

560 files changed

+24051
-5385
lines changed

Some content is hidden

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

560 files changed

+24051
-5385
lines changed

Diff for: ‎.flake8

+4
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

Diff for: ‎.github/ISSUE_TEMPLATE/bug_report.md

-19
This file was deleted.

Diff for: ‎.github/ISSUE_TEMPLATE/bug_report.yaml

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
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-contrib/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3Abug) to see if your bug is already addressed.
12+
13+
- type: textarea
14+
id: environment
15+
attributes:
16+
label: Describe your environment
17+
description: |
18+
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.
19+
value: |
20+
OS: (e.g, Ubuntu)
21+
Python version: (e.g., Python 3.8.10)
22+
Package version: (e.g., 0.46.0)
23+
24+
- type: textarea
25+
attributes:
26+
label: What happened?
27+
description: Please provide as much detail as you reasonably can.
28+
validations:
29+
required: true
30+
31+
- type: textarea
32+
attributes:
33+
label: Steps to Reproduce
34+
description: Provide a [minimal reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) if possible and the needed steps to reproduce the problem.
35+
validations:
36+
required: true
37+
38+
- type: textarea
39+
attributes:
40+
label: Expected Result
41+
description: What did you expect to see?
42+
validations:
43+
required: true
44+
45+
- type: textarea
46+
attributes:
47+
label: Actual Result
48+
description: What did you see instead?
49+
validations:
50+
required: true
51+
52+
- type: textarea
53+
id: additional-context
54+
attributes:
55+
label: Additional context
56+
description: Add any other context about the problem here.
57+
placeholder: Any additional information...
58+
59+
- type: dropdown
60+
id: contribute
61+
attributes:
62+
label: Would you like to implement a fix?
63+
description: For guidance on how to get started, refer to the [contribution guide](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CONTRIBUTING.md).
64+
options:
65+
- "No"
66+
- "Yes"

Diff for: ‎.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.

Diff for: ‎.github/ISSUE_TEMPLATE/feature_request.md

-19
This file was deleted.

Diff for: ‎.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: What problem do you want to solve?
14+
description: Is your feature request related to a problem? If so, provide a concise description of the problem.
15+
placeholder: Describe the problem and include relevant issue IDs
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-contrib/blob/main/CONTRIBUTING.md).
48+
options:
49+
- "No"
50+
- "Yes"

Diff for: ‎.github/component_owners.yml

+14
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ components:
33
docs/instrumentation:
44
- nemoshlag
55

6+
67
instrumentation/opentelemetry-instrumentation-aio-pika:
78
- ofek1weiss
89

@@ -34,6 +35,7 @@ components:
3435
sdk-extension/opentelemetry-sdk-extension-aws:
3536
- NathanielRN
3637
- Kausik-A
38+
- srprash
3739

3840
instrumentation/opentelemetry-instrumentation-tortoiseorm:
3941
- tonybaloney
@@ -63,3 +65,15 @@ components:
6365

6466
instrumentation/opentelemetry-instrumentation-requests:
6567
- ocelotl
68+
69+
instrumentation/opentelemetry-instrumentation-cassandra:
70+
- mattcontinisio
71+
72+
instrumentation/opentelemetry-instrumentation-asyncio:
73+
- bourbonkk
74+
75+
instrumentation/opentelemetry-instrumentation-psycopg:
76+
- federicobond
77+
78+
processor/opentelemetry-processor-baggage:
79+
- codeboten

Diff for: ‎.github/workflows/backport.yml

+2-2
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
@@ -40,4 +40,4 @@ jobs:
4040
gh pr create --title "[$GITHUB_REF_NAME] $title" \
4141
--body "Clean cherry-pick of #$NUMBER to the \`$GITHUB_REF_NAME\` branch." \
4242
--head $branch \
43-
--base $GITHUB_REF_NAME
43+
--base $GITHUB_REF_NAME

Diff for: ‎.github/workflows/changelog.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
&& github.actor != 'opentelemetrybot'
1919
2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222

2323
- name: Check for CHANGELOG changes
2424
run: |
@@ -33,4 +33,4 @@ jobs:
3333
echo "No CHANGELOG was modified."
3434
echo "Please add a CHANGELOG entry, or add the \"Skip Changelog\" label if not required."
3535
false
36-
fi
36+
fi

Diff for: ‎.github/workflows/codeql-analysis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ jobs:
2020

2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
2424

2525
# Initializes the CodeQL tools for scanning.
2626
- name: Initialize CodeQL
27-
uses: github/codeql-action/init@v1
27+
uses: github/codeql-action/init@v3
2828
with:
2929
languages: python
3030

3131
- name: Autobuild
32-
uses: github/codeql-action/autobuild@v1
32+
uses: github/codeql-action/autobuild@v3
3333

3434
- name: Perform CodeQL Analysis
35-
uses: github/codeql-action/analyze@v1
35+
uses: github/codeql-action/analyze@v3

Diff for: ‎.github/workflows/instrumentations_0.yml

+119
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
name: Contrib Repo Tests
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- 'release/*'
7+
pull_request:
8+
env:
9+
CORE_REPO_SHA: main
10+
11+
jobs:
12+
instrumentations-0:
13+
env:
14+
# We use these variables to convert between tox and GHA version literals
15+
py38: 3.8
16+
py39: 3.9
17+
py310: "3.10"
18+
py311: "3.11"
19+
py312: "3.12"
20+
pypy3: pypy-3.8
21+
RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
22+
runs-on: ${{ matrix.os }}
23+
strategy:
24+
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
25+
matrix:
26+
python-version: [py38, py39, py310, py311, py312, pypy3]
27+
package:
28+
# Do not add more instrumentations here, add them in instrumentations_1.yml.
29+
# The reason for this separation of instrumentations into more than one YAML file is
30+
# the limit of jobs that can be run from a Github actions matrix:
31+
# https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
32+
# "A matrix will generate a maximum of 256 jobs per workflow run. This limit applies
33+
# to both GitHub-hosted and self-hosted runners."
34+
- "aiohttp-client"
35+
- "aiohttp-server"
36+
- "aiopg"
37+
- "aio-pika"
38+
- "asgi"
39+
- "asyncpg"
40+
- "aws-lambda"
41+
- "boto"
42+
- "boto3sqs"
43+
- "botocore"
44+
- "cassandra"
45+
- "celery"
46+
- "confluent-kafka"
47+
- "dbapi"
48+
- "django"
49+
- "elasticsearch"
50+
- "falcon"
51+
- "fastapi"
52+
- "flask"
53+
- "grpc"
54+
- "httpx"
55+
- "jinja2"
56+
- "kafka-python"
57+
- "logging"
58+
- "mysql"
59+
- "mysqlclient"
60+
- "sio-pika"
61+
- "psycopg2"
62+
- "pymemcache"
63+
- "pymongo"
64+
- "pymysql"
65+
- "pyramid"
66+
- "redis"
67+
- "remoulade"
68+
- "requests"
69+
- "sqlalchemy"
70+
- "sqlite3"
71+
- "starlette"
72+
- "system-metrics"
73+
- "tornado"
74+
- "tortoiseorm"
75+
os: [ubuntu-20.04]
76+
exclude:
77+
- python-version: py312
78+
package: "boto"
79+
- python-version: py312
80+
package: "kafka-python"
81+
- python-version: pypy3
82+
package: "aiopg"
83+
- python-version: pypy3
84+
package: "asyncpg"
85+
- python-version: pypy3
86+
package: "boto"
87+
- python-version: pypy3
88+
package: "boto3sqs"
89+
- python-version: pypy3
90+
package: "botocore"
91+
- python-version: pypy3
92+
package: "psycopg2"
93+
- python-version: pypy3
94+
package: "remoulade"
95+
- python-version: pypy3
96+
package: "requests"
97+
- python-version: pypy3
98+
package: "confluent-kafka"
99+
- python-version: pypy3
100+
package: "grpc"
101+
steps:
102+
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
103+
uses: actions/checkout@v4
104+
- name: Set up Python ${{ env[matrix.python-version] }}
105+
uses: actions/setup-python@v5
106+
with:
107+
python-version: ${{ env[matrix.python-version] }}
108+
- name: Install tox
109+
run: pip install tox
110+
- name: Cache tox environment
111+
# Preserves .tox directory between runs for faster installs
112+
uses: actions/cache@v4
113+
with:
114+
path: |
115+
.tox
116+
~/.cache/pip
117+
key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('gen-requirements.txt', 'dev-requirements.txt') }}
118+
- name: run tox
119+
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra

0 commit comments

Comments
 (0)