Skip to content

Commit e3353ac

Browse files
xrmxxrmx
authored
Merge branch 'main' into instrument-httpx-base-methods
2 parents fa69a65 + bd4a22a commit e3353ac

File tree

480 files changed

+12606
-2797
lines changed

Some content is hidden

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

480 files changed

+12606
-2797
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/component_owners.yml

+9
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,12 @@ components:
6767

6868
instrumentation/opentelemetry-instrumentation-cassandra:
6969
- mattcontinisio
70+
71+
instrumentation/opentelemetry-instrumentation-asyncio:
72+
- bourbonkk
73+
74+
instrumentation/opentelemetry-instrumentation-psycopg:
75+
- federicobond
76+
77+
processor/opentelemetry-processor-baggage:
78+
- 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

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

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

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Contrib Repo Tests
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- 'release/*'
7+
pull_request:
8+
env:
9+
CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
10+
11+
jobs:
12+
instrumentations-1:
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+
pypy3: pypy-3.8
20+
RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
21+
runs-on: ${{ matrix.os }}
22+
strategy:
23+
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
24+
matrix:
25+
python-version: [py38, py39, py310, py311, pypy3]
26+
package:
27+
- "urllib"
28+
- "urllib3"
29+
- "wsgi"
30+
- "distro"
31+
- "richconsole"
32+
- "psycopg"
33+
- "prometheus-remote-write"
34+
- "sdk-extension-aws"
35+
- "propagator-aws-xray"
36+
- "propagator-ot-trace"
37+
- "resource-detector-container"
38+
os: [ubuntu-20.04]
39+
exclude:
40+
- python-version: py311
41+
package: "prometheus-remote-write"
42+
- python-version: pypy3
43+
package: "prometheus-remote-write"
44+
steps:
45+
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
46+
uses: actions/checkout@v4
47+
- name: Set up Python ${{ env[matrix.python-version] }}
48+
uses: actions/setup-python@v5
49+
with:
50+
python-version: ${{ env[matrix.python-version] }}
51+
- name: Install tox
52+
run: pip install tox
53+
- name: Cache tox environment
54+
# Preserves .tox directory between runs for faster installs
55+
uses: actions/cache@v4
56+
with:
57+
path: |
58+
.tox
59+
~/.cache/pip
60+
key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
61+
- name: run tox
62+
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-json=${{ env.RUN_MATRIX_COMBINATION }}-benchmark.json

Diff for: ‎.github/workflows/prepare-patch-release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
prepare-patch-release:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
9+
- uses: actions/checkout@v4
1010

1111
- run: |
1212
if [[ ! $GITHUB_REF_NAME =~ ^release/v[0-9]+\.[0-9]+\.x-0\.[0-9]+bx$ ]]; then
@@ -50,11 +50,11 @@ jobs:
5050
run: .github/scripts/update-version.sh $STABLE_VERSION $UNSTABLE_VERSION
5151

5252
- name: Set up Python 3.9
53-
uses: actions/setup-python@v2
53+
uses: actions/setup-python@v5
5454
with:
5555
python-version: 3.9
5656
- name: Install tox
57-
run: pip install tox==3.27.1
57+
run: pip install tox
5858
- name: run tox
5959
run: tox -e generate
6060

@@ -79,4 +79,4 @@ jobs:
7979
gh pr create --title "[$GITHUB_REF_NAME] $message" \
8080
--body "$message." \
8181
--head $branch \
82-
--base $GITHUB_REF_NAME
82+
--base $GITHUB_REF_NAME

Diff for: ‎.github/workflows/prepare-release-branch.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
prereqs:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Verify prerequisites
1616
env:
@@ -39,7 +39,7 @@ jobs:
3939
runs-on: ubuntu-latest
4040
needs: prereqs
4141
steps:
42-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
4343

4444
- name: Create release branch
4545
env:
@@ -77,11 +77,11 @@ jobs:
7777
run: .github/scripts/update-version.sh $STABLE_VERSION $UNSTABLE_VERSION
7878

7979
- name: Set up Python 3.9
80-
uses: actions/setup-python@v2
80+
uses: actions/setup-python@v5
8181
with:
8282
python-version: 3.9
8383
- name: Install tox
84-
run: pip install tox==3.27.1
84+
run: pip install tox
8585
- name: run tox
8686
run: tox -e generate
8787

@@ -112,7 +112,7 @@ jobs:
112112
runs-on: ubuntu-latest
113113
needs: prereqs
114114
steps:
115-
- uses: actions/checkout@v3
115+
- uses: actions/checkout@v4
116116

117117
- name: Set environment variables
118118
env:
@@ -161,11 +161,11 @@ jobs:
161161
run: .github/scripts/update-version.sh $STABLE_NEXT_VERSION $UNSTABLE_NEXT_VERSION
162162

163163
- name: Set up Python 3.9
164-
uses: actions/setup-python@v2
164+
uses: actions/setup-python@v5
165165
with:
166166
python-version: 3.9
167167
- name: Install tox
168-
run: pip install tox==3.27.1
168+
run: pip install tox
169169
- name: run tox
170170
run: tox -e generate
171171

@@ -192,4 +192,4 @@ jobs:
192192
gh pr create --title "$message" \
193193
--body "$body" \
194194
--head $branch \
195-
--base main
195+
--base main

Diff for: ‎.github/workflows/publish-a-package-from-tag.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
name: Publish package from tag
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v1
14-
- uses: actions/setup-python@v1
13+
- uses: actions/checkout@v4
14+
- uses: actions/setup-python@v5
1515
with:
1616
python-version: '3.9'
1717
- name: Log tag that triggered publish workflow

0 commit comments

Comments
 (0)