Skip to content

Commit 923a569

Browse files
xrmxxrmx
authored
Merge branch 'main' into main
2 parents 3c1c5a9 + a5c4887 commit 923a569

File tree

177 files changed

+1898
-461
lines changed

Some content is hidden

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

177 files changed

+1898
-461
lines changed

‎.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: a1253585f66d63e7c05a19f070f3bfe0ab6460c1
9+
CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
1010

1111
jobs:
1212
instrumentations-0:

‎.github/workflows/instrumentations_1.yml

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

1111
jobs:
1212
instrumentations-1:
@@ -31,7 +31,7 @@ jobs:
3131
- "richconsole"
3232
- "psycopg"
3333
- "prometheus-remote-write"
34-
- "sdkextension-aws"
34+
- "sdk-extension-aws"
3535
- "propagator-aws-xray"
3636
- "propagator-ot-trace"
3737
- "resource-detector-container"

‎.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: a1253585f66d63e7c05a19f070f3bfe0ab6460c1
9+
CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
1010

1111
jobs:
1212
misc:

‎.pylintrc

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ disable=missing-docstring,
8181
missing-module-docstring, # temp-pylint-upgrade
8282
import-error, # needed as a workaround as reported here: https://github.com/open-telemetry/opentelemetry-python-contrib/issues/290
8383
cyclic-import,
84+
not-context-manager
8485

8586
# Enable the message, report, category or checker with the given id(s). You can
8687
# either give multiple identifier separated by comma (,) or put this option

‎CHANGELOG.md

+27-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
## Unreleased
9+
- `opentelemetry-sdk-extension-aws` Register AWS resource detectors under the
10+
`opentelemetry_resource_detector` entry point
11+
([#2382](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2382))
12+
13+
### Breaking changes
14+
15+
- Rename `type` attribute to `asgi.event.type` in `opentelemetry-instrumentation-asgi`
16+
([#2300](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2300))
17+
18+
### Added
19+
20+
- `opentelemetry-instrumentation-threading` Initial release for threading
21+
([#2253](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2253))
22+
23+
## Version 1.24.0/0.45b0 (2024-03-28)
24+
25+
### Added
926

1027
- `opentelemetry-instrumentation-psycopg` Async Instrumentation for psycopg 3.x
1128
([#2146](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2146))
@@ -19,10 +36,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1936
([#2297](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2297))
2037
- Ensure all http.server.duration metrics have the same description
2138
([#2151](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2298))
39+
- Fix regression in httpx `request.url` not being of type `httpx.URL` after `0.44b0`
40+
([#2359](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2359))
41+
- Avoid losing repeated HTTP headers
42+
([#2266](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2266))
43+
- `opentelemetry-instrumentation-elasticsearch` Don't send bulk request body as db statement
44+
([#2355](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2355))
45+
- AwsLambdaInstrumentor sets `cloud.account.id` span attribute
46+
([#2367](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2367))
47+
2248

2349
## Version 1.23.0/0.44b0 (2024-02-23)
2450

25-
- Drop uspport for 3.7
51+
- Drop support for 3.7
2652
([#2151](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2151))
2753
- `opentelemetry-resource-detector-azure` Added 10s timeout to VM Resource Detector
2854
([#2119](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2119))

‎README.md

+9-3
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,20 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
108108

109109
- [Aaron Abbott](https://github.com/aabmass), Google
110110
- [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
111+
- [Owais Lone](https://github.com/owais), Splunk
112+
- [Pablo Collins](https://github.com/pmcollins), Splunk
113+
- [Riccardo Magliocchetti](https://github.com/xrmx), Elastic
111114
- [Sanket Mehta](https://github.com/sanketmehta28), Cisco
115+
- [Srikanth Chekuri](https://github.com/srikanthccv), signoz.io
116+
- [Tammy Baylis](https://github.com/tammy-baylis-swi), SolarWinds
112117

113118
Emeritus Approvers:
114119

120+
- [Ashutosh Goel](https://github.com/ashu658), Cisco
115121
- [Héctor Hernández](https://github.com/hectorhdzg), Microsoft
116-
- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
122+
- [Nikolay Sokolik](https://github.com/oxeye-nikolay), Oxeye
123+
- [Nikolay Sokolik](https://github.com/nikosokolik), Oxeye
117124
- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
118-
- [Ashutosh Goel](https://github.com/ashu658), Cisco
119125

120126
*Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
121127

@@ -129,7 +135,7 @@ Emeritus Maintainers:
129135

130136
- [Alex Boten](https://github.com/codeboten), Lightstep
131137
- [Owais Lone](https://github.com/owais), Splunk
132-
- [Srikanth Chekuri](https://github.com/srikanthccv), signoz.io
138+
- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
133139

134140
*Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
135141

‎_template/pyproject.toml

-6
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ dependencies = [
3131
"opentelemetry-api ~= 1.12",
3232
]
3333

34-
[project.optional-dependencies]
35-
test = [
36-
# add any test dependencies here
37-
"<REPLACE ME>",
38-
]
39-
4034
[project.entry-points.opentelemetry_instrumentor]
4135
# REPLACE ME: the entrypoint for the instrumentor e.g
4236
# sqlalchemy = "opentelemetry.instrumentation.sqlalchemy:SQLAlchemyInstrumentor"

‎_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.45b0.dev"
15+
__version__ = "0.46b0.dev"

‎docs/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ installed separately via pip:
2222
2323
pip install opentelemetry-exporter-{exporter}
2424
pip install opentelemetry-instrumentation-{instrumentation}
25-
pip install opentelemetry-sdk-extension-{sdkextension}
25+
pip install opentelemetry-sdk-extension-{sdk-extension}
2626
2727
A complete list of packages can be found at the
2828
`Contrib repo instrumentation <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation>`_

‎docs/instrumentation/threading/threading.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OpenTelemetry Threading Instrumentation
2+
=======================================
3+
4+
.. automodule:: opentelemetry.instrumentation.threading
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎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.24.0.dev
19+
version=1.25.0.dev
2020

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

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

3939
packages=
4040
all

‎exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml

-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ dependencies = [
3131
"python-snappy ~= 0.6",
3232
]
3333

34-
[project.optional-dependencies]
35-
test = []
36-
3734
[project.urls]
3835
Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/exporter/opentelemetry-exporter-prometheus-remote-write"
3936

‎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.45b0.dev"
15+
__version__ = "0.46b0.dev"

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

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
certifi==2024.2.2
4+
charset-normalizer==3.3.2
5+
cramjam==2.8.1
6+
Deprecated==1.2.14
7+
idna==3.6
8+
importlib-metadata==6.11.0
9+
iniconfig==2.0.0
10+
packaging==23.2
11+
pluggy==1.4.0
12+
protobuf==4.25.3
13+
py==1.11.0
14+
py-cpuinfo==9.0.0
15+
pytest==7.1.3
16+
pytest-benchmark==4.0.0
17+
python-snappy==0.7.1
18+
requests==2.31.0
19+
tomli==2.0.1
20+
typing_extensions==4.10.0
21+
urllib3==2.2.1
22+
wrapt==1.16.0
23+
zipp==3.17.0
24+
-e exporter/opentelemetry-exporter-prometheus-remote-write

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

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

33-
[project.optional-dependencies]
34-
test = []
35-
3633
[project.urls]
3734
Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/exporter/opentelemetry-exporter-richconsole"
3835

‎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.45b0.dev"
15+
__version__ = "0.46b0.dev"

‎exporter/opentelemetry-exporter-richconsole/test-requirements.txt

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
flaky==3.7.0
5+
importlib-metadata==6.11.0
6+
iniconfig==2.0.0
7+
markdown-it-py==3.0.0
8+
mdurl==0.1.2
9+
packaging==23.2
10+
pluggy==1.4.0
11+
py==1.11.0
12+
py-cpuinfo==9.0.0
13+
Pygments==2.17.2
14+
pytest==7.1.3
15+
pytest-benchmark==4.0.0
16+
rich==13.7.1
17+
tomli==2.0.1
18+
typing_extensions==4.10.0
19+
wrapt==1.16.0
20+
zipp==3.17.0
21+
-e exporter/opentelemetry-exporter-richconsole

‎instrumentation/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
| [opentelemetry-instrumentation-sqlite3](./opentelemetry-instrumentation-sqlite3) | sqlite3 | No
4444
| [opentelemetry-instrumentation-starlette](./opentelemetry-instrumentation-starlette) | starlette ~= 0.13.0 | Yes
4545
| [opentelemetry-instrumentation-system-metrics](./opentelemetry-instrumentation-system-metrics) | psutil >= 5 | No
46+
| [opentelemetry-instrumentation-threading](./opentelemetry-instrumentation-threading) | threading | No
4647
| [opentelemetry-instrumentation-tornado](./opentelemetry-instrumentation-tornado) | tornado >= 5.1.1 | Yes
4748
| [opentelemetry-instrumentation-tortoiseorm](./opentelemetry-instrumentation-tortoiseorm) | tortoise-orm >= 0.17.0 | No
4849
| [opentelemetry-instrumentation-urllib](./opentelemetry-instrumentation-urllib) | urllib | Yes

‎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.45b0.dev",
28+
"opentelemetry-instrumentation == 0.46b0.dev",
2929
"wrapt >= 1.0.0, < 2.0.0",
3030
]
3131

‎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.45b0.dev"
15+
__version__ = "0.46b0.dev"

‎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.45b0.dev",
29-
"opentelemetry-semantic-conventions == 0.45b0.dev",
30-
"opentelemetry-util-http == 0.45b0.dev",
28+
"opentelemetry-instrumentation == 0.46b0.dev",
29+
"opentelemetry-semantic-conventions == 0.46b0.dev",
30+
"opentelemetry-util-http == 0.46b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

‎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.45b0.dev"
15+
__version__ = "0.46b0.dev"

‎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.45b0.dev",
29-
"opentelemetry-semantic-conventions == 0.45b0.dev",
30-
"opentelemetry-util-http == 0.45b0.dev",
28+
"opentelemetry-instrumentation == 0.46b0.dev",
29+
"opentelemetry-semantic-conventions == 0.46b0.dev",
30+
"opentelemetry-util-http == 0.46b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

‎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.45b0.dev"
15+
__version__ = "0.46b0.dev"

‎instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ classifiers = [
2525
]
2626
dependencies = [
2727
"opentelemetry-api ~= 1.12",
28-
"opentelemetry-instrumentation == 0.45b0.dev",
29-
"opentelemetry-instrumentation-dbapi == 0.45b0.dev",
28+
"opentelemetry-instrumentation == 0.46b0.dev",
29+
"opentelemetry-instrumentation-dbapi == 0.46b0.dev",
3030
"wrapt >= 1.0.0, < 2.0.0",
3131
]
3232

‎instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/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.45b0.dev"
15+
__version__ = "0.46b0.dev"

‎instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ classifiers = [
2626
dependencies = [
2727
"asgiref ~= 3.0",
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.45b0.dev",
30-
"opentelemetry-semantic-conventions == 0.45b0.dev",
31-
"opentelemetry-util-http == 0.45b0.dev",
29+
"opentelemetry-instrumentation == 0.46b0.dev",
30+
"opentelemetry-semantic-conventions == 0.46b0.dev",
31+
"opentelemetry-util-http == 0.46b0.dev",
3232
]
3333

3434
[project.optional-dependencies]

0 commit comments

Comments
 (0)