aiohttp-server: fix HTTP error inconsistencies (#4175)

* aiohttp-server: fix HTTP error inconsistencies

Signed-off-by: emdneto <9735060+emdneto@users.noreply.github.com>

* fix failing test

Signed-off-by: emdneto <9735060+emdneto@users.noreply.github.com>

* changelog and fix pylint

Signed-off-by: emdneto <9735060+emdneto@users.noreply.github.com>

* changelog and fix pylint

Signed-off-by: emdneto <9735060+emdneto@users.noreply.github.com>

---------

Signed-off-by: emdneto <9735060+emdneto@users.noreply.github.com>
Co-authored-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>

Author: emdneto

CHANGELOG.md

@@ -66,11 +66,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4001](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/4001))
 - `opentelemetry-instrumentation-psycopg`: Fix `instrument_connection` method to use `_new_cursor_async_factory` on async connections.
   ([#3956](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3956))
-- `opentelemetry-instrumentation-dbapi`: Replace SpanAttributes with semconv constants where applicable 
+- `opentelemetry-instrumentation-dbapi`: Replace SpanAttributes with semconv constants where applicable
   ([#4058](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4058))
-- `opentelemetry-instrumentation-django`: Replace SpanAttributes with semconv constants where applicable 
+- `opentelemetry-instrumentation-django`: Replace SpanAttributes with semconv constants where applicable
   ([#4059](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4059))
-- `opentelemetry-instrumentation-botocore`: Replace SpanAttributes with semconv constants where applicable 
+- `opentelemetry-instrumentation-botocore`: Replace SpanAttributes with semconv constants where applicable
   ([#4063](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4063))
 - `opentelemetry-instrumentation-celery`: Replace SpanAttributes with semconv constants where applicable
   ([#4056](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4056))
@@ -102,8 +102,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3729](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3729))
 - `opentelemetry-instrumentation-confluent-kafka`: Fix incorrect number of argument to `_inner_wrap_close`
   ([#3922](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3922))
-- `opentelemetry-instrumentation-urllib3`: fix multiple arguments error 
+- `opentelemetry-instrumentation-urllib3`: fix multiple arguments error
   ([#4144](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4144))
+- `opentelemetry-instrumentation-aiohttp-server`: fix HTTP error inconsistencies
+  ([#4175](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4175))
 
 ### Breaking changes
 

instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/__init__.py

@@ -199,12 +199,10 @@ async def hello(request):
     HTTP_SERVER_NAME,
     HTTP_URL,
 )
-from opentelemetry.semconv.attributes.error_attributes import ERROR_TYPE
 from opentelemetry.semconv.metrics import MetricInstruments
 from opentelemetry.semconv.metrics.http_metrics import (
     HTTP_SERVER_REQUEST_DURATION,
 )
-from opentelemetry.trace.status import Status, StatusCode
 from opentelemetry.util.http import (
     OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SANITIZE_FIELDS,
     OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST,
@@ -389,25 +387,21 @@ def set_status_code(
     if duration_attrs is None:
         duration_attrs = {}
 
+    status_code_str = str(status_code)
+
     try:
         status_code_int = int(status_code)
-        status_code_str = str(status_code)
     except ValueError:
-        span.set_status(
-            Status(
-                StatusCode.ERROR,
-                "Non-integer HTTP status: " + repr(status_code),
-            )
-        )
-    else:
-        _set_status(
-            span,
-            duration_attrs,
-            status_code_int,
-            status_code_str,
-            server_span=True,
-            sem_conv_opt_in_mode=sem_conv_opt_in_mode,
-        )
+        status_code_int = -1
+
+    _set_status(
+        span,
+        duration_attrs,
+        status_code_int,
+        status_code_str,
+        server_span=True,
+        sem_conv_opt_in_mode=sem_conv_opt_in_mode,
+    )
 
 
 class AiohttpGetter(Getter):
@@ -469,6 +463,8 @@ async def _middleware(request, handler):
             context=extract(request, getter=getter),
             kind=trace.SpanKind.SERVER,
             attributes=request_attrs,
+            set_status_on_exception=False,
+            record_exception=False,
         ) as span:
             if span.is_recording():
                 span.set_attributes(
@@ -489,18 +485,32 @@ async def _middleware(request, handler):
                         collect_response_headers_attributes(resp)
                     )
                     span.set_attributes(response_headers_attributes)
+            except web.HTTPServerError as ex:
+                set_status_code(
+                    span,
+                    ex.status_code,
+                    request_attrs,
+                    _sem_conv_opt_in_mode,
+                )
+                span.record_exception(ex)
+                raise
             except web.HTTPException as ex:
-                if _report_new(_sem_conv_opt_in_mode):
-                    request_attrs[ERROR_TYPE] = type(ex).__qualname__
-                    if span.is_recording():
-                        span.set_attribute(ERROR_TYPE, type(ex).__qualname__)
                 set_status_code(
                     span,
                     ex.status_code,
                     request_attrs,
                     _sem_conv_opt_in_mode,
                 )
                 raise
+            except Exception as ex:
+                set_status_code(
+                    span,
+                    type(ex).__qualname__,
+                    request_attrs,
+                    _sem_conv_opt_in_mode,
+                )
+                span.record_exception(ex)
+                raise
             finally:
                 duration_s = default_timer() - start
                 if duration_histogram_old: