Skip to content

Commit 88c13c2

Browse files
authored
Merge branch 'main' into add-sqlcommenter-fields
2 parents 6e4188e + 3f50c08 commit 88c13c2

File tree

623 files changed

+46478
-7101
lines changed

Some content is hidden

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

623 files changed

+46478
-7101
lines changed

.flake8

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.md

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

.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: 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"

.github/component_owners.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ components:
3535
sdk-extension/opentelemetry-sdk-extension-aws:
3636
- NathanielRN
3737
- Kausik-A
38+
- srprash
3839

3940
instrumentation/opentelemetry-instrumentation-tortoiseorm:
4041
- tonybaloney
@@ -44,27 +45,13 @@ components:
4445

4546
instrumentation/opentelemetry-instrumentation-urllib:
4647
- shalevr
47-
- ocelotl
4848

4949
instrumentation/opentelemetry-instrumentation-urllib3:
5050
- shalevr
51-
- ocelotl
5251

5352
instrumentation/opentelemetry-instrumentation-sqlalchemy:
5453
- shalevr
5554

56-
instrumentation/opentelemetry-instrumentation-flask:
57-
- ocelotl
58-
59-
instrumentation/opentelemetry-instrumentation-jinja2:
60-
- ocelotl
61-
62-
instrumentation/opentelemetry-instrumentation-logging:
63-
- ocelotl
64-
65-
instrumentation/opentelemetry-instrumentation-requests:
66-
- ocelotl
67-
6855
instrumentation/opentelemetry-instrumentation-cassandra:
6956
- mattcontinisio
7057

@@ -74,5 +61,17 @@ components:
7461
instrumentation/opentelemetry-instrumentation-psycopg:
7562
- federicobond
7663

64+
instrumentation/opentelemetry-instrumentation-aiokafka:
65+
- dimastbk
66+
7767
processor/opentelemetry-processor-baggage:
7868
- codeboten
69+
70+
instrumentation-genai/:
71+
- karthikscale3
72+
- lmolkova
73+
- lzchen
74+
- gyliu513
75+
- nirga
76+
- alizenhom
77+
- codefromthecrypt
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash -e
2+
3+
sed -i "/\[stable\]/{n;s/version=.*/version=$1/}" eachdist.ini
4+
sed -i "/\[prerelease\]/{n;s/version=.*/version=$2/}" eachdist.ini
5+
6+
./scripts/eachdist.py update_patch_versions \
7+
--stable_version=$1 \
8+
--unstable_version=$2 \
9+
--stable_version_prev=$3 \
10+
--unstable_version_prev=$4
11+

.github/workflows/component-owners.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ jobs:
1010
run_self:
1111
runs-on: ubuntu-latest
1212
name: Auto Assign Owners
13+
permissions:
14+
contents: read # to read changed files
15+
issues: write # to read/write issue assignees
16+
pull-requests: write # to read/write PR reviewers
1317
# Don't fail tests if this workflow fails. Some pending issues:
1418
# - https://github.com/dyladan/component-owners/issues/8
1519
continue-on-error: true

0 commit comments

Comments
 (0)