opentelemetry-instrumentation-aiohttp-client 0.46b0__py3-none-any.whl → 0.48b0__py3-none-any.whl

opentelemetry/instrumentation/aiohttp_client/__init__.py

@@ -90,19 +90,28 @@ import yarl
 
 from opentelemetry import context as context_api
 from opentelemetry import trace
+from opentelemetry.instrumentation._semconv import (
+    _get_schema_url,
+    _HTTPStabilityMode,
+    _OpenTelemetrySemanticConventionStability,
+    _OpenTelemetryStabilitySignalType,
+    _report_new,
+    _set_http_method,
+    _set_http_url,
+    _set_status,
+)
 from opentelemetry.instrumentation.aiohttp_client.package import _instruments
 from opentelemetry.instrumentation.aiohttp_client.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import (
-    http_status_to_status_code,
     is_instrumentation_enabled,
     unwrap,
 )
 from opentelemetry.propagate import inject
-from opentelemetry.semconv.trace import SpanAttributes
+from opentelemetry.semconv.attributes.error_attributes import ERROR_TYPE
 from opentelemetry.trace import Span, SpanKind, TracerProvider, get_tracer
 from opentelemetry.trace.status import Status, StatusCode
-from opentelemetry.util.http import remove_url_credentials
+from opentelemetry.util.http import remove_url_credentials, sanitize_method
 
 _UrlFilterT = typing.Optional[typing.Callable[[yarl.URL], str]]
 _RequestHookT = typing.Optional[
@@ -122,11 +131,45 @@ _ResponseHookT = typing.Optional[
 ]
 
 
+def _get_span_name(method: str) -> str:
+    method = sanitize_method(method.strip())
+    if method == "_OTHER":
+        method = "HTTP"
+    return method
+
+
+def _set_http_status_code_attribute(
+    span,
+    status_code,
+    metric_attributes=None,
+    sem_conv_opt_in_mode=_HTTPStabilityMode.DEFAULT,
+):
+    status_code_str = str(status_code)
+    try:
+        status_code = int(status_code)
+    except ValueError:
+        status_code = -1
+    if metric_attributes is None:
+        metric_attributes = {}
+    # When we have durations we should set metrics only once
+    # Also the decision to include status code on a histogram should
+    # not be dependent on tracing decisions.
+    _set_status(
+        span,
+        metric_attributes,
+        status_code,
+        status_code_str,
+        server_span=False,
+        sem_conv_opt_in_mode=sem_conv_opt_in_mode,
+    )
+
+
 def create_trace_config(
     url_filter: _UrlFilterT = None,
     request_hook: _RequestHookT = None,
     response_hook: _ResponseHookT = None,
     tracer_provider: TracerProvider = None,
+    sem_conv_opt_in_mode: _HTTPStabilityMode = _HTTPStabilityMode.DEFAULT,
 ) -> aiohttp.TraceConfig:
     """Create an aiohttp-compatible trace configuration.
 
@@ -167,9 +210,12 @@ def create_trace_config(
         __name__,
         __version__,
         tracer_provider,
-        schema_url="https://opentelemetry.io/schemas/1.11.0",
+        schema_url=_get_schema_url(sem_conv_opt_in_mode),
     )
 
+    # TODO: Use this when we have durations for aiohttp-client
+    metric_attributes = {}
+
     def _end_trace(trace_config_ctx: types.SimpleNamespace):
         context_api.detach(trace_config_ctx.token)
         trace_config_ctx.span.end()
@@ -183,18 +229,22 @@ def create_trace_config(
             trace_config_ctx.span = None
             return
 
-        http_method = params.method.upper()
-        request_span_name = f"{http_method}"
+        method = params.method
+        request_span_name = _get_span_name(method)
         request_url = (
             remove_url_credentials(trace_config_ctx.url_filter(params.url))
             if callable(trace_config_ctx.url_filter)
             else remove_url_credentials(str(params.url))
         )
 
-        span_attributes = {
-            SpanAttributes.HTTP_METHOD: http_method,
-            SpanAttributes.HTTP_URL: request_url,
-        }
+        span_attributes = {}
+        _set_http_method(
+            span_attributes,
+            method,
+            sanitize_method(method),
+            sem_conv_opt_in_mode,
+        )
+        _set_http_url(span_attributes, request_url, sem_conv_opt_in_mode)
 
         trace_config_ctx.span = trace_config_ctx.tracer.start_span(
             request_span_name, kind=SpanKind.CLIENT, attributes=span_attributes
@@ -219,14 +269,13 @@ def create_trace_config(
 
         if callable(response_hook):
             response_hook(trace_config_ctx.span, params)
+        _set_http_status_code_attribute(
+            trace_config_ctx.span,
+            params.response.status,
+            metric_attributes,
+            sem_conv_opt_in_mode,
+        )
 
-        if trace_config_ctx.span.is_recording():
-            trace_config_ctx.span.set_status(
-                Status(http_status_to_status_code(int(params.response.status)))
-            )
-            trace_config_ctx.span.set_attribute(
-                SpanAttributes.HTTP_STATUS_CODE, params.response.status
-            )
         _end_trace(trace_config_ctx)
 
     async def on_request_exception(
@@ -238,7 +287,13 @@ def create_trace_config(
             return
 
         if trace_config_ctx.span.is_recording() and params.exception:
-            trace_config_ctx.span.set_status(Status(StatusCode.ERROR))
+            exc_type = type(params.exception).__qualname__
+            if _report_new(sem_conv_opt_in_mode):
+                trace_config_ctx.span.set_attribute(ERROR_TYPE, exc_type)
+
+            trace_config_ctx.span.set_status(
+                Status(StatusCode.ERROR, exc_type)
+            )
             trace_config_ctx.span.record_exception(params.exception)
 
         if callable(response_hook):
@@ -271,6 +326,7 @@ def _instrument(
     trace_configs: typing.Optional[
         typing.Sequence[aiohttp.TraceConfig]
     ] = None,
+    sem_conv_opt_in_mode: _HTTPStabilityMode = _HTTPStabilityMode.DEFAULT,
 ):
     """Enables tracing of all ClientSessions
 
@@ -293,6 +349,7 @@ def _instrument(
             request_hook=request_hook,
             response_hook=response_hook,
             tracer_provider=tracer_provider,
+            sem_conv_opt_in_mode=sem_conv_opt_in_mode,
         )
         trace_config._is_instrumented_by_opentelemetry = True
         client_trace_configs.append(trace_config)
@@ -344,12 +401,17 @@ class AioHttpClientInstrumentor(BaseInstrumentor):
                 ``trace_configs``: An optional list of aiohttp.TraceConfig items, allowing customize enrichment of spans
                  based on aiohttp events (see specification: https://docs.aiohttp.org/en/stable/tracing_reference.html)
         """
+        _OpenTelemetrySemanticConventionStability._initialize()
+        _sem_conv_opt_in_mode = _OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(
+            _OpenTelemetryStabilitySignalType.HTTP,
+        )
         _instrument(
             tracer_provider=kwargs.get("tracer_provider"),
             url_filter=kwargs.get("url_filter"),
             request_hook=kwargs.get("request_hook"),
             response_hook=kwargs.get("response_hook"),
             trace_configs=kwargs.get("trace_configs"),
+            sem_conv_opt_in_mode=_sem_conv_opt_in_mode,
         )
 
     def _uninstrument(self, **kwargs):

opentelemetry/instrumentation/aiohttp_client/package.py

@@ -14,3 +14,7 @@
 
 
 _instruments = ("aiohttp ~= 3.0",)
+
+_supports_metrics = False
+
+_semconv_status = "migration"

opentelemetry/instrumentation/aiohttp_client/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_aiohttp_client-0.46b0.dist-info → opentelemetry_instrumentation_aiohttp_client-0.48b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-aiohttp-client
-Version: 0.46b0
+Version: 0.48b0
 Summary: OpenTelemetry aiohttp client instrumentation
 Project-URL: Homepage, https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aiohttp-client
 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-semantic-conventions==0.46b0
-Requires-Dist: opentelemetry-util-http==0.46b0
+Requires-Dist: opentelemetry-instrumentation==0.48b0
+Requires-Dist: opentelemetry-semantic-conventions==0.48b0
+Requires-Dist: opentelemetry-util-http==0.48b0
 Requires-Dist: wrapt<2.0.0,>=1.0.0
 Provides-Extra: instruments
 Requires-Dist: aiohttp~=3.0; extra == 'instruments'

opentelemetry_instrumentation_aiohttp_client-0.48b0.dist-info/RECORD

@@ -0,0 +1,8 @@
+opentelemetry/instrumentation/aiohttp_client/__init__.py,sha256=l3EfkPyCLBDBd8bwC9jXuK4FYhzBZPV3j33gGKm5o4I,14294
+opentelemetry/instrumentation/aiohttp_client/package.py,sha256=sNviXDOZG31-3USpt9VVWNqT8kAiIKaxtq-wi1k8WBM,681
+opentelemetry/instrumentation/aiohttp_client/version.py,sha256=HRXiCQ2OeHywRgwG6rGky38ebvXDy-TQ6uBtMIN5wFM,610
+opentelemetry_instrumentation_aiohttp_client-0.48b0.dist-info/METADATA,sha256=FTdIGLYelo9leHsESKKXpwUzRdNMYCAsG7GZ7jNb9lM,2078
+opentelemetry_instrumentation_aiohttp_client-0.48b0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+opentelemetry_instrumentation_aiohttp_client-0.48b0.dist-info/entry_points.txt,sha256=RyZ5eVO-u3V_rwvLrhMM0ABs_WYZDqcagmMKwDPtmwE,117
+opentelemetry_instrumentation_aiohttp_client-0.48b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentelemetry_instrumentation_aiohttp_client-0.48b0.dist-info/RECORD,,

{opentelemetry_instrumentation_aiohttp_client-0.46b0.dist-info → opentelemetry_instrumentation_aiohttp_client-0.48b0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.24.2
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any

opentelemetry_instrumentation_aiohttp_client-0.46b0.dist-info/RECORD

@@ -1,8 +0,0 @@
-opentelemetry/instrumentation/aiohttp_client/__init__.py,sha256=ZFvlrUbyi-U1Im22G5OFDPskcefx4L64LPdC-CVY1HI,12373
-opentelemetry/instrumentation/aiohttp_client/package.py,sha256=p_Q78PKsyRJD-WRU8p_peiPrGxilvGbfeZce0IiMkII,623
-opentelemetry/instrumentation/aiohttp_client/version.py,sha256=rjIU3AqMQrZC8zvWWAfHmCitnFtz6L_9z35r5OH_Q6M,610
-opentelemetry_instrumentation_aiohttp_client-0.46b0.dist-info/METADATA,sha256=we-F63fZn_1ttKs-qrTNK2wnaot0yW1cV9taHcQ6M64,2027
-opentelemetry_instrumentation_aiohttp_client-0.46b0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-opentelemetry_instrumentation_aiohttp_client-0.46b0.dist-info/entry_points.txt,sha256=RyZ5eVO-u3V_rwvLrhMM0ABs_WYZDqcagmMKwDPtmwE,117
-opentelemetry_instrumentation_aiohttp_client-0.46b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentelemetry_instrumentation_aiohttp_client-0.46b0.dist-info/RECORD,,