Skip to content

Commit 3ed3922

Browse files
committed
Fix merge conflicts
2 parents 5de29db + d5dce5d commit 3ed3922

File tree

699 files changed

+64868
-5095
lines changed

Some content is hidden

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

699 files changed

+64868
-5095
lines changed

.flake8

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

.github/component_owners.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,13 @@ components:
4545

4646
instrumentation/opentelemetry-instrumentation-urllib:
4747
- shalevr
48-
- ocelotl
4948

5049
instrumentation/opentelemetry-instrumentation-urllib3:
5150
- shalevr
52-
- ocelotl
5351

5452
instrumentation/opentelemetry-instrumentation-sqlalchemy:
5553
- shalevr
5654

57-
instrumentation/opentelemetry-instrumentation-flask:
58-
- ocelotl
59-
60-
instrumentation/opentelemetry-instrumentation-jinja2:
61-
- ocelotl
62-
63-
instrumentation/opentelemetry-instrumentation-logging:
64-
- ocelotl
65-
66-
instrumentation/opentelemetry-instrumentation-requests:
67-
- ocelotl
68-
6955
instrumentation/opentelemetry-instrumentation-cassandra:
7056
- mattcontinisio
7157

@@ -75,5 +61,20 @@ components:
7561
instrumentation/opentelemetry-instrumentation-psycopg:
7662
- federicobond
7763

64+
instrumentation/opentelemetry-instrumentation-pymssql:
65+
- guillaumep
66+
67+
instrumentation/opentelemetry-instrumentation-aiokafka:
68+
- dimastbk
69+
7870
processor/opentelemetry-processor-baggage:
7971
- codeboten
72+
73+
instrumentation-genai/:
74+
- karthikscale3
75+
- lmolkova
76+
- lzchen
77+
- gyliu513
78+
- nirga
79+
- alizenhom
80+
- 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)