Fixup: adjust byte calc

Author: hmstepanek

newrelic/common/streaming_utils.py

@@ -37,19 +37,20 @@ def get_deep_size(obj, seen=None):
         return 0
     seen.add(obj_id)
 
-    size = sys.getsizeof(obj)
-
+    size = 0
     if 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)
+    else:
+        size = sys.getsizeof(obj)
 
     return size
 
 
 def get_deep_size_protobuf(obj):
     """Recursively calculates the size of an object including nested lists and dicts."""
-    size = sys.getsizeof(obj)
+    size = 0
     if hasattr(obj, "string_value"):
         size += sys.getsizeof(obj.string_value)
         return size
@@ -64,11 +65,11 @@ def get_deep_size_protobuf(obj):
         return size
 
     if hasattr(obj, "agent_attributes"):
-        size += sum(get_deep_size_protobuf(k) + get_deep_size_protobuf(v) for k, v in obj.agent_attributes.items())
+        size += sum(sys.getsizeof(k) + get_deep_size_protobuf(v) for k, v in obj.agent_attributes.items())
     if hasattr(obj, "user_attributes"):
-        size += sum(get_deep_size_protobuf(k) + get_deep_size_protobuf(v) for k, v in obj.user_attributes.items())
+        size += sum(sys.getsizeof(k) + get_deep_size_protobuf(v) for k, v in obj.user_attributes.items())
     if hasattr(obj, "intrinsics"):
-        size += sum(get_deep_size_protobuf(k) + get_deep_size_protobuf(v) for k, v in obj.intrinsics.items())
+        size += sum(sys.getsizeof(k) + get_deep_size_protobuf(v) for k, v in obj.intrinsics.items())
 
     return size