opentelemetry-instrumentation-botocore 0.46b0__tar.gz → 0.48b0__tar.gz

{opentelemetry_instrumentation_botocore-0.46b0 → opentelemetry_instrumentation_botocore-0.48b0}/.gitignore

@@ -58,3 +58,6 @@ _build/
 # mypy
 .mypy_cache/
 target
+
+# Benchmark result files
+*-benchmark.json

{opentelemetry_instrumentation_botocore-0.46b0 → opentelemetry_instrumentation_botocore-0.48b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-botocore
-Version: 0.46b0
+Version: 0.48b0
 Summary: OpenTelemetry Botocore instrumentation
 Project-URL: Homepage, https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-botocore
 Author-email: OpenTelemetry Authors <cncf-opentelemetry-contributors@lists.cncf.io>
@@ -15,11 +15,12 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Requires-Dist: opentelemetry-api~=1.12
-Requires-Dist: opentelemetry-instrumentation==0.46b0
-Requires-Dist: opentelemetry-propagator-aws-xray==1.0.1
-Requires-Dist: opentelemetry-semantic-conventions==0.46b0
+Requires-Dist: opentelemetry-instrumentation==0.48b0
+Requires-Dist: opentelemetry-propagator-aws-xray~=1.0.1
+Requires-Dist: opentelemetry-semantic-conventions==0.48b0
 Provides-Extra: instruments
 Requires-Dist: botocore~=1.0; extra == 'instruments'
 Description-Content-Type: text/x-rst

{opentelemetry_instrumentation_botocore-0.46b0 → opentelemetry_instrumentation_botocore-0.48b0}/pyproject.toml

@@ -22,12 +22,13 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.46b0",
-  "opentelemetry-semantic-conventions == 0.46b0",
-  "opentelemetry-propagator-aws-xray == 1.0.1",
+  "opentelemetry-instrumentation == 0.48b0",
+  "opentelemetry-semantic-conventions == 0.48b0",
+  "opentelemetry-propagator-aws-xray ~= 1.0.1",
 ]
 
 [project.optional-dependencies]

{opentelemetry_instrumentation_botocore-0.46b0 → opentelemetry_instrumentation_botocore-0.48b0}/src/opentelemetry/instrumentation/botocore/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.46b0"
+__version__ = "0.48b0"

{opentelemetry_instrumentation_botocore-0.46b0 → opentelemetry_instrumentation_botocore-0.48b0}/tests/test_botocore_dynamodb.py

@@ -16,7 +16,7 @@ import json
 from unittest import mock
 
 import botocore.session
-from moto import mock_dynamodb2  # pylint: disable=import-error
+from moto import mock_aws  # pylint: disable=import-error
 
 from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
 from opentelemetry.instrumentation.botocore.extensions.dynamodb import (
@@ -184,7 +184,7 @@ class TestDynamoDbExtension(TestBase):
         )
         self.assert_item_col_metrics(span)
 
-    @mock_dynamodb2
+    @mock_aws
     def test_batch_get_item(self):
         table_name1 = "test_table1"
         table_name2 = "test_table2"
@@ -203,7 +203,7 @@ class TestDynamoDbExtension(TestBase):
         self.assert_table_names(span, table_name1, table_name2)
         self.assert_consumed_capacity(span, table_name1, table_name2)
 
-    @mock_dynamodb2
+    @mock_aws
     def test_batch_write_item(self):
         table_name1 = "test_table1"
         table_name2 = "test_table2"
@@ -224,7 +224,7 @@ class TestDynamoDbExtension(TestBase):
         self.assert_consumed_capacity(span, table_name1, table_name2)
         self.assert_item_col_metrics(span)
 
-    @mock_dynamodb2
+    @mock_aws
     def test_create_table(self):
         local_sec_idx = {
             "IndexName": "local_sec_idx",
@@ -268,7 +268,7 @@ class TestDynamoDbExtension(TestBase):
         )
         self.assert_provisioned_read_cap(span, 42)
 
-    @mock_dynamodb2
+    @mock_aws
     def test_delete_item(self):
         self._create_prepared_table()
 
@@ -297,7 +297,7 @@ class TestDynamoDbExtension(TestBase):
     def test_delete_item_item_collection_metrics(self):
         self.assert_extension_item_col_metrics("DeleteItem")
 
-    @mock_dynamodb2
+    @mock_aws
     def test_delete_table(self):
         self._create_prepared_table()
 
@@ -306,7 +306,7 @@ class TestDynamoDbExtension(TestBase):
         span = self.assert_span("DeleteTable")
         self.assert_table_names(span, self.default_table_name)
 
-    @mock_dynamodb2
+    @mock_aws
     def test_describe_table(self):
         self._create_prepared_table()
 
@@ -315,15 +315,31 @@ class TestDynamoDbExtension(TestBase):
         span = self.assert_span("DescribeTable")
         self.assert_table_names(span, self.default_table_name)
 
-    @mock_dynamodb2
-    def test_get_item(self):
+    @mock_aws
+    def test_get_item_expression(self):
+        self._create_prepared_table()
+
+        self.client.get_item(
+            TableName=self.default_table_name,
+            Key={"id": {"S": "1"}},
+            ConsistentRead=True,
+            ProjectionExpression="PE",
+            ReturnConsumedCapacity="TOTAL",
+        )
+
+        span = self.assert_span("GetItem")
+        self.assert_table_names(span, self.default_table_name)
+        self.assert_consistent_read(span, True)
+        self.assert_consumed_capacity(span, self.default_table_name)
+
+    @mock_aws
+    def test_get_item_non_expression(self):
         self._create_prepared_table()
 
         self.client.get_item(
             TableName=self.default_table_name,
             Key={"id": {"S": "1"}},
             ConsistentRead=True,
-            AttributesToGet=["id"],
             ProjectionExpression="PE",
             ReturnConsumedCapacity="TOTAL",
         )
@@ -334,7 +350,7 @@ class TestDynamoDbExtension(TestBase):
         self.assert_projection(span, "PE")
         self.assert_consumed_capacity(span, self.default_table_name)
 
-    @mock_dynamodb2
+    @mock_aws
     def test_list_tables(self):
         self._create_table(TableName="my_table")
         self._create_prepared_table()
@@ -351,7 +367,7 @@ class TestDynamoDbExtension(TestBase):
         )
         self.assertEqual(5, span.attributes[SpanAttributes.AWS_DYNAMODB_LIMIT])
 
-    @mock_dynamodb2
+    @mock_aws
     def test_put_item(self):
         table = "test_table"
         self._create_prepared_table(TableName=table)
@@ -372,7 +388,7 @@ class TestDynamoDbExtension(TestBase):
     def test_put_item_item_collection_metrics(self):
         self.assert_extension_item_col_metrics("PutItem")
 
-    @mock_dynamodb2
+    @mock_aws
     def test_query(self):
         self._create_prepared_table()
 
@@ -407,7 +423,7 @@ class TestDynamoDbExtension(TestBase):
         self.assert_select(span, "ALL_ATTRIBUTES")
         self.assert_consumed_capacity(span, self.default_table_name)
 
-    @mock_dynamodb2
+    @mock_aws
     def test_scan(self):
         self._create_prepared_table()
 
@@ -444,7 +460,7 @@ class TestDynamoDbExtension(TestBase):
         self.assert_select(span, "ALL_ATTRIBUTES")
         self.assert_consumed_capacity(span, self.default_table_name)
 
-    @mock_dynamodb2
+    @mock_aws
     def test_update_item(self):
         self._create_prepared_table()
 
@@ -465,7 +481,7 @@ class TestDynamoDbExtension(TestBase):
     def test_update_item_item_collection_metrics(self):
         self.assert_extension_item_col_metrics("UpdateItem")
 
-    @mock_dynamodb2
+    @mock_aws
     def test_update_table(self):
         self._create_prepared_table()
 

{opentelemetry_instrumentation_botocore-0.46b0 → opentelemetry_instrumentation_botocore-0.48b0}/tests/test_botocore_instrumentation.py

@@ -12,19 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import json
-from unittest.mock import Mock, patch
+from unittest.mock import ANY, Mock, patch
 
 import botocore.session
 from botocore.exceptions import ParamValidationError
-from moto import (  # pylint: disable=import-error
-    mock_ec2,
-    mock_kinesis,
-    mock_kms,
-    mock_s3,
-    mock_sqs,
-    mock_sts,
-    mock_xray,
-)
+from moto import mock_aws  # pylint: disable=import-error
 
 from opentelemetry import trace as trace_api
 from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
@@ -39,7 +31,7 @@ from opentelemetry.test.mock_textmap import MockTextMapPropagator
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace.span import format_span_id, format_trace_id
 
-_REQUEST_ID_REGEX_MATCH = r"[A-Z0-9]{52}"
+_REQUEST_ID_REGEX_MATCH = r"[A-Za-z0-9]{52}"
 
 
 # pylint:disable=too-many-public-methods
@@ -102,7 +94,7 @@ class TestBotocoreInstrumentor(TestBase):
         self.assertEqual(f"{service}.{operation}", span.name)
         return span
 
-    @mock_ec2
+    @mock_aws
     def test_traced_client(self):
         ec2 = self._make_client("ec2")
 
@@ -111,7 +103,7 @@ class TestBotocoreInstrumentor(TestBase):
         request_id = "fdcdcab1-ae5c-489e-9c33-4637c5dda355"
         self.assert_span("EC2", "DescribeInstances", request_id=request_id)
 
-    @mock_ec2
+    @mock_aws
     def test_not_recording(self):
         mock_tracer = Mock()
         mock_span = Mock()
@@ -126,7 +118,7 @@ class TestBotocoreInstrumentor(TestBase):
             self.assertFalse(mock_span.set_attribute.called)
             self.assertFalse(mock_span.set_status.called)
 
-    @mock_s3
+    @mock_aws
     def test_exception(self):
         s3 = self._make_client("s3")
 
@@ -149,14 +141,14 @@ class TestBotocoreInstrumentor(TestBase):
         self.assertIn(SpanAttributes.EXCEPTION_TYPE, event.attributes)
         self.assertIn(SpanAttributes.EXCEPTION_MESSAGE, event.attributes)
 
-    @mock_s3
+    @mock_aws
     def test_s3_client(self):
         s3 = self._make_client("s3")
 
         s3.list_buckets()
         self.assert_span("S3", "ListBuckets")
 
-    @mock_s3
+    @mock_aws
     def test_s3_put(self):
         s3 = self._make_client("s3")
 
@@ -174,7 +166,7 @@ class TestBotocoreInstrumentor(TestBase):
         s3.get_object(Bucket="mybucket", Key="foo")
         self.assert_span("S3", "GetObject", request_id=_REQUEST_ID_REGEX_MATCH)
 
-    @mock_sqs
+    @mock_aws
     def test_sqs_client(self):
         sqs = self._make_client("sqs")
 
@@ -184,7 +176,7 @@ class TestBotocoreInstrumentor(TestBase):
             "SQS", "ListQueues", request_id=_REQUEST_ID_REGEX_MATCH
         )
 
-    @mock_sqs
+    @mock_aws
     def test_sqs_send_message(self):
         sqs = self._make_client("sqs")
         test_queue_name = "test_queue_name"
@@ -205,14 +197,14 @@ class TestBotocoreInstrumentor(TestBase):
             attributes={"aws.queue_url": queue_url},
         )
 
-    @mock_kinesis
+    @mock_aws
     def test_kinesis_client(self):
         kinesis = self._make_client("kinesis")
 
         kinesis.list_streams()
         self.assert_span("Kinesis", "ListStreams")
 
-    @mock_kinesis
+    @mock_aws
     def test_unpatch(self):
         kinesis = self._make_client("kinesis")
 
@@ -221,7 +213,7 @@ class TestBotocoreInstrumentor(TestBase):
         kinesis.list_streams()
         self.assertEqual(0, len(self.memory_exporter.get_finished_spans()))
 
-    @mock_ec2
+    @mock_aws
     def test_uninstrument_does_not_inject_headers(self):
         headers = {}
 
@@ -240,7 +232,7 @@ class TestBotocoreInstrumentor(TestBase):
 
         self.assertNotIn(TRACE_HEADER_KEY, headers)
 
-    @mock_sqs
+    @mock_aws
     def test_double_patch(self):
         sqs = self._make_client("sqs")
 
@@ -252,19 +244,19 @@ class TestBotocoreInstrumentor(TestBase):
             "SQS", "ListQueues", request_id=_REQUEST_ID_REGEX_MATCH
         )
 
-    @mock_kms
+    @mock_aws
     def test_kms_client(self):
         kms = self._make_client("kms")
 
         kms.list_keys(Limit=21)
 
         span = self.assert_only_span()
+        expected = self._default_span_attributes("KMS", "ListKeys")
+        expected["aws.request_id"] = ANY
         # check for exact attribute set to make sure not to leak any kms secrets
-        self.assertEqual(
-            self._default_span_attributes("KMS", "ListKeys"), span.attributes
-        )
+        self.assertEqual(expected, dict(span.attributes))
 
-    @mock_sts
+    @mock_aws
     def test_sts_client(self):
         sts = self._make_client("sts")
 
@@ -272,11 +264,11 @@ class TestBotocoreInstrumentor(TestBase):
 
         span = self.assert_only_span()
         expected = self._default_span_attributes("STS", "GetCallerIdentity")
-        expected["aws.request_id"] = "c6104cbe-af31-11e0-8154-cbc7ccf896c7"
+        expected["aws.request_id"] = ANY
         # check for exact attribute set to make sure not to leak any sts secrets
-        self.assertEqual(expected, span.attributes)
+        self.assertEqual(expected, dict(span.attributes))
 
-    @mock_ec2
+    @mock_aws
     def test_propagator_injects_into_request(self):
         headers = {}
         previous_propagator = get_global_textmap()
@@ -316,7 +308,7 @@ class TestBotocoreInstrumentor(TestBase):
         finally:
             set_global_textmap(previous_propagator)
 
-    @mock_ec2
+    @mock_aws
     def test_override_xray_propagator_injects_into_request(self):
         headers = {}
 
@@ -335,7 +327,7 @@ class TestBotocoreInstrumentor(TestBase):
         self.assertNotIn(MockTextMapPropagator.TRACE_ID_KEY, headers)
         self.assertNotIn(MockTextMapPropagator.SPAN_ID_KEY, headers)
 
-    @mock_xray
+    @mock_aws
     def test_suppress_instrumentation_xray_client(self):
         xray_client = self._make_client("xray")
         with suppress_instrumentation():
@@ -343,7 +335,7 @@ class TestBotocoreInstrumentor(TestBase):
             xray_client.put_trace_segments(TraceSegmentDocuments=["str2"])
         self.assertEqual(0, len(self.get_finished_spans()))
 
-    @mock_xray
+    @mock_aws
     def test_suppress_http_instrumentation_xray_client(self):
         xray_client = self._make_client("xray")
         with suppress_http_instrumentation():
@@ -351,7 +343,7 @@ class TestBotocoreInstrumentor(TestBase):
             xray_client.put_trace_segments(TraceSegmentDocuments=["str2"])
         self.assertEqual(2, len(self.get_finished_spans()))
 
-    @mock_s3
+    @mock_aws
     def test_request_hook(self):
         request_hook_service_attribute_name = "request_hook.service_name"
         request_hook_operation_attribute_name = "request_hook.operation_name"
@@ -386,7 +378,7 @@ class TestBotocoreInstrumentor(TestBase):
             },
         )
 
-    @mock_s3
+    @mock_aws
     def test_response_hook(self):
         response_hook_service_attribute_name = "request_hook.service_name"
         response_hook_operation_attribute_name = "response_hook.operation_name"

{opentelemetry_instrumentation_botocore-0.46b0 → opentelemetry_instrumentation_botocore-0.48b0}/tests/test_botocore_lambda.py

@@ -19,7 +19,7 @@ import zipfile
 from unittest import mock
 
 import botocore.session
-from moto import mock_iam, mock_lambda  # pylint: disable=import-error
+from moto import mock_aws  # pylint: disable=import-error
 from pytest import mark
 
 from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
@@ -96,12 +96,12 @@ class TestLambdaExtension(TestBase):
         mock_call_context = mock.MagicMock(operation=operation, params={})
         return _LambdaExtension(mock_call_context)
 
-    @mock_lambda
+    @mock_aws
     def test_list_functions(self):
         self.client.list_functions()
         self.assert_span("ListFunctions")
 
-    @mock_iam
+    @mock_aws
     def _create_role_and_get_arn(self) -> str:
         return self.iam_client.create_role(
             RoleName="my-role",
@@ -131,7 +131,7 @@ class TestLambdaExtension(TestBase):
         sys.platform == "win32",
         reason="requires docker and Github CI Windows does not have docker installed by default",
     )
-    @mock_lambda
+    @mock_aws
     def test_invoke(self):
         previous_propagator = get_global_textmap()
         try:

{opentelemetry_instrumentation_botocore-0.46b0 → opentelemetry_instrumentation_botocore-0.48b0}/tests/test_botocore_sns.py

@@ -18,7 +18,7 @@ from unittest import mock
 
 import botocore.session
 from botocore.awsrequest import AWSResponse
-from moto import mock_sns
+from moto import mock_aws
 
 from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
 from opentelemetry.semconv.trace import (
@@ -91,11 +91,11 @@ class TestSnsExtension(TestBase):
         self.assertEqual(span_context.trace_id, int(trace_parent[1], 16))
         self.assertEqual(span_context.span_id, int(trace_parent[2], 16))
 
-    @mock_sns
+    @mock_aws
     def test_publish_to_topic_arn(self):
         self._test_publish_to_arn("TopicArn")
 
-    @mock_sns
+    @mock_aws
     def test_publish_to_target_arn(self):
         self._test_publish_to_arn("TargetArn")
 
@@ -125,7 +125,7 @@ class TestSnsExtension(TestBase):
             span.attributes["messaging.destination.name"],
         )
 
-    @mock_sns
+    @mock_aws
     def test_publish_to_phone_number(self):
         phone_number = "+10000000000"
         self.client.publish(
@@ -138,7 +138,7 @@ class TestSnsExtension(TestBase):
             phone_number, span.attributes[SpanAttributes.MESSAGING_DESTINATION]
         )
 
-    @mock_sns
+    @mock_aws
     def test_publish_injects_span(self):
         message_attrs = {}
         topic_arn = self._create_topic()

{opentelemetry_instrumentation_botocore-0.46b0 → opentelemetry_instrumentation_botocore-0.48b0}/tests/test_botocore_sqs.py

@@ -1,5 +1,5 @@
 import botocore.session
-from moto import mock_sqs
+from moto import mock_aws
 
 from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
 from opentelemetry.semconv.trace import SpanAttributes
@@ -22,7 +22,7 @@ class TestSqsExtension(TestBase):
         super().tearDown()
         BotocoreInstrumentor().uninstrument()
 
-    @mock_sqs
+    @mock_aws
     def test_sqs_messaging_send_message(self):
         create_queue_result = self.client.create_queue(
             QueueName="test_queue_name"
@@ -51,7 +51,7 @@ class TestSqsExtension(TestBase):
             response["MessageId"],
         )
 
-    @mock_sqs
+    @mock_aws
     def test_sqs_messaging_send_message_batch(self):
         create_queue_result = self.client.create_queue(
             QueueName="test_queue_name"
@@ -85,7 +85,7 @@ class TestSqsExtension(TestBase):
             response["Successful"][0]["MessageId"],
         )
 
-    @mock_sqs
+    @mock_aws
     def test_sqs_messaging_receive_message(self):
         create_queue_result = self.client.create_queue(
             QueueName="test_queue_name"
@@ -116,7 +116,7 @@ class TestSqsExtension(TestBase):
             message_result["Messages"][0]["MessageId"],
         )
 
-    @mock_sqs
+    @mock_aws
     def test_sqs_messaging_failed_operation(self):
         with self.assertRaises(Exception):
             self.client.send_message(