Skip to content

Commit 63b4507

Browse files
GilTeixeiraGilTeixeira
committed
Merge remote-tracking branch 'upstream/main' into main
2 parents 6db5340 + c68d0fd commit 63b4507

File tree

161 files changed

+1931
-1067
lines changed

Some content is hidden

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

161 files changed

+1931
-1067
lines changed

‎.github/workflows/instrumentations_0.yml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
name: Contrib Repo Tests
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- 'release/*'
7+
pull_request:
8+
env:
9+
CORE_REPO_SHA: 84c0e4f38d4fcdb8c13fd3988469fbb8cda28150
10+
11+
jobs:
12+
instrumentations-0:
13+
env:
14+
# We use these variables to convert between tox and GHA version literals
15+
py37: 3.7
16+
py38: 3.8
17+
py39: 3.9
18+
py310: "3.10"
19+
py311: "3.11"
20+
pypy3: pypy-3.7
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: [py37, py38, py39, py310, py311, 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+
- "sklearn"
70+
- "sqlalchemy"
71+
- "sqlite3"
72+
- "starlette"
73+
- "system-metrics"
74+
- "tornado"
75+
- "tortoiseorm"
76+
os: [ubuntu-20.04]
77+
steps:
78+
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
79+
uses: actions/checkout@v2
80+
- name: Set up Python ${{ env[matrix.python-version] }}
81+
uses: actions/setup-python@v4
82+
with:
83+
python-version: ${{ env[matrix.python-version] }}
84+
- name: Install tox
85+
run: pip install tox==3.27.1 tox-factor
86+
- name: Cache tox environment
87+
# Preserves .tox directory between runs for faster installs
88+
uses: actions/cache@v1
89+
with:
90+
path: |
91+
.tox
92+
~/.cache/pip
93+
key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
94+
- name: run tox
95+
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-json=${{ env.RUN_MATRIX_COMBINATION }}-benchmark.json

‎.github/workflows/instrumentations_1.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Contrib Repo Tests
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- 'release/*'
7+
pull_request:
8+
env:
9+
CORE_REPO_SHA: 84c0e4f38d4fcdb8c13fd3988469fbb8cda28150
10+
11+
jobs:
12+
instrumentations-1:
13+
env:
14+
# We use these variables to convert between tox and GHA version literals
15+
py37: 3.7
16+
py38: 3.8
17+
py39: 3.9
18+
py310: "3.10"
19+
py311: "3.11"
20+
pypy3: pypy-3.7
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: [py37, py38, py39, py310, py311, pypy3]
27+
package:
28+
- "urllib"
29+
- "urllib3v"
30+
- "wsgi"
31+
- "distro"
32+
- "richconsole"
33+
- "prometheus-remote-write"
34+
- "sdkextension-aws"
35+
- "propagator-aws-xray"
36+
- "propagator-ot-trace"
37+
- "resource-detector-container"
38+
os: [ubuntu-20.04]
39+
steps:
40+
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
41+
uses: actions/checkout@v2
42+
- name: Set up Python ${{ env[matrix.python-version] }}
43+
uses: actions/setup-python@v4
44+
with:
45+
python-version: ${{ env[matrix.python-version] }}
46+
- name: Install tox
47+
run: pip install tox==3.27.1 tox-factor
48+
- name: Cache tox environment
49+
# Preserves .tox directory between runs for faster installs
50+
uses: actions/cache@v1
51+
with:
52+
path: |
53+
.tox
54+
~/.cache/pip
55+
key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
56+
- name: run tox
57+
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-json=${{ env.RUN_MATRIX_COMBINATION }}-benchmark.json

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -6,92 +6,9 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 9831afaff5b4d371fd9a14266ab47884546bd971
9+
CORE_REPO_SHA: 84c0e4f38d4fcdb8c13fd3988469fbb8cda28150
1010

1111
jobs:
12-
build:
13-
env:
14-
# We use these variables to convert between tox and GHA version literals
15-
py37: 3.7
16-
py38: 3.8
17-
py39: 3.9
18-
py310: "3.10"
19-
py311: "3.11"
20-
pypy3: "pypy3.7"
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: [ py37, py38, py39, py310, py311, pypy3 ]
27-
package: ["instrumentation", "distro", "exporter", "sdkextension", "propagator", "resource"]
28-
os: [ ubuntu-20.04 ]
29-
steps:
30-
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
31-
uses: actions/checkout@v2
32-
- name: Set up Python ${{ env[matrix.python-version] }}
33-
uses: actions/setup-python@v4
34-
with:
35-
python-version: ${{ env[matrix.python-version] }}
36-
- name: Install tox
37-
run: pip install tox==3.27.1 tox-factor
38-
- name: Cache tox environment
39-
# Preserves .tox directory between runs for faster installs
40-
uses: actions/cache@v1
41-
with:
42-
path: |
43-
.tox
44-
~/.cache/pip
45-
key: v7-build-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
46-
- name: run tox
47-
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-json=${{ env.RUN_MATRIX_COMBINATION }}-benchmark.json
48-
# - name: Find and merge ${{ matrix.package }} benchmarks
49-
# # TODO: Add at least one benchmark to every package type to remove this (#249)
50-
# if: matrix.package == 'sdkextension' || matrix.package == 'propagator'
51-
# run: >-
52-
# mkdir -p benchmarks;
53-
# jq -s '.[0].benchmarks = ([.[].benchmarks] | add)
54-
# | if .[0].benchmarks == null then null else .[0] end'
55-
# **/**/tests/*${{ matrix.package }}*-benchmark.json > benchmarks/output_${{ matrix.package }}.json
56-
# - name: Upload all benchmarks under same key as an artifact
57-
# if: ${{ success() }}
58-
# uses: actions/upload-artifact@v2
59-
# with:
60-
# name: benchmarks
61-
# path: benchmarks/output_${{ matrix.package }}.json
62-
# combine-benchmarks:
63-
# runs-on: ubuntu-latest
64-
# needs: build
65-
# if: ${{ always() }}
66-
# name: Combine benchmarks from previous build job
67-
# steps:
68-
# - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
69-
# uses: actions/checkout@v2
70-
# - name: Download all benchmarks as artifact using key
71-
# uses: actions/download-artifact@v2
72-
# with:
73-
# name: benchmarks
74-
# path: benchmarks
75-
# - name: Find and merge all benchmarks
76-
# run: >-
77-
# jq -s '.[0].benchmarks = ([.[].benchmarks] | add)
78-
# | if .[0].benchmarks == null then null else .[0] end'
79-
# benchmarks/output_*.json > output.json;
80-
# - name: Report on benchmark results
81-
# uses: benchmark-action/github-action-benchmark@v1
82-
# with:
83-
# name: OpenTelemetry Python Benchmarks - Python ${{ env[matrix.python-version ]}} - ${{ matrix.package }}
84-
# tool: pytest
85-
# output-file-path: output.json
86-
# github-token: ${{ secrets.GITHUB_TOKEN }}
87-
# max-items-in-chart: 100
88-
# # Alert with a commit comment on possible performance regression
89-
# alert-threshold: 200%
90-
# fail-on-alert: true
91-
# # Make a commit on `gh-pages` with benchmarks from previous step
92-
# auto-push: ${{ github.ref == 'refs/heads/main' }}
93-
# gh-pages-branch: gh-pages
94-
# benchmark-data-dir-path: benchmarks
9512
misc:
9613
strategy:
9714
fail-fast: false

‎CHANGELOG.md‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,38 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
- `opentelemetry-resource-detector-azure` Added 10s timeout to VM Resource Detector
11+
([#2119](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2119))
12+
- `opentelemetry-instrumentation-confluent-kafka` Add support for higher versions until 2.3.0 of confluent_kafka
13+
([#2132](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2132))
14+
- `opentelemetry-resource-detector-azure` Changed timeout to 4 seconds due to [timeout bug](https://github.com/open-telemetry/opentelemetry-python/issues/3644)
15+
([#2136](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2136))
16+
- Fix elastic-search instrumentation sanitization to support bulk queries
17+
([#1990](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1988))
18+
19+
## Version 1.22.0/0.43b0 (2023-12-14)
20+
1021
### Added
1122

1223
- `opentelemetry-instrumentation` Added Otel semantic convention opt-in mechanism
1324
([#1987](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1987))
1425
- `opentelemetry-instrumentation-httpx` Fix mixing async and non async hooks
1526
([#1920](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1920))
27+
- `opentelemetry-instrumentation-requests` Implement new semantic convention opt-in with stable http semantic conventions
28+
([#2002](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2002))
29+
- `opentelemetry-instrument-grpc` Fix arity of context.abort for AIO RPCs
30+
([#2066](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2066))
31+
- Consolidate instrumentation suppression mechanisms and fix bug in httpx instrumentation
32+
([#2061](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2061))
1633

1734
### Fixed
1835

36+
- `opentelemetry-instrumentation-httpx` Remove URL credentials
37+
([#2020](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2020))
1938
- `opentelemetry-instrumentation-urllib`/`opentelemetry-instrumentation-urllib3` Fix metric descriptions to match semantic conventions
20-
([#1959]((https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1959))
39+
([#1959](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1959))
40+
- `opentelemetry-resource-detector-azure` Added dependency for Cloud Resource ID attribute
41+
([#2072](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2072))
2142

2243
## Version 1.21.0/0.42b0 (2023-11-01)
2344

@@ -31,11 +52,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3152
([#1948](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1948))
3253
- Added schema_url (`"https://opentelemetry.io/schemas/1.11.0"`) to all metrics and traces
3354
([#1977](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1977))
55+
- Add support for configuring ASGI middleware header extraction via runtime constructor parameters
56+
([#2026](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2026))
3457

3558
### Fixed
3659

37-
- Fix elastic-search instrumentation sanitization to support bulk queries
38-
([#1990](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1988))
60+
- `opentelemetry-instrumentation-aio-pika` and `opentelemetry-instrumentation-pika` Fix missing trace context propagation when trace not recording.
61+
([#1969](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1969))
3962
- Fix version of Flask dependency `werkzeug`
4063
([#1980](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1980))
4164
- `opentelemetry-resource-detector-azure` Using new Cloud Resource ID attribute.
@@ -57,6 +80,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5780

5881
- `opentelemetry-resource-detector-azure` Add resource detectors for Azure App Service and VM
5982
([#1901](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1901))
83+
- `opentelemetry-instrumentation-flask` Add support for Flask 3.0.0
84+
([#152](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2013))
6085

6186
## Version 1.19.0/0.40b0 (2023-07-13)
6287
- `opentelemetry-instrumentation-asgi` Add `http.server.request.size` metric

‎_template/README.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ This library allows tracing requests made by the <REPLACE ME> library.
1111
Installation
1212
------------
1313

14+
1415
::
1516

1617
pip install opentelemetry-instrumentation-<REPLACE ME>

‎_template/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.43b0.dev"
15+
__version__ = "0.44b0.dev"

‎docs-requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ botocore~=1.0
2727
boto3~=1.0
2828
cassandra-driver~=3.25
2929
celery>=4.0
30-
confluent-kafka>= 1.8.2,<= 2.2.0
30+
confluent-kafka>= 1.8.2,<= 2.3.0
3131
elasticsearch>=2.0,<9.0
3232
flask~=2.0
3333
falcon~=2.0

‎eachdist.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sortfirst=
1616
ext/*
1717

1818
[stable]
19-
version=1.22.0.dev
19+
version=1.23.0.dev
2020

2121
packages=
2222
opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
3434
opentelemetry-api
3535

3636
[prerelease]
37-
version=0.43b0.dev
37+
version=0.44b0.dev
3838

3939
packages=
4040
all

‎exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.43b0.dev"
15+
__version__ = "0.44b0.dev"

‎exporter/opentelemetry-exporter-richconsole/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
2929
"opentelemetry-sdk ~= 1.12",
30-
"opentelemetry-semantic-conventions == 0.43b0.dev",
30+
"opentelemetry-semantic-conventions == 0.44b0.dev",
3131
"rich>=10.0.0",
3232
]
3333

0 commit comments

Comments
 (0)