tests(s3): Add new testcase to verify boto3.resource().Bucket().upload_fileobj()

Signed-off-by: Varsha GS <[email protected]>

Author: GSVarsha

tests/clients/boto3/test_boto3_s3.py

@@ -2,10 +2,12 @@
 # (c) Copyright Instana Inc. 2020
 
 import os
+from io import BytesIO
+
 import pytest
+import boto3
 from typing import Generator
 from moto import mock_aws
-import boto3
 
 from instana.singletons import tracer, agent
 from tests.helpers import get_first_span_by_filter
@@ -267,3 +269,52 @@ def test_s3_list_obj(self) -> None:
 
         assert s3_span.data["s3"]["op"] == "ListObjects"
         assert s3_span.data["s3"]["bucket"] == "aws_bucket_name"
+
+    def test_s3_resource_bucket_upload_fileobj(self) -> None:
+        """
+        Verify boto3.resource().Bucket().upload_fileobj() works correctly with BytesIO objects
+        """
+        bucket_name = "resource-bucket-test"
+        object_key = "somekey"
+        test_data = b"somedata"
+        
+        # Create a bucket using the client first
+        self.s3.create_bucket(Bucket=bucket_name)
+        
+        # Get an S3 resource and bucket object (like in the issue report)
+        s3_resource = boto3.resource(
+            "s3",
+            region_name="us-east-1"
+        )
+        bucket = s3_resource.Bucket(name=bucket_name)
+        
+        # Upload a BytesIO object wrapped in an Instana span
+        with tracer.start_as_current_span("test"):
+            bucket.upload_fileobj(BytesIO(test_data), object_key)
+        
+        # Verify the upload was successful by retrieving the object
+        response = bucket.Object(object_key).get()
+        file_content = response["Body"].read()
+        
+        # Assert the content matches what we uploaded
+        assert file_content == test_data
+        
+        # Verify the spans were created correctly
+        spans = self.recorder.queued_spans()
+        assert len(spans) >= 2  # There might be more spans due to the resource operations
+        
+        filter = lambda span: span.n == "sdk"  # noqa: E731
+        test_span = get_first_span_by_filter(spans, filter)
+        assert test_span
+        
+        filter = lambda span: span.n == "s3" and span.data["s3"]["op"] == "UploadFileObj"  # noqa: E731
+        s3_span = get_first_span_by_filter(spans, filter)
+        assert s3_span
+        
+        assert s3_span.t == test_span.t
+        assert s3_span.p == test_span.s
+        
+        assert not test_span.ec
+        assert not s3_span.ec
+        
+        assert s3_span.data["s3"]["bucket"] == bucket_name