Fix Type Constructor Classes in Code Level Metrics (#708)

* Fix CLM exception catching

* Reorganize CLM Tests

* Add type constructor tests to CLM

* Fix line number

* Pin tox version

* Fix lambda tests in CLM

* Fix lint issues

* Turn helper func into pytest fixture

Co-authored-by: Hannah Stepanek <[email protected]>

Author: TimPansino

.github/actions/setup-python-matrix/action.yml

@@ -47,4 +47,4 @@ runs:
       shell: bash
       run: |
         python3.10 -m pip install -U pip
-        python3.10 -m pip install -U wheel setuptools tox virtualenv!=20.0.24
+        python3.10 -m pip install -U wheel setuptools 'tox<4' virtualenv!=20.0.24

newrelic/core/code_level_metrics.py

@@ -89,7 +89,7 @@ def extract_code_from_callable(func):
             # Use inspect to get file and line number
             file_path = inspect.getsourcefile(func)
             line_number = inspect.getsourcelines(func)[1]
-        except TypeError:
+        except Exception:
             pass
 
     # Split function path to extract class name

tests/agent_features/_test_code_level_metrics.py

@@ -13,11 +13,12 @@
 # limitations under the License.
 import functools
 
+
 def exercise_function():
     return
 
 
-class ExerciseClass():
+class ExerciseClass(object):
     def exercise_method(self):
         return
 
@@ -30,12 +31,46 @@ def exercise_class_method(cls):
         return
 
 
-class ExerciseClassCallable():
+class ExerciseClassCallable(object):
     def __call__(self):
         return
 
+
+def exercise_method(self):
+    return
+
+
+@staticmethod
+def exercise_static_method():
+    return
+
+
+@classmethod
+def exercise_class_method(cls):
+    return
+
+
+def __call__(self):
+    return
+
+
+type_dict = {
+    "exercise_method": exercise_method,
+    "exercise_static_method": exercise_static_method,
+    "exercise_class_method": exercise_class_method,
+    "exercise_lambda": lambda: None,
+}
+callable_type_dict = type_dict.copy()
+callable_type_dict["__call__"] = __call__
+
+ExerciseTypeConstructor = type("ExerciseTypeConstructor", (object,), type_dict)
+ExerciseTypeConstructorCallable = type("ExerciseTypeConstructorCallable", (object,), callable_type_dict)
+
+
 CLASS_INSTANCE = ExerciseClass()
 CLASS_INSTANCE_CALLABLE = ExerciseClassCallable()
+TYPE_CONSTRUCTOR_CLASS_INSTANCE = ExerciseTypeConstructor()
+TYPE_CONSTRUCTOR_CALLABLE_CLASS_INSTANCE = ExerciseTypeConstructorCallable()
 
-exercise_lambda = lambda: None
+exercise_lambda = lambda: None  # noqa: E731
 exercise_partial = functools.partial(exercise_function)