Skip to content

Commit 8f43c74

Browse files
srikanthccvsrikanthccv
authored
Merge branch 'main' into asgi-header-decoding
2 parents 0e1b7bb + f46a6e1 commit 8f43c74

File tree

126 files changed

+1014
-448
lines changed

Some content is hidden

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

126 files changed

+1014
-448
lines changed

‎.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: 2d1f0b9f5fce62549d1338882f37b91b95881c75
9+
CORE_REPO_SHA: 2387b4465d930b020df79692a8097e1d54b66ec1
1010

1111
jobs:
1212
build:

‎CHANGELOG.md

+31
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
- `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))
11+
- Add request and response hooks for GRPC instrumentation (client only)
12+
([#1706](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1706))
13+
- `opentelemetry-instrumentation-pymemcache` Update instrumentation to support pymemcache >4
14+
([#1764](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1764))
15+
16+
### Added
17+
18+
- Add `excluded_urls` functionality to `urllib` and `urllib3` instrumentations
19+
([#1733](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1733))
20+
- Make Django request span attributes available for `start_span`.
21+
([#1730](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1730))
22+
- Make ASGI request span attributes available for `start_span`.
23+
([#1762](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1762))
24+
25+
### Fixed
26+
27+
- Fix elasticsearch db.statement attribute to be sanitized by default
28+
([#1758](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1758))
29+
- Fix `AttributeError` when AWS Lambda handler receives a list event
30+
([#1738](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1738))
31+
- Fix `None does not implement middleware` error when there are no middlewares registered
32+
([#1766](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1766))
33+
34+
## Version 1.17.0/0.38b0 (2023-03-22)
35+
1036
### Added
1137

1238
- Add connection attributes to sqlalchemy connect span
@@ -29,6 +55,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2955
- Fix httpx resource warnings
3056
([#1695](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1695))
3157

58+
### Changed
59+
60+
- `opentelemetry-instrumentation-requests` Replace `name_callback` and `span_callback` with standard `response_hook` and `request_hook` callbacks
61+
([#670](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/670))
62+
3263
## Version 1.16.0/0.37b0 (2023-02-17)
3364

3465
### Added

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

‎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.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

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

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

+1-1
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

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

‎instrumentation/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -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

+1-1
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

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

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.38b0.dev",
30-
"opentelemetry-semantic-conventions == 0.38b0.dev",
31-
"opentelemetry-util-http == 0.38b0.dev",
29+
"opentelemetry-instrumentation == 0.39b0.dev",
30+
"opentelemetry-semantic-conventions == 0.39b0.dev",
31+
"opentelemetry-util-http == 0.39b0.dev",
3232
"wrapt >= 1.0.0, < 2.0.0",
3333
]
3434

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

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def test_status_codes(self):
122122
(span_status, None),
123123
{
124124
SpanAttributes.HTTP_METHOD: "GET",
125-
SpanAttributes.HTTP_URL: f"http://{host}:{port}/test-path?query=param#foobar",
125+
SpanAttributes.HTTP_URL: f"http://{host}:{port}/test-path#foobar",
126126
SpanAttributes.HTTP_STATUS_CODE: int(
127127
status_code
128128
),

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.38b0.dev",
30-
"opentelemetry-instrumentation-dbapi == 0.38b0.dev",
29+
"opentelemetry-instrumentation == 0.39b0.dev",
30+
"opentelemetry-instrumentation-dbapi == 0.39b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

@@ -37,8 +37,8 @@ instruments = [
3737
]
3838
test = [
3939
"opentelemetry-instrumentation-aiopg[instruments]",
40-
"opentelemetry-semantic-conventions == 0.38b0.dev",
41-
"opentelemetry-test-utils == 0.38b0.dev",
40+
"opentelemetry-semantic-conventions == 0.39b0.dev",
41+
"opentelemetry-test-utils == 0.39b0.dev",
4242
]
4343

4444
[project.entry-points.opentelemetry_instrumentor]

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

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ classifiers = [
2727
dependencies = [
2828
"asgiref ~= 3.0",
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.38b0.dev",
31-
"opentelemetry-semantic-conventions == 0.38b0.dev",
32-
"opentelemetry-util-http == 0.38b0.dev",
30+
"opentelemetry-instrumentation == 0.39b0.dev",
31+
"opentelemetry-semantic-conventions == 0.39b0.dev",
32+
"opentelemetry-util-http == 0.39b0.dev",
3333
]
3434

3535
[project.optional-dependencies]
@@ -38,7 +38,7 @@ instruments = [
3838
]
3939
test = [
4040
"opentelemetry-instrumentation-asgi[instruments]",
41-
"opentelemetry-test-utils == 0.38b0.dev",
41+
"opentelemetry-test-utils == 0.39b0.dev",
4242
]
4343

4444
[project.urls]

‎instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -523,15 +523,16 @@ async def __call__(self, scope, receive, send):
523523

524524
span_name, additional_attributes = self.default_span_details(scope)
525525

526+
attributes = collect_request_attributes(scope)
527+
attributes.update(additional_attributes)
526528
span, token = _start_internal_or_server_span(
527529
tracer=self.tracer,
528530
span_name=span_name,
529531
start_time=None,
530532
context_carrier=scope,
531533
context_getter=asgi_getter,
534+
attributes=attributes,
532535
)
533-
attributes = collect_request_attributes(scope)
534-
attributes.update(additional_attributes)
535536
active_requests_count_attrs = _parse_active_request_count_attrs(
536537
attributes
537538
)

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

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.38b0.dev",
30-
"opentelemetry-semantic-conventions == 0.38b0.dev",
29+
"opentelemetry-instrumentation == 0.39b0.dev",
30+
"opentelemetry-semantic-conventions == 0.39b0.dev",
3131
]
3232

3333
[project.optional-dependencies]
@@ -36,7 +36,7 @@ instruments = [
3636
]
3737
test = [
3838
"opentelemetry-instrumentation-asyncpg[instruments]",
39-
"opentelemetry-test-utils == 0.38b0.dev",
39+
"opentelemetry-test-utils == 0.39b0.dev",
4040
]
4141

4242
[project.entry-points.opentelemetry_instrumentor]

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

‎instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ classifiers = [
2222
"Programming Language :: Python :: 3.8",
2323
]
2424
dependencies = [
25-
"opentelemetry-instrumentation == 0.38b0.dev",
25+
"opentelemetry-instrumentation == 0.39b0.dev",
2626
"opentelemetry-propagator-aws-xray == 1.0.1",
27-
"opentelemetry-semantic-conventions == 0.38b0.dev",
27+
"opentelemetry-semantic-conventions == 0.39b0.dev",
2828
]
2929

3030
[project.optional-dependencies]
3131
instruments = []
3232
test = [
33-
"opentelemetry-test-utils == 0.38b0.dev",
33+
"opentelemetry-test-utils == 0.39b0.dev",
3434
]
3535

3636
[project.urls]

‎instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,9 @@ def _instrumented_lambda_handler_call( # noqa pylint: disable=too-many-branches
342342
# If the request came from an API Gateway, extract http attributes from the event
343343
# https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/instrumentation/aws-lambda.md#api-gateway
344344
# https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/http.md#http-server-semantic-conventions
345-
if lambda_event and lambda_event.get("requestContext"):
345+
if isinstance(lambda_event, dict) and lambda_event.get(
346+
"requestContext"
347+
):
346348
span.set_attribute(SpanAttributes.FAAS_TRIGGER, "http")
347349

348350
if lambda_event.get("version") == "2.0":

‎instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/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.38b0.dev"
15+
__version__ = "0.39b0.dev"

‎instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation_manual.py

+9
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,15 @@ def test_api_gateway_http_api_proxy_event_sets_attributes(self):
399399
},
400400
)
401401

402+
def test_lambda_handles_list_event(self):
403+
AwsLambdaInstrumentor().instrument()
404+
405+
mock_execute_lambda([{"message": "test"}])
406+
407+
spans = self.memory_exporter.get_finished_spans()
408+
409+
assert spans
410+
402411
def test_uninstrument(self):
403412
AwsLambdaInstrumentor().instrument()
404413

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.38b0.dev",
30-
"opentelemetry-semantic-conventions == 0.38b0.dev",
29+
"opentelemetry-instrumentation == 0.39b0.dev",
30+
"opentelemetry-semantic-conventions == 0.39b0.dev",
3131
]
3232

3333
[project.optional-dependencies]
@@ -38,7 +38,7 @@ test = [
3838
"opentelemetry-instrumentation-boto[instruments]",
3939
"markupsafe==2.0.1",
4040
"moto~=2.0",
41-
"opentelemetry-test-utils == 0.38b0.dev",
41+
"opentelemetry-test-utils == 0.39b0.dev",
4242
]
4343

4444
[project.entry-points.opentelemetry_instrumentor]

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

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.38b0.dev",
30-
"opentelemetry-semantic-conventions == 0.38b0.dev",
29+
"opentelemetry-instrumentation == 0.39b0.dev",
30+
"opentelemetry-semantic-conventions == 0.39b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

@@ -37,7 +37,7 @@ instruments = [
3737
]
3838
test = [
3939
"opentelemetry-instrumentation-boto3sqs[instruments]",
40-
"opentelemetry-test-utils == 0.38b0.dev",
40+
"opentelemetry-test-utils == 0.39b0.dev",
4141
]
4242

4343
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class Boto3SQSInstrumentor(BaseInstrumentor):
101101
class ContextableList(list):
102102
"""
103103
Since the classic way to process SQS messages is using a `for` loop, without a well defined scope like a
104-
callback - we are doing something similar to the instrumentaiton of Kafka-python and instrumenting the
104+
callback - we are doing something similar to the instrumentation of Kafka-python and instrumenting the
105105
`__iter__` functions and the `__getitem__` functions to set the span context of the addressed message. Since
106106
the return value from an `SQS.ReceiveMessage` returns a builtin list, we cannot wrap it and change all of the
107107
calls for `list.__iter__` and `list.__getitem__` - therefore we use ContextableList. It is bound to the

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

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.38b0.dev",
30-
"opentelemetry-semantic-conventions == 0.38b0.dev",
29+
"opentelemetry-instrumentation == 0.39b0.dev",
30+
"opentelemetry-semantic-conventions == 0.39b0.dev",
3131
]
3232

3333
[project.optional-dependencies]
@@ -38,7 +38,7 @@ test = [
3838
"opentelemetry-instrumentation-botocore[instruments]",
3939
"markupsafe==2.0.1",
4040
"moto[all] ~= 2.2.6",
41-
"opentelemetry-test-utils == 0.38b0.dev",
41+
"opentelemetry-test-utils == 0.39b0.dev",
4242
]
4343

4444
[project.entry-points.opentelemetry_instrumentor]

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

0 commit comments

Comments
 (0)