opentelemetry-instrumentation-botocore 0.42b0__tar.gz → 0.44b0__tar.gz

{opentelemetry_instrumentation_botocore-0.42b0 → opentelemetry_instrumentation_botocore-0.44b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentelemetry-instrumentation-botocore
-Version: 0.42b0
+Version: 0.44b0
 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>
@@ -11,23 +11,23 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Requires-Dist: opentelemetry-api~=1.12
-Requires-Dist: opentelemetry-instrumentation==0.42b0
+Requires-Dist: opentelemetry-instrumentation==0.44b0
 Requires-Dist: opentelemetry-propagator-aws-xray==1.0.1
-Requires-Dist: opentelemetry-semantic-conventions==0.42b0
+Requires-Dist: opentelemetry-semantic-conventions==0.44b0
 Provides-Extra: instruments
 Requires-Dist: botocore~=1.0; extra == 'instruments'
 Provides-Extra: test
+Requires-Dist: botocore<1.31.81,~=1.0; extra == 'test'
 Requires-Dist: markupsafe==2.0.1; extra == 'test'
 Requires-Dist: moto[all]~=2.2.6; extra == 'test'
 Requires-Dist: opentelemetry-instrumentation-botocore[instruments]; extra == 'test'
-Requires-Dist: opentelemetry-test-utils==0.42b0; extra == 'test'
+Requires-Dist: opentelemetry-test-utils==0.44b0; extra == 'test'
 Description-Content-Type: text/x-rst
 
 OpenTelemetry Botocore Tracing

{opentelemetry_instrumentation_botocore-0.42b0 → opentelemetry_instrumentation_botocore-0.44b0}/pyproject.toml

@@ -8,7 +8,7 @@ dynamic = ["version"]
 description = "OpenTelemetry Botocore instrumentation"
 readme = "README.rst"
 license = "Apache-2.0"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 authors = [
   { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" },
 ]
@@ -18,7 +18,6 @@ classifiers = [
   "License :: OSI Approved :: Apache Software License",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.7",
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
@@ -26,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.42b0",
-  "opentelemetry-semantic-conventions == 0.42b0",
+  "opentelemetry-instrumentation == 0.44b0",
+  "opentelemetry-semantic-conventions == 0.44b0",
   "opentelemetry-propagator-aws-xray == 1.0.1",
 ]
 
@@ -38,8 +37,9 @@ instruments = [
 test = [
   "opentelemetry-instrumentation-botocore[instruments]",
   "markupsafe==2.0.1",
+  "botocore ~= 1.0, < 1.31.81",
   "moto[all] ~= 2.2.6",
-  "opentelemetry-test-utils == 0.42b0",
+  "opentelemetry-test-utils == 0.44b0",
 ]
 
 [project.entry-points.opentelemetry_instrumentor]

{opentelemetry_instrumentation_botocore-0.42b0 → opentelemetry_instrumentation_botocore-0.44b0}/src/opentelemetry/instrumentation/botocore/__init__.py

@@ -86,10 +86,6 @@ from botocore.endpoint import Endpoint
 from botocore.exceptions import ClientError
 from wrapt import wrap_function_wrapper
 
-from opentelemetry import context as context_api
-
-# FIXME: fix the importing of this private attribute when the location of the _SUPPRESS_HTTP_INSTRUMENTATION_KEY is defined.
-from opentelemetry.context import _SUPPRESS_HTTP_INSTRUMENTATION_KEY
 from opentelemetry.instrumentation.botocore.extensions import _find_extension
 from opentelemetry.instrumentation.botocore.extensions.types import (
     _AwsSdkCallContext,
@@ -98,7 +94,8 @@ from opentelemetry.instrumentation.botocore.package import _instruments
 from opentelemetry.instrumentation.botocore.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import (
-    _SUPPRESS_INSTRUMENTATION_KEY,
+    is_instrumentation_enabled,
+    suppress_http_instrumentation,
     unwrap,
 )
 from opentelemetry.propagators.aws.aws_xray_propagator import AwsXRayPropagator
@@ -171,7 +168,7 @@ class BotocoreInstrumentor(BaseInstrumentor):
 
     # pylint: disable=too-many-branches
     def _patched_api_call(self, original_func, instance, args, kwargs):
-        if context_api.get_value(_SUPPRESS_INSTRUMENTATION_KEY):
+        if not is_instrumentation_enabled():
             return original_func(*args, **kwargs)
 
         call_context = _determine_call_context(instance, args)
@@ -200,25 +197,20 @@ class BotocoreInstrumentor(BaseInstrumentor):
             _safe_invoke(extension.before_service_call, span)
             self._call_request_hook(span, call_context)
 
-            token = context_api.attach(
-                context_api.set_value(_SUPPRESS_HTTP_INSTRUMENTATION_KEY, True)
-            )
-
-            result = None
             try:
-                result = original_func(*args, **kwargs)
-            except ClientError as error:
-                result = getattr(error, "response", None)
-                _apply_response_attributes(span, result)
-                _safe_invoke(extension.on_error, span, error)
-                raise
-            else:
-                _apply_response_attributes(span, result)
-                _safe_invoke(extension.on_success, span, result)
+                with suppress_http_instrumentation():
+                    result = None
+                    try:
+                        result = original_func(*args, **kwargs)
+                    except ClientError as error:
+                        result = getattr(error, "response", None)
+                        _apply_response_attributes(span, result)
+                        _safe_invoke(extension.on_error, span, error)
+                        raise
+                    _apply_response_attributes(span, result)
+                    _safe_invoke(extension.on_success, span, result)
             finally:
-                context_api.detach(token)
                 _safe_invoke(extension.after_service_call)
-
                 self._call_response_hook(span, call_context, result)
 
             return result

{opentelemetry_instrumentation_botocore-0.42b0 → opentelemetry_instrumentation_botocore-0.44b0}/src/opentelemetry/instrumentation/botocore/extensions/dynamodb.py

@@ -28,6 +28,7 @@ from opentelemetry.semconv.trace import DbSystemValues, SpanAttributes
 from opentelemetry.trace.span import Span
 from opentelemetry.util.types import AttributeValue
 
+# pylint: disable=invalid-name
 _AttributePathT = Union[str, Tuple[str]]
 
 

{opentelemetry_instrumentation_botocore-0.42b0 → opentelemetry_instrumentation_botocore-0.44b0}/src/opentelemetry/instrumentation/botocore/extensions/lmbd.py

@@ -99,13 +99,13 @@ class _OpInvoke(_LambdaOperation):
 # Lambda extension
 ################################################################################
 
-_OPERATION_MAPPING = {
+_OPERATION_MAPPING: Dict[str, _LambdaOperation] = {
     op.operation_name(): op
     for op in globals().values()
     if inspect.isclass(op)
     and issubclass(op, _LambdaOperation)
     and not inspect.isabstract(op)
-}  # type: Dict[str, _LambdaOperation]
+}
 
 
 class _LambdaExtension(_AwsSdkExtension):

{opentelemetry_instrumentation_botocore-0.42b0 → opentelemetry_instrumentation_botocore-0.44b0}/src/opentelemetry/instrumentation/botocore/extensions/sns.py

@@ -82,7 +82,9 @@ class _OpPublish(_SnsOperation):
         attributes[SpanAttributes.MESSAGING_DESTINATION] = destination_name
 
         # TODO: Use SpanAttributes.MESSAGING_DESTINATION_NAME when opentelemetry-semantic-conventions 0.42b0 is released
-        attributes["messaging.destination.name"] = cls._extract_input_arn(call_context)
+        attributes["messaging.destination.name"] = cls._extract_input_arn(
+            call_context
+        )
         call_context.span_name = (
             f"{'phone_number' if is_phone_number else destination_name} send"
         )
@@ -141,13 +143,13 @@ class _OpPublishBatch(_OpPublish):
 # SNS extension
 ################################################################################
 
-_OPERATION_MAPPING = {
+_OPERATION_MAPPING: Dict[str, _SnsOperation] = {
     op.operation_name(): op
     for op in globals().values()
     if inspect.isclass(op)
     and issubclass(op, _SnsOperation)
     and not inspect.isabstract(op)
-}  # type: Dict[str, _SnsOperation]
+}
 
 
 class _SnsExtension(_AwsSdkExtension):

{opentelemetry_instrumentation_botocore-0.42b0 → opentelemetry_instrumentation_botocore-0.44b0}/src/opentelemetry/instrumentation/botocore/extensions/types.py

@@ -57,23 +57,21 @@ class _AwsSdkCallContext:
         boto_meta = client.meta
         service_model = boto_meta.service_model
 
-        self.service = service_model.service_name.lower()  # type: str
-        self.operation = operation  # type: str
-        self.params = params  # type: Dict[str, Any]
+        self.service = service_model.service_name.lower()
+        self.operation = operation
+        self.params = params
 
         # 'operation' and 'service' are essential for instrumentation.
         # for all other attributes we extract them defensively. All of them should
         # usually exist unless some future botocore version moved things.
-        self.region = self._get_attr(
-            boto_meta, "region_name"
-        )  # type: Optional[str]
-        self.endpoint_url = self._get_attr(
+        self.region: Optional[str] = self._get_attr(boto_meta, "region_name")
+        self.endpoint_url: Optional[str] = self._get_attr(
             boto_meta, "endpoint_url"
-        )  # type: Optional[str]
+        )
 
-        self.api_version = self._get_attr(
+        self.api_version: Optional[str] = self._get_attr(
             service_model, "api_version"
-        )  # type: Optional[str]
+        )
         # name of the service in proper casing
         self.service_id = str(
             self._get_attr(service_model, "service_id", self.service)

{opentelemetry_instrumentation_botocore-0.42b0 → opentelemetry_instrumentation_botocore-0.44b0}/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.42b0"
+__version__ = "0.44b0"

{opentelemetry_instrumentation_botocore-0.42b0 → opentelemetry_instrumentation_botocore-0.44b0}/tests/test_botocore_instrumentation.py

@@ -27,14 +27,11 @@ from moto import (  # pylint: disable=import-error
 )
 
 from opentelemetry import trace as trace_api
-from opentelemetry.context import (
-    _SUPPRESS_HTTP_INSTRUMENTATION_KEY,
-    attach,
-    detach,
-    set_value,
-)
 from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
-from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
+from opentelemetry.instrumentation.utils import (
+    suppress_http_instrumentation,
+    suppress_instrumentation,
+)
 from opentelemetry.propagate import get_global_textmap, set_global_textmap
 from opentelemetry.propagators.aws.aws_xray_propagator import TRACE_HEADER_KEY
 from opentelemetry.semconv.trace import SpanAttributes
@@ -341,23 +338,17 @@ class TestBotocoreInstrumentor(TestBase):
     @mock_xray
     def test_suppress_instrumentation_xray_client(self):
         xray_client = self._make_client("xray")
-        token = attach(set_value(_SUPPRESS_INSTRUMENTATION_KEY, True))
-        try:
+        with suppress_instrumentation():
             xray_client.put_trace_segments(TraceSegmentDocuments=["str1"])
             xray_client.put_trace_segments(TraceSegmentDocuments=["str2"])
-        finally:
-            detach(token)
         self.assertEqual(0, len(self.get_finished_spans()))
 
     @mock_xray
     def test_suppress_http_instrumentation_xray_client(self):
         xray_client = self._make_client("xray")
-        token = attach(set_value(_SUPPRESS_HTTP_INSTRUMENTATION_KEY, True))
-        try:
+        with suppress_http_instrumentation():
             xray_client.put_trace_segments(TraceSegmentDocuments=["str1"])
             xray_client.put_trace_segments(TraceSegmentDocuments=["str2"])
-        finally:
-            detach(token)
         self.assertEqual(2, len(self.get_finished_spans()))
 
     @mock_s3

{opentelemetry_instrumentation_botocore-0.42b0 → opentelemetry_instrumentation_botocore-0.44b0}/tests/test_botocore_sns.py

@@ -122,7 +122,7 @@ class TestSnsExtension(TestBase):
             target_arn,
             # TODO: Use SpanAttributes.MESSAGING_DESTINATION_NAME when
             #  opentelemetry-semantic-conventions 0.42b0 is released
-            span.attributes["messaging.destination.name"]
+            span.attributes["messaging.destination.name"],
         )
 
     @mock_sns
@@ -194,7 +194,7 @@ class TestSnsExtension(TestBase):
             topic_arn,
             # TODO: Use SpanAttributes.MESSAGING_DESTINATION_NAME when
             #  opentelemetry-semantic-conventions 0.42b0 is released
-            span.attributes["messaging.destination.name"]
+            span.attributes["messaging.destination.name"],
         )
 
         self.assert_injected_span(message1_attrs, span)