Fixup: review of byte/cost calc for CT

Author: hmstepanek

newrelic/common/streaming_utils.py

@@ -30,20 +30,31 @@ def get_deep_size(obj, seen=None):
     """Recursively calculates the size of an object including nested lists and dicts."""
     if seen is None:
         seen = set()
+        size = -8*3  # Subtract 8 for each of the 3 attribute lists as those don't count.
+    else:
+        size = 0
 
     # Avoid recursion for already seen objects (handle circular references)
     obj_id = id(obj)
     if obj_id in seen:
         return 0
     seen.add(obj_id)
 
-    size = 0
-    if isinstance(obj, dict):
+    if isinstance(obj, str):
+        size += len(obj)
+        return size
+    elif isinstance(obj, float) or isinstance(obj, int):
+        size += 8
+        return size
+    elif isinstance(obj, bool):
+        size += 1
+        return size
+    elif isinstance(obj, dict):
         size += sum(get_deep_size(k, seen) + get_deep_size(v, seen) for k, v in obj.items())
     elif isinstance(obj, (list, tuple, set, frozenset)):
-        size += sum(get_deep_size(i, seen) for i in obj)
+        size += 8 + sum(get_deep_size(i, seen) for i in obj)
     else:
-        size = sys.getsizeof(obj)
+        size += 8
 
     return size
 
@@ -52,24 +63,26 @@ def get_deep_size_protobuf(obj):
     """Recursively calculates the size of an object including nested lists and dicts."""
     size = 0
     if hasattr(obj, "string_value"):
-        size += sys.getsizeof(obj.string_value)
+        size += len(obj.string_value)
         return size
     elif hasattr(obj, "double_value"):
-        size += sys.getsizeof(obj.double_value)
+        size += 8
         return size
     elif hasattr(obj, "int_value"):
-        size += sys.getsizeof(obj.int_value)
+        size += 8
         return size
     elif hasattr(obj, "bool_value"):
-        size += sys.getsizeof(obj.bool_value)
+        size += 1
         return size
 
     if hasattr(obj, "agent_attributes"):
-        size += sum(sys.getsizeof(k) + get_deep_size_protobuf(v) for k, v in obj.agent_attributes.items())
+        size += sum(len(k) + get_deep_size_protobuf(v) for k, v in obj.agent_attributes.items())
     if hasattr(obj, "user_attributes"):
-        size += sum(sys.getsizeof(k) + get_deep_size_protobuf(v) for k, v in obj.user_attributes.items())
+        size += sum(len(k) + get_deep_size_protobuf(v) for k, v in obj.user_attributes.items())
     if hasattr(obj, "intrinsics"):
-        size += sum(sys.getsizeof(k) + get_deep_size_protobuf(v) for k, v in obj.intrinsics.items())
+        size += sum(len(k) + get_deep_size_protobuf(v) for k, v in obj.intrinsics.items())
+    else:
+        size += 8
 
     return size