From 58c4398aab011356b8ecf813a26b68b2c66879ff Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Wed, 28 Aug 2024 21:28:38 +0530 Subject: [PATCH 1/2] fix: starlette import error Signed-off-by: Varsha GS --- src/instana/instrumentation/starlette_inst.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/instana/instrumentation/starlette_inst.py b/src/instana/instrumentation/starlette_inst.py index 4edf4b4e..9d4b1f8e 100644 --- a/src/instana/instrumentation/starlette_inst.py +++ b/src/instana/instrumentation/starlette_inst.py @@ -8,12 +8,11 @@ from typing import Any, Callable, Dict, Tuple -import starlette.applications - try: import starlette import wrapt from starlette.middleware import Middleware + import starlette.applications from instana.instrumentation.asgi import InstanaASGIMiddleware from instana.log import logger @@ -34,5 +33,6 @@ def init_with_instana( return wrapped(*args, **kwargs) logger.debug("Instrumenting Starlette") + except ImportError: pass From 6f5d318b04a15438f6e4ad8b98f250e55d122786 Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Wed, 28 Aug 2024 21:38:56 +0530 Subject: [PATCH 2/2] fix(circleci): exclude google cloud jobs till the instrumentation is done Signed-off-by: Varsha GS --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4f71c188..df0ec048 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -367,8 +367,8 @@ workflows: # - py39cassandra # - py39couchbase # - py39gevent_starlette - - py311googlecloud - - py312googlecloud + # - py311googlecloud + # - py312googlecloud - final_job: requires: - python38 @@ -380,5 +380,5 @@ workflows: # - py39cassandra # - py39couchbase # - py39gevent_starlette - - py311googlecloud - - py312googlecloud + # - py311googlecloud + # - py312googlecloud