Skip to content

Commit 281ceef

Browse files
authored
Merge branch 'main' into fix/issue-3671
2 parents 34b6188 + 843f345 commit 281ceef

File tree

239 files changed

+7373
-3437
lines changed

Some content is hidden

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

239 files changed

+7373
-3437
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,11 @@ body:
6464
options:
6565
- "No"
6666
- "Yes"
67+
68+
- type: dropdown
69+
attributes:
70+
label: Tip
71+
description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
72+
options:
73+
- <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
74+
default: 0

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,11 @@ body:
4848
options:
4949
- "No"
5050
- "Yes"
51+
52+
- type: dropdown
53+
attributes:
54+
label: Tip
55+
description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
56+
options:
57+
- <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
58+
default: 0

.github/component_owners.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,11 @@ components:
3333
- dorkolog
3434

3535
propagator/opentelemetry-propagator-aws-xray:
36-
- NathanielRN
36+
- jj22ee
3737

3838
sdk-extension/opentelemetry-sdk-extension-aws:
39-
- NathanielRN
40-
- Kausik-A
4139
- srprash
40+
- jj22ee
4241

4342
instrumentation/opentelemetry-instrumentation-tortoiseorm:
4443
- tonybaloney

.github/workflows/core_contrib_test_0.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,6 +2453,36 @@ jobs:
24532453
- name: Run tests
24542454
run: tox -e py39-test-util-http -- -ra
24552455

2456+
py39-test-util-genai:
2457+
name: util-genai
2458+
runs-on: ubuntu-latest
2459+
timeout-minutes: 30
2460+
steps:
2461+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
2462+
uses: actions/checkout@v4
2463+
with:
2464+
repository: open-telemetry/opentelemetry-python-contrib
2465+
ref: ${{ env.CONTRIB_REPO_SHA }}
2466+
2467+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
2468+
uses: actions/checkout@v4
2469+
with:
2470+
repository: open-telemetry/opentelemetry-python
2471+
ref: ${{ env.CORE_REPO_SHA }}
2472+
path: opentelemetry-python
2473+
2474+
- name: Set up Python 3.9
2475+
uses: actions/setup-python@v5
2476+
with:
2477+
python-version: "3.9"
2478+
architecture: "x64"
2479+
2480+
- name: Install tox
2481+
run: pip install tox-uv
2482+
2483+
- name: Run tests
2484+
run: tox -e py39-test-util-genai -- -ra
2485+
24562486
py39-test-propagator-aws-xray-0:
24572487
name: propagator-aws-xray-0
24582488
runs-on: ubuntu-latest

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/test.yml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

.github/workflows/lint_0.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:
@@ -1076,6 +1077,25 @@ jobs:
10761077
- name: Run tests
10771078
run: tox -e lint-util-http
10781079

1080+
lint-util-genai:
1081+
name: util-genai
1082+
runs-on: ubuntu-latest
1083+
timeout-minutes: 30
1084+
steps:
1085+
- name: Checkout repo @ SHA - ${{ github.sha }}
1086+
uses: actions/checkout@v4
1087+
1088+
- name: Set up Python 3.13
1089+
uses: actions/setup-python@v5
1090+
with:
1091+
python-version: "3.13"
1092+
1093+
- name: Install tox
1094+
run: pip install tox-uv
1095+
1096+
- name: Run tests
1097+
run: tox -e lint-util-genai
1098+
10791099
lint-propagator-aws-xray:
10801100
name: propagator-aws-xray
10811101
runs-on: ubuntu-latest

.github/workflows/misc_0.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

.github/workflows/test_0.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
push:
88
branches-ignore:
99
- 'release/*'
10+
- 'otelbot/*'
1011
pull_request:
1112

1213
permissions:

0 commit comments

Comments
 (0)