Skip to content

Commit 4d9613e

Browse files
jgibojgibo
authored
Merge branch 'open-telemetry:main' into issue_2555
2 parents b60cfc8 + 3511ed1 commit 4d9613e

File tree

214 files changed

+894
-985
lines changed

Some content is hidden

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

214 files changed

+894
-985
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
9+
CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
1010

1111
jobs:
1212
instrumentations-0:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
9+
CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
1010

1111
jobs:
1212
instrumentations-1:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
9+
CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
1010

1111
jobs:
1212
lint-3_11:

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

+8-6
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,14 @@ jobs:
8181
# rejected by pypi (e.g "3 - Beta"). This would cause a failure during the
8282
# middle of the package upload causing the action to fail, and certain packages
8383
# might have already been updated, this would be bad.
84-
- name: Publish to TestPyPI
85-
env:
86-
TWINE_USERNAME: '__token__'
87-
TWINE_PASSWORD: ${{ secrets.test_pypi_token }}
88-
run: |
89-
twine upload --repository testpypi --skip-existing --verbose dist/*
84+
# EDIT: 5/31/2024 - TestPypi now requires a verified email. Commenting out as a temporary measure
85+
# until we found TestPypi credentials.
86+
# - name: Publish to TestPyPI
87+
# env:
88+
# TWINE_USERNAME: '__token__'
89+
# TWINE_PASSWORD: ${{ secrets.test_pypi_token }}
90+
# run: |
91+
# twine upload --repository testpypi --skip-existing --verbose dist/*
9092

9193
- name: Publish to PyPI
9294
env:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 47d5ad7aae5aef31238ca66e55dc550b307c7b35
9+
CORE_REPO_SHA: 141a6a2e473ef7f0ec4915dfb71e3c0fa595283e
1010

1111
jobs:
1212
misc:

Diff for: ‎CHANGELOG.md

+13-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Breaking changes
1111

12+
- `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-fastapi`, `opentelemetry-instrumentation-starlette` Use `tracer` and `meter` of originating components instead of one from `asgi` middleware
13+
([#2580](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2580))
14+
15+
### Fixed
16+
17+
- `opentelemetry-instrumentation-httpx` Ensure httpx.get or httpx.request like methods are instrumented
18+
([#2538](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2538))
19+
20+
## Version 1.25.0/0.46b0 (2024-05-31)
21+
22+
### Breaking changes
23+
1224
- Add return statement to Confluent kafka Producer poll() and flush() calls when instrumented by ConfluentKafkaInstrumentor().instrument_producer() ([#2527](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2527))
1325
- Rename `type` attribute to `asgi.event.type` in `opentelemetry-instrumentation-asgi`
1426
([#2300](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2300))
@@ -20,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2032
([#2425](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2425))
2133
- `opentelemetry-instrumentation-flask` Add `http.method` to `span.name`
2234
([#2454](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2454))
35+
- ASGI, FastAPI, Starlette: provide both send and receive hooks with `scope` and `message` for internal spans ([#2546](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2546))
2336

2437
### Added
2538

@@ -44,8 +57,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4457

4558
- `opentelemetry-instrumentation-dbapi` Fix compatibility with Psycopg3 to extract libpq build version
4659
([#2500](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2500))
47-
- `opentelemetry-instrumentation-httpx` Ensure httpx.get or httpx.request like methods are instrumented
48-
([#2538](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2538))
4960
- `opentelemetry-instrumentation-grpc` AioClientInterceptor should propagate with a Metadata object
5061
([#2363](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2363))
5162
- `opentelemetry-instrumentation-boto3sqs` Instrument Session and resource

Diff for: ‎CONTRIBUTING.md

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ on how to become a [**Member**](https://github.com/open-telemetry/community/blob
1313
[**Approver**](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
1414
and [**Maintainer**](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
1515

16+
Before you can contribute, you will need to sign the [Contributor License Agreement](https://docs.linuxfoundation.org/lfx/easycla/contributors).
17+
18+
Please also read the [OpenTelemetry Contributor Guide](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md).
19+
1620
## Index
1721

1822
* [Find a Buddy and get Started Quickly](#find-a-buddy-and-get-started-quickly)

Diff for: ‎_template/version.py

+1-1
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.46b0.dev"
15+
__version__ = "0.47b0.dev"

Diff for: ‎eachdist.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sortfirst=
1616
ext/*
1717

1818
[stable]
19-
version=1.25.0.dev
19+
version=1.26.0.dev
2020

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

3636
[prerelease]
37-
version=0.46b0.dev
37+
version=0.47b0.dev
3838

3939
packages=
4040
all

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

+1-1
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.46b0.dev"
15+
__version__ = "0.47b0.dev"

Diff for: ‎exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
asgiref==3.7.2
2-
attrs==23.2.0
32
certifi==2024.2.2
43
charset-normalizer==3.3.2
54
cramjam==2.8.1
65
Deprecated==1.2.14
76
idna==3.6
87
importlib-metadata==6.11.0
98
iniconfig==2.0.0
10-
packaging==23.2
11-
pluggy==1.4.0
9+
packaging==24.0
10+
pluggy==1.5.0
1211
protobuf==4.25.3
13-
py==1.11.0
1412
py-cpuinfo==9.0.0
15-
pytest==7.1.3
13+
pytest==7.4.4
1614
pytest-benchmark==4.0.0
1715
python-snappy==0.7.1
1816
requests==2.31.0

Diff for: ‎exporter/opentelemetry-exporter-richconsole/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ classifiers = [
2626
dependencies = [
2727
"opentelemetry-api ~= 1.12",
2828
"opentelemetry-sdk ~= 1.12",
29-
"opentelemetry-semantic-conventions == 0.46b0.dev",
29+
"opentelemetry-semantic-conventions == 0.47b0.dev",
3030
"rich>=10.0.0",
3131
]
3232

Diff for: ‎exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py

+1-1
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.46b0.dev"
15+
__version__ = "0.47b0.dev"

Diff for: ‎exporter/opentelemetry-exporter-richconsole/test-requirements.txt

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
asgiref==3.7.2
2-
attrs==23.2.0
32
Deprecated==1.2.14
43
flaky==3.7.0
54
importlib-metadata==6.11.0
65
iniconfig==2.0.0
76
markdown-it-py==3.0.0
87
mdurl==0.1.2
9-
packaging==23.2
10-
pluggy==1.4.0
11-
py==1.11.0
8+
packaging==24.0
9+
pluggy==1.5.0
1210
py-cpuinfo==9.0.0
1311
Pygments==2.17.2
14-
pytest==7.1.3
12+
pytest==7.4.4
1513
pytest-benchmark==4.0.0
1614
rich==13.7.1
1715
tomli==2.0.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ classifiers = [
2525
]
2626
dependencies = [
2727
"opentelemetry-api ~= 1.5",
28-
"opentelemetry-instrumentation == 0.46b0.dev",
28+
"opentelemetry-instrumentation == 0.47b0.dev",
2929
"wrapt >= 1.0.0, < 2.0.0",
3030
]
3131

Diff for: ‎instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py

+1-1
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.46b0.dev"
15+
__version__ = "0.47b0.dev"

Diff for: ‎instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
aio-pika==7.2.0
22
aiormq==6.2.3
33
asgiref==3.7.2
4-
attrs==23.2.0
54
Deprecated==1.2.14
6-
idna==3.6
5+
idna==3.7
76
importlib-metadata==6.11.0
87
iniconfig==2.0.0
98
multidict==6.0.5
10-
packaging==23.2
9+
packaging==24.0
1110
pamqp==3.1.0
12-
pluggy==1.4.0
13-
py==1.11.0
11+
pluggy==1.5.0
1412
py-cpuinfo==9.0.0
15-
pytest==7.1.3
13+
pytest==7.4.4
1614
pytest-benchmark==4.0.0
1715
tomli==2.0.1
1816
typing_extensions==4.9.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
aio-pika==8.3.0
22
aiormq==6.6.4
33
asgiref==3.7.2
4-
attrs==23.2.0
54
Deprecated==1.2.14
6-
idna==3.6
5+
idna==3.7
76
importlib-metadata==6.11.0
87
iniconfig==2.0.0
98
multidict==6.0.5
10-
packaging==23.2
9+
packaging==24.0
1110
pamqp==3.2.1
12-
pluggy==1.4.0
13-
py==1.11.0
11+
pluggy==1.5.0
1412
py-cpuinfo==9.0.0
15-
pytest==7.1.3
13+
pytest==7.4.4
1614
pytest-benchmark==4.0.0
1715
tomli==2.0.1
1816
typing_extensions==4.9.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
aio-pika==9.0.5
22
aiormq==6.7.1
33
asgiref==3.7.2
4-
attrs==23.2.0
54
Deprecated==1.2.14
6-
idna==3.6
5+
idna==3.7
76
importlib-metadata==6.11.0
87
iniconfig==2.0.0
98
multidict==6.0.5
10-
packaging==23.2
9+
packaging==24.0
1110
pamqp==3.2.1
12-
pluggy==1.4.0
13-
py==1.11.0
11+
pluggy==1.5.0
1412
py-cpuinfo==9.0.0
15-
pytest==7.1.3
13+
pytest==7.4.4
1614
pytest-benchmark==4.0.0
1715
tomli==2.0.1
1816
typing_extensions==4.9.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
aio-pika==9.4.1
22
aiormq==6.8.0
33
asgiref==3.7.2
4-
attrs==23.2.0
54
Deprecated==1.2.14
6-
idna==3.6
5+
idna==3.7
76
importlib-metadata==6.11.0
87
iniconfig==2.0.0
98
multidict==6.0.5
10-
packaging==23.2
9+
packaging==24.0
1110
pamqp==3.3.0
12-
pluggy==1.4.0
13-
py==1.11.0
11+
pluggy==1.5.0
1412
py-cpuinfo==9.0.0
15-
pytest==7.1.3
13+
pytest==7.4.4
1614
pytest-benchmark==4.0.0
1715
tomli==2.0.1
1816
typing_extensions==4.9.0

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ classifiers = [
2525
]
2626
dependencies = [
2727
"opentelemetry-api ~= 1.12",
28-
"opentelemetry-instrumentation == 0.46b0.dev",
29-
"opentelemetry-semantic-conventions == 0.46b0.dev",
30-
"opentelemetry-util-http == 0.46b0.dev",
28+
"opentelemetry-instrumentation == 0.47b0.dev",
29+
"opentelemetry-semantic-conventions == 0.47b0.dev",
30+
"opentelemetry-util-http == 0.47b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py

+1-1
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.46b0.dev"
15+
__version__ = "0.47b0.dev"

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ aiohttp==3.9.3
22
aiosignal==1.3.1
33
asgiref==3.7.2
44
async-timeout==4.0.3
5-
attrs==23.2.0
65
blinker==1.7.0
76
certifi==2024.2.2
87
charset-normalizer==3.3.2
@@ -11,18 +10,17 @@ Deprecated==1.2.14
1110
Flask==3.0.2
1211
frozenlist==1.4.1
1312
http_server_mock==1.7
14-
idna==3.6
13+
idna==3.7
1514
importlib-metadata==6.11.0
1615
iniconfig==2.0.0
1716
itsdangerous==2.1.2
1817
Jinja2==3.1.3
1918
MarkupSafe==2.1.5
2019
multidict==6.0.5
21-
packaging==23.2
22-
pluggy==1.4.0
23-
py==1.11.0
20+
packaging==24.0
21+
pluggy==1.5.0
2422
py-cpuinfo==9.0.0
25-
pytest==7.1.3
23+
pytest==7.4.4
2624
pytest-benchmark==4.0.0
2725
requests==2.31.0
2826
tomli==2.0.1

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ classifiers = [
2525
]
2626
dependencies = [
2727
"opentelemetry-api ~= 1.12",
28-
"opentelemetry-instrumentation == 0.46b0.dev",
29-
"opentelemetry-semantic-conventions == 0.46b0.dev",
30-
"opentelemetry-util-http == 0.46b0.dev",
28+
"opentelemetry-instrumentation == 0.47b0.dev",
29+
"opentelemetry-semantic-conventions == 0.47b0.dev",
30+
"opentelemetry-util-http == 0.47b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/version.py

+1-1
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.46b0.dev"
15+
__version__ = "0.47b0.dev"

Diff for: ‎instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@ aiohttp==3.9.3
22
aiosignal==1.3.1
33
asgiref==3.7.2
44
async-timeout==4.0.3
5-
attrs==23.2.0
65
Deprecated==1.2.14
76
frozenlist==1.4.1
8-
idna==3.6
7+
idna==3.7
98
importlib-metadata==6.11.0
109
iniconfig==2.0.0
1110
multidict==6.0.5
12-
packaging==23.2
13-
pluggy==1.4.0
14-
py==1.11.0
11+
packaging==24.0
12+
pluggy==1.5.0
1513
py-cpuinfo==9.0.0
16-
pytest==7.1.3
14+
pytest==7.4.4
1715
pytest-aiohttp==1.0.5
1816
pytest-asyncio==0.23.5
1917
pytest-benchmark==4.0.0

0 commit comments

Comments
 (0)