Skip to content

Commit f7b3c53

Browse files
authored
Merge branch 'main' into issue-1757
2 parents a88b5a0 + 2d4e6c9 commit f7b3c53

File tree

2 files changed

+5
-1
lines changed
  • instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon

2 files changed

+5
-1
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2222

2323
- Fix `AttributeError` when AWS Lambda handler receives a list event
2424
([#1738](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1738))
25-
25+
- Fix `None does not implement middleware` error when there are no middlewares registered
26+
([#1766](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1766))
2627

2728
## Version 1.17.0/0.38b0 (2023-03-22)
2829

instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py

+3
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,9 @@ def __init__(self, *args, **kwargs):
245245

246246
# inject trace middleware
247247
self._middlewares_list = kwargs.pop("middleware", [])
248+
if self._middlewares_list is None:
249+
self._middlewares_list = []
250+
248251
tracer_provider = otel_opts.pop("tracer_provider", None)
249252
meter_provider = otel_opts.pop("meter_provider", None)
250253
if not isinstance(self._middlewares_list, (list, tuple)):

0 commit comments

Comments
 (0)