Skip to content

Commit b0ce93c

Browse files
committed
Merge branch 'main' into metrics-instrumentation-celery
2 parents 1678415 + 890e5dd commit b0ce93c

File tree

140 files changed

+1208
-480
lines changed

Some content is hidden

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

140 files changed

+1208
-480
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 2d1f0b9f5fce62549d1338882f37b91b95881c75
9+
CORE_REPO_SHA: 2387b4465d930b020df79692a8097e1d54b66ec1
1010

1111
jobs:
1212
build:

CHANGELOG.md

Lines changed: 42 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,63 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
- Add metric instrumentation for celery
1111
([#1679](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1679))
12-
-
13-
- Add metrics instrumentation for sqlalchemy
14-
([#1645](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1645))
12+
- `opentelemetry-instrumentation-system-metrics` Add `process.` prefix to `runtime.memory`, `runtime.cpu.time`, and `runtime.gc_count`. Change `runtime.memory` from count to UpDownCounter. ([#1735](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1735))
13+
- Add request and response hooks for GRPC instrumentation (client only)
14+
([#1706](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1706))
15+
- `opentelemetry-instrumentation-pymemcache` Update instrumentation to support pymemcache >4
16+
([#1764](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1764))
1517

16-
- Fix exception in Urllib3 when dealing with filelike body.
17-
([#1399](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1399))
18+
### Added
19+
20+
- Add `excluded_urls` functionality to `urllib` and `urllib3` instrumentations
21+
([#1733](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1733))
22+
- Make Django request span attributes available for `start_span`.
23+
([#1730](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1730))
24+
- Make ASGI request span attributes available for `start_span`.
25+
([#1762](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1762))
26+
- `opentelemetry-instrumentation-celery` Add support for anonymous tasks.
27+
([#1407](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1407))
28+
- `opentelemetry-instrumentation-logging` Add `otelTraceSampled` to instrumetation-logging
29+
([#1773](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1773))
30+
31+
32+
### Fixed
33+
34+
- Fix elasticsearch db.statement attribute to be sanitized by default
35+
([#1758](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1758))
36+
- Fix `AttributeError` when AWS Lambda handler receives a list event
37+
([#1738](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1738))
38+
- Fix `None does not implement middleware` error when there are no middlewares registered
39+
([#1766](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1766))
40+
41+
## Version 1.17.0/0.38b0 (2023-03-22)
1842

1943
### Added
2044

2145
- Add connection attributes to sqlalchemy connect span
2246
([#1608](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1608))
2347
- Add support for enabling Redis sanitization from environment variable
2448
([#1690](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1690))
49+
- Add metrics instrumentation for sqlalchemy
50+
([#1645](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1645))
2551

2652
### Fixed
2753

2854
- Fix Flask instrumentation to only close the span if it was created by the same thread.
2955
([#1654](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1654))
56+
- Fix confluent-kafka instrumentation by allowing Producer headers to be dict or list
57+
([#1655](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1655))
3058
- `opentelemetry-instrumentation-system-metrics` Fix initialization of the instrumentation class when configuration is provided
3159
([#1438](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1439))
60+
- Fix exception in Urllib3 when dealing with filelike body.
61+
([#1399](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1399))
62+
- Fix httpx resource warnings
63+
([#1695](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1695))
64+
65+
### Changed
66+
67+
- `opentelemetry-instrumentation-requests` Replace `name_callback` and `span_callback` with standard `response_hook` and `request_hook` callbacks
68+
([#670](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/670))
3269

3370
## Version 1.16.0/0.37b0 (2023-02-17)
3471

_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.38b0.dev"
15+
__version__ = "0.39b0.dev"

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.17.0.dev
19+
version=1.18.0.dev
2020

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

3636
[prerelease]
37-
version=0.38b0.dev
37+
version=0.39b0.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.38b0.dev"
15+
__version__ = "0.39b0.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.38b0.dev",
30+
"opentelemetry-semantic-conventions == 0.39b0.dev",
3131
"rich>=10.0.0",
3232
]
3333

exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/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.38b0.dev"
15+
__version__ = "0.39b0.dev"

instrumentation/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
| [opentelemetry-instrumentation-django](./opentelemetry-instrumentation-django) | django >= 1.10 | Yes
1717
| [opentelemetry-instrumentation-elasticsearch](./opentelemetry-instrumentation-elasticsearch) | elasticsearch >= 2.0 | No
1818
| [opentelemetry-instrumentation-falcon](./opentelemetry-instrumentation-falcon) | falcon >= 1.4.1, < 4.0.0 | Yes
19-
| [opentelemetry-instrumentation-fastapi](./opentelemetry-instrumentation-fastapi) | fastapi <= 0.90.1 | Yes
19+
| [opentelemetry-instrumentation-fastapi](./opentelemetry-instrumentation-fastapi) | fastapi ~= 0.58 | Yes
2020
| [opentelemetry-instrumentation-flask](./opentelemetry-instrumentation-flask) | flask >= 1.0, < 3.0 | Yes
2121
| [opentelemetry-instrumentation-grpc](./opentelemetry-instrumentation-grpc) | grpcio ~= 1.27 | No
2222
| [opentelemetry-instrumentation-httpx](./opentelemetry-instrumentation-httpx) | httpx >= 0.18.0 | No
@@ -26,7 +26,7 @@
2626
| [opentelemetry-instrumentation-mysql](./opentelemetry-instrumentation-mysql) | mysql-connector-python ~= 8.0 | No
2727
| [opentelemetry-instrumentation-pika](./opentelemetry-instrumentation-pika) | pika >= 0.12.0 | No
2828
| [opentelemetry-instrumentation-psycopg2](./opentelemetry-instrumentation-psycopg2) | psycopg2 >= 2.7.3.1 | No
29-
| [opentelemetry-instrumentation-pymemcache](./opentelemetry-instrumentation-pymemcache) | pymemcache >= 1.3.5, < 4 | No
29+
| [opentelemetry-instrumentation-pymemcache](./opentelemetry-instrumentation-pymemcache) | pymemcache >= 1.3.5, < 5 | No
3030
| [opentelemetry-instrumentation-pymongo](./opentelemetry-instrumentation-pymongo) | pymongo >= 3.1, < 5.0 | No
3131
| [opentelemetry-instrumentation-pymysql](./opentelemetry-instrumentation-pymysql) | PyMySQL < 2 | No
3232
| [opentelemetry-instrumentation-pyramid](./opentelemetry-instrumentation-pyramid) | pyramid >= 1.7 | Yes

instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ instruments = [
3535
]
3636
test = [
3737
"opentelemetry-instrumentation-aio-pika[instruments]",
38-
"opentelemetry-test-utils == 0.38b0.dev",
38+
"opentelemetry-test-utils == 0.39b0.dev",
3939
"pytest",
4040
"wrapt >= 1.0.0, < 2.0.0",
4141
]

instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/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.38b0.dev"
15+
__version__ = "0.39b0.dev"

0 commit comments

Comments
 (0)