lint

Author: Liudmila Molkova

instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/span_builder.py

@@ -46,10 +46,7 @@ def set_operation(self, operation: MessagingOperationValues):
 
     def set_destination(self, destination: str):
         self._destination = destination
-        if self._kind == SpanKind.PRODUCER:
-            self._attributes[SpanAttributes.MESSAGING_DESTINATION_NAME] = destination
-        else:
-            self._attributes[SpanAttributes.MESSAGING_SOURCE_NAME] = destination
+        self._attributes[SpanAttributes.MESSAGING_DESTINATION_NAME] = destination
 
     def set_channel(self, channel: AbstractChannel):
         connection = channel.connection

instrumentation/opentelemetry-instrumentation-aio-pika/tests/test_callback_decorator.py

@@ -41,7 +41,7 @@
 class TestInstrumentedQueueAioRmq7(TestCase):
     EXPECTED_ATTRIBUTES = {
         SpanAttributes.MESSAGING_SYSTEM: MESSAGING_SYSTEM,
-        SpanAttributes.MESSAGING_SOURCE_NAME: EXCHANGE_NAME,
+        SpanAttributes.MESSAGING_DESTINATION_NAME: EXCHANGE_NAME,
         SpanAttributes.NET_PEER_NAME: SERVER_HOST,
         SpanAttributes.NET_PEER_PORT: SERVER_PORT,
         SpanAttributes.MESSAGING_MESSAGE_ID: MESSAGE_ID,
@@ -81,7 +81,7 @@ def test_decorate_callback(self):
 class TestInstrumentedQueueAioRmq8(TestCase):
     EXPECTED_ATTRIBUTES = {
         SpanAttributes.MESSAGING_SYSTEM: MESSAGING_SYSTEM,
-        SpanAttributes.MESSAGING_SOURCE_NAME: EXCHANGE_NAME,
+        SpanAttributes.MESSAGING_DESTINATION_NAME: EXCHANGE_NAME,
         SpanAttributes.NET_PEER_NAME: SERVER_HOST,
         SpanAttributes.NET_PEER_PORT: SERVER_PORT,
         SpanAttributes.MESSAGING_MESSAGE_ID: MESSAGE_ID,

instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/sqs.py

@@ -38,14 +38,9 @@ def extract_attributes(self, attributes: _AttributeMapT):
             attributes[SpanAttributes.NET_PEER_NAME] = queue_host
             try:
                 queue_name = queue_url.split("/")[-1]
-                if self._call_context.operation == "ReceiveMessage":
-                    attributes[
-                        SpanAttributes.MESSAGING_SOURCE_NAME
-                    ] = queue_name
-                else:
-                    attributes[
-                        SpanAttributes.MESSAGING_DESTINATION_NAME
-                    ] = queue_name
+                attributes[
+                    SpanAttributes.MESSAGING_DESTINATION_NAME
+                ] = queue_name
 
             except IndexError:
                 _logger.error(

instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_sqs.py

@@ -113,7 +113,7 @@ def test_sqs_messaging_receive_message(self):
             span.attributes[SpanAttributes.NET_PEER_NAME], queue_host
         )
         self.assertEqual(
-            span.attributes[SpanAttributes.MESSAGING_SOURCE_NAME],
+            span.attributes[SpanAttributes.MESSAGING_DESTINATION_NAME],
             "test_queue_name",
         )
         self.assertEqual(

instrumentation/opentelemetry-instrumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/utils.py

@@ -91,10 +91,7 @@ def _enrich_span(
         return
 
     span.set_attribute(SpanAttributes.MESSAGING_SYSTEM, "kafka")
-    if operation == MessagingOperationValues.RECEIVE:
-        span.set_attribute(SpanAttributes.MESSAGING_SOURCE_NAME, topic)
-    else:
-        span.set_attribute(SpanAttributes.MESSAGING_DESTINATION_NAME, topic)
+    span.set_attribute(SpanAttributes.MESSAGING_DESTINATION_NAME, topic)
 
     if partition:
         span.set_attribute(

instrumentation/opentelemetry-instrumentation-kafka-python/src/opentelemetry/instrumentation/kafka/utils.py

@@ -126,17 +126,13 @@ def _enrich_span(
     span,
     bootstrap_servers: List[str],
     topic: str,
-    partition: int,
-    consumer: bool,
+    partition: int
 ):
     if span.is_recording():
         span.set_attribute(SpanAttributes.MESSAGING_SYSTEM, "kafka")
-        if consumer:
-            span.set_attribute(SpanAttributes.MESSAGING_SOURCE_NAME, topic)
-        else:
-            span.set_attribute(
-                SpanAttributes.MESSAGING_DESTINATION_NAME, topic
-            )
+        span.set_attribute(
+            SpanAttributes.MESSAGING_DESTINATION_NAME, topic
+        )
 
         span.set_attribute(
             SpanAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, partition

instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/engine.py

@@ -300,9 +300,12 @@ def _get_attributes_from_cursor(vendor, cursor, attrs):
         is_unix_socket = info.host and info.host.startswith("/")
 
         if is_unix_socket:
+            attrs[
+                SpanAttributes.NET_TRANSPORT
+            ] = NetTransportValues.OTHER.value
             attrs[
                 SpanAttributes.NET_SOCK_FAMILY
-            ] = NetTransportValues.UNIX.value
+            ] = NetSockFamilyValues.UNIX.value
             if info.port:
                 # postgresql enforces this pattern on all socket names
                 attrs[SpanAttributes.NET_PEER_NAME] = os.path.join(
@@ -311,10 +314,7 @@ def _get_attributes_from_cursor(vendor, cursor, attrs):
         else:
             attrs[
                 SpanAttributes.NET_TRANSPORT
-            ] = NetTransportValues.OTHER.value
-            attrs[
-                SpanAttributes.NET_SOCK_FAMILY
-            ] = NetSockFamilyValues.UNIX.value
+            ] = NetTransportValues.TCP_IP.value
 
             attrs[SpanAttributes.NET_PEER_NAME] = info.host
             if info.port:

instrumentation/opentelemetry-instrumentation-tornado/tests/test_instrumentation.py

@@ -768,7 +768,7 @@ def test_custom_response_headers_not_added_in_internal_span(self):
             ),
         }
 
-        for s in spans:
-            if s.kind == trace.SpanKind.INTERNAL:
+        for span in spans:
+            if span.kind == trace.SpanKind.INTERNAL:
                 for key, _ in not_expected.items():
-                    self.assertNotIn(key, s.attributes)
+                    self.assertNotIn(key, span.attributes)

util/opentelemetry-util-http/src/opentelemetry/util/http/__init__.py

@@ -211,12 +211,11 @@ def parse_http_host(host_port) -> Tuple[str, str]:
 def get_http_protocol_version(protocol_and_version) -> str:
     if protocol_and_version == "HTTP/1.1":
         return "1.1"
-    elif protocol_and_version == "HTTP/1.0":
+    if protocol_and_version == "HTTP/1.0":
         return "1.0"
-    elif protocol_and_version == "HTTP/2":
+    if protocol_and_version == "HTTP/2":
         return "2"
-    else:
-        return None
+    return None
 
 
 def _parse_active_request_count_attrs(req_attrs):