RD-16910-1-force-flush-not-working-in-python-distro

Author: moshe-shaham-lumigo

setup.py

@@ -26,6 +26,8 @@
         "opentelemetry-instrumentation-asgi==0.60b1",
         "opentelemetry-instrumentation-aws-lambda==0.60b1",
         "opentelemetry-instrumentation-boto==0.60b1",
+        "opentelemetry-instrumentation-botocore==0.60b1",
+        "opentelemetry-instrumentation-boto3sqs==0.60b1",
         "opentelemetry-instrumentation-fastapi==0.60b1",
         "opentelemetry-instrumentation-flask==0.60b1",
         "opentelemetry-instrumentation-grpc==0.60b1",

src/lumigo_opentelemetry/instrumentations/botocore/__init__.py

@@ -20,17 +20,17 @@ def assert_instrumented_package_importable(self) -> None:
         from botocore.exceptions import ClientError  # noqa
 
     def install_instrumentation(self) -> None:
-        # We're using a copied version of this instrumentor until this PR will be merged:
-        # https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1350
-        # After the merge, delete the following line and uncomment the next line
-        from lumigo_opentelemetry.external.botocore import BotocoreInstrumentor
-
-        # from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
+        from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
+        from opentelemetry.instrumentation.boto3sqs import Boto3SQSInstrumentor
 
         BotocoreInstrumentor().instrument(
             request_hook=AwsParser.request_hook,
             response_hook=filtered_resource_hook,
         )
+        Boto3SQSInstrumentor().instrument(
+            request_hook=AwsParser.request_hook,
+            response_hook=filtered_resource_hook,
+        )
 
 
 def filtered_resource_hook(