Merge branch 'main' of github.com:open-telemetry/opentelemetry-python…

…-contrib into feat/LambdaMetrics Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com>
open-telemetry · Jan 31, 2023 · f534ebd · f534ebd
2 parents 8d10a80 + 6ed2c56
commit f534ebd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1212](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1212))
 - `opentelemetry-instrumentation-aws-lambda` Flush `MeterProvider` at end of function invocation.
   ([#1613](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1613))
+- Fix aiohttp bug with unset `trace_configs` ([#1592](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1592))
 
 ### Fixed
 

diff --git a/...strumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py b/...strumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py
@@ -280,7 +280,7 @@ def instrumented_init(wrapped, instance, args, kwargs):
         if context_api.get_value(_SUPPRESS_INSTRUMENTATION_KEY):
             return wrapped(*args, **kwargs)
 
-        client_trace_configs = list(kwargs.get("trace_configs", ()))
+        client_trace_configs = list(kwargs.get("trace_configs") or [])
         client_trace_configs.extend(trace_configs)
 
         trace_config = create_trace_config(

diff --git a/...metry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py b/...metry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py
@@ -381,7 +381,7 @@ def _instrumented_lambda_handler_call(
                     _meter_provider.force_flush(rem)
                 except Exception:  # pylint: disable=broad-except
                     logger.exception(
-                        f"MeterProvider failed to flush traces"
+                        f"MeterProvider failed to flush metrics"
                     )
         else:
             logger.warning(