Skip to content

Commit b86eff9

Browse files
authored
Merge branch 'main' into feat/LambdaMetrics
2 parents 8c1b6dd + 6ed2c56 commit b86eff9

File tree

2 files changed

+2
-1
lines changed
  • instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client

2 files changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
([#1212](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1212))
1616
- `opentelemetry-instrumentation-aws-lambda` Flush `MeterProvider` at end of function invocation.
1717
([#1613](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1613))
18+
- Fix aiohttp bug with unset `trace_configs` ([#1592](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1592))
1819

1920
### Fixed
2021

instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def instrumented_init(wrapped, instance, args, kwargs):
280280
if context_api.get_value(_SUPPRESS_INSTRUMENTATION_KEY):
281281
return wrapped(*args, **kwargs)
282282

283-
client_trace_configs = list(kwargs.get("trace_configs", ()))
283+
client_trace_configs = list(kwargs.get("trace_configs") or [])
284284
client_trace_configs.extend(trace_configs)
285285

286286
trace_config = create_trace_config(

0 commit comments

Comments
 (0)