fix srikanthccv's CR

Author: CircleCI

Diff for: instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/sqs.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import logging
 
 from opentelemetry.instrumentation.botocore.extensions.types import (
     _AttributeMapT,
@@ -22,6 +23,8 @@
 
 _SUPPORTED_OPERATIONS = ["SendMessage", "SendMessageBatch", "ReceiveMessage"]
 
+logger = logging.getLogger(__name__)
+
 
 class _SqsExtension(_AwsSdkExtension):
     def extract_attributes(self, attributes: _AttributeMapT):
@@ -31,25 +34,36 @@ def extract_attributes(self, attributes: _AttributeMapT):
             attributes["aws.queue_url"] = queue_url
             attributes[SpanAttributes.MESSAGING_SYSTEM] = "aws.sqs"
             attributes[SpanAttributes.MESSAGING_URL] = queue_url
-            attributes[SpanAttributes.MESSAGING_DESTINATION] = queue_url.split(
-                "/"
-            )[-1]
+            try:
+                attributes[
+                    SpanAttributes.MESSAGING_DESTINATION
+                ] = queue_url.split("/")[-1]
+            except IndexError:
+                logger.error(
+                    "Could not extract messaging destination from '%s'",
+                    queue_url,
+                )
 
     def on_success(self, span: Span, result: _BotoResultT):
         operation = self._call_context.operation
         if operation in _SUPPORTED_OPERATIONS:
-            if operation == "SendMessage":
-                span.set_attribute(
-                    SpanAttributes.MESSAGING_MESSAGE_ID,
-                    result.get("MessageId"),
-                )
-            elif operation == "SendMessageBatch" and result.get("Successful"):
-                span.set_attribute(
-                    SpanAttributes.MESSAGING_MESSAGE_ID,
-                    result["Successful"][0]["MessageId"],
-                )
-            elif operation == "ReceiveMessage" and result.get("Messages"):
-                span.set_attribute(
-                    SpanAttributes.MESSAGING_MESSAGE_ID,
-                    result["Messages"][0]["MessageId"],
-                )
+            try:
+                if operation == "SendMessage":
+                    span.set_attribute(
+                        SpanAttributes.MESSAGING_MESSAGE_ID,
+                        result.get("MessageId"),
+                    )
+                elif operation == "SendMessageBatch" and result.get(
+                    "Successful"
+                ):
+                    span.set_attribute(
+                        SpanAttributes.MESSAGING_MESSAGE_ID,
+                        result["Successful"][0]["MessageId"],
+                    )
+                elif operation == "ReceiveMessage" and result.get("Messages"):
+                    span.set_attribute(
+                        SpanAttributes.MESSAGING_MESSAGE_ID,
+                        result["Messages"][0]["MessageId"],
+                    )
+            except (IndexError, KeyError):
+                logger.error("Could not extract the messaging message if")

Diff for: instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_sqs.py

@@ -6,7 +6,7 @@
 from opentelemetry.test.test_base import TestBase
 
 
-class TestDynamoDbExtension(TestBase):
+class TestSqsExtension(TestBase):
     def setUp(self):
         super().setUp()
         BotocoreInstrumentor().instrument()