update tests

Author: alexander-alderman-webb

tests/integrations/sqlalchemy/test_sqlalchemy.py

@@ -485,8 +485,9 @@ class Person(Base):
                 attributes = span["attributes"]
 
                 assert SPANDATA.CODE_LINE_NUMBER not in attributes
+                assert SPANDATA.CODE_NAMESPACE not in attributes
                 assert SPANDATA.CODE_FILE_PATH not in attributes
-                assert SPANDATA.CODE_FUNCTION_NAME not in attributes
+                assert SPANDATA.CODE_FUNCTION not in attributes
                 break
         else:
             raise AssertionError("No db span found")
@@ -586,8 +587,9 @@ class Person(Base):
                 attributes = span["attributes"]
 
                 assert SPANDATA.CODE_LINE_NUMBER in attributes
+                assert SPANDATA.CODE_NAMESPACE in attributes
                 assert SPANDATA.CODE_FILE_PATH in attributes
-                assert SPANDATA.CODE_FUNCTION_NAME in attributes
+                assert SPANDATA.CODE_FUNCTION in attributes
                 break
         else:
             raise AssertionError("No db span found")
@@ -679,21 +681,24 @@ class Person(Base):
                 attributes = span["attributes"]
 
                 assert SPANDATA.CODE_LINE_NUMBER in attributes
+                assert SPANDATA.CODE_NAMESPACE in attributes
                 assert SPANDATA.CODE_FILE_PATH in attributes
-                assert SPANDATA.CODE_FUNCTION_NAME in attributes
+                assert SPANDATA.CODE_FUNCTION in attributes
 
                 assert type(attributes.get(SPANDATA.CODE_LINE_NUMBER)) == int
                 assert attributes.get(SPANDATA.CODE_LINE_NUMBER) > 0
+                assert (
+                    attributes.get(SPANDATA.CODE_NAMESPACE)
+                    == "tests.integrations.sqlalchemy.test_sqlalchemy"
+                )
                 assert attributes.get(SPANDATA.CODE_FILE_PATH).endswith(
                     "tests/integrations/sqlalchemy/test_sqlalchemy.py"
                 )
 
                 is_relative_path = attributes.get(SPANDATA.CODE_FILE_PATH)[0] != os.sep
                 assert is_relative_path
 
-                assert (
-                    attributes.get(SPANDATA.CODE_FUNCTION_NAME) == "test_query_source"
-                )
+                assert attributes.get(SPANDATA.CODE_FUNCTION) == "test_query_source"
                 break
         else:
             raise AssertionError("No db span found")
@@ -809,8 +814,9 @@ class Person(Base):
                 attributes = span["attributes"]
 
                 assert SPANDATA.CODE_LINE_NUMBER in attributes
+                assert SPANDATA.CODE_NAMESPACE in attributes
                 assert SPANDATA.CODE_FILE_PATH in attributes
-                assert SPANDATA.CODE_FUNCTION_NAME in attributes
+                assert SPANDATA.CODE_FUNCTION in attributes
 
                 assert type(attributes.get(SPANDATA.CODE_LINE_NUMBER)) == int
                 assert attributes.get(SPANDATA.CODE_LINE_NUMBER) > 0
@@ -823,7 +829,7 @@ class Person(Base):
                 assert is_relative_path
 
                 assert (
-                    attributes.get(SPANDATA.CODE_FUNCTION_NAME)
+                    attributes.get(SPANDATA.CODE_FUNCTION)
                     == "query_first_model_from_session"
                 )
                 break
@@ -955,8 +961,9 @@ def __exit__(self, type, value, traceback):
                 attributes = span["attributes"]
 
                 assert SPANDATA.CODE_LINE_NUMBER not in attributes
+                assert SPANDATA.CODE_NAMESPACE not in attributes
                 assert SPANDATA.CODE_FILE_PATH not in attributes
-                assert SPANDATA.CODE_FUNCTION_NAME not in attributes
+                assert SPANDATA.CODE_FUNCTION not in attributes
                 break
         else:
             raise AssertionError("No db span found")
@@ -1094,8 +1101,9 @@ def __exit__(self, type, value, traceback):
                 attributes = span["attributes"]
 
                 assert SPANDATA.CODE_LINE_NUMBER in attributes
+                assert SPANDATA.CODE_NAMESPACE in attributes
                 assert SPANDATA.CODE_FILE_PATH in attributes
-                assert SPANDATA.CODE_FUNCTION_NAME in attributes
+                assert SPANDATA.CODE_FUNCTION in attributes
 
                 assert type(attributes.get(SPANDATA.CODE_LINE_NUMBER)) == int
                 assert attributes.get(SPANDATA.CODE_LINE_NUMBER) > 0
@@ -1107,7 +1115,7 @@ def __exit__(self, type, value, traceback):
                 assert is_relative_path
 
                 assert (
-                    attributes.get(SPANDATA.CODE_FUNCTION_NAME)
+                    attributes.get(SPANDATA.CODE_FUNCTION)
                     == "test_query_source_if_duration_over_threshold"
                 )
                 break