chore(ci): fix mspack core tests (#15593)

## Description

Following #15551 some core
tests needed to be updated.
This PR fixes this.

Also revert the revert on 15551

APPSEC-60180

Author: christophe-papazian

ddtrace/internal/_encoding.pyx

@@ -1257,7 +1257,8 @@ cdef class Packer(object):
                         default_used = True
                         continue
                     else:
-                        raise OverflowError("Integer value out of range")
+                        o = "Integer value out of range"
+                        continue
             elif PyFloat_CheckExact(o):
                 dval = o
                 ret = msgpack_pack_double(&self.pk, dval)
@@ -1273,12 +1274,14 @@ cdef class Packer(object):
                 if self.encoding == NULL:
                     ret = msgpack_pack_unicode(&self.pk, o, ITEM_LIMIT)
                     if ret == -2:
-                        raise ValueError("unicode string is too large")
+                        o = f"Unicode string is too large {L}"
+                        continue
                 else:
                     o = PyUnicode_AsEncodedString(o, self.encoding, self.unicode_errors)
                     L = len(o)
                     if L > ITEM_LIMIT:
-                        raise ValueError("unicode string is too large")
+                        o = f"Unicode string is too large {L}"
+                        continue
                     ret = msgpack_pack_raw(&self.pk, L)
                     if ret == 0:
                         rawval = o
@@ -1287,7 +1290,8 @@ cdef class Packer(object):
                 d = <dict>o
                 L = len(d)
                 if L > ITEM_LIMIT:
-                    raise ValueError("dict is too large")
+                    o = f"Dictionnary is too large {L}"
+                    continue
                 ret = msgpack_pack_map(&self.pk, L)
                 if ret == 0:
                     for k, v in d.items():
@@ -1300,7 +1304,8 @@ cdef class Packer(object):
             elif PyList_CheckExact(o):
                 L = Py_SIZE(o)
                 if L > ITEM_LIMIT:
-                    raise ValueError("list is too large")
+                    o = f"List is too large {L}"
+                    continue
                 ret = msgpack_pack_array(&self.pk, L)
                 if ret == 0:
                     for v in o:
@@ -1313,7 +1318,8 @@ cdef class Packer(object):
                 else:
                     ret = msgpack_pack_false(&self.pk)
             else:
-                PyErr_Format(TypeError, b"can not serialize '%.200s' object", Py_TYPE(o).tp_name)
+                o = f"Can not serialize [{type(o).__name__}] object"
+                continue
             return ret
 
     cpdef pack(self, object obj):

tests/tracer/test_encoders.py

@@ -231,9 +231,29 @@ def test_encode_traces_json_v2(self):
 
 def test_encode_meta_struct():
     # test encoding for MsgPack format
-    encoder = MSGPACK_ENCODERS["v0.4"](2 << 10, 2 << 10)
+    # Add error case with recovery
+    encoder = MSGPACK_ENCODERS["v0.4"](1 << 11, 1 << 11)
     super_span = Span(name="client.testing", trace_id=1)
-    payload = {"tttt": {"iuopç": [{"abcd": 1, "bcde": True}, {}]}, "zzzz": b"\x93\x01\x02\x03", "ZZZZ": [1, 2, 3]}
+
+    class T:
+        pass
+
+    payload = {
+        "tttt": {"iuopç": [{"abcd": 1, "bcde": True}, {}]},
+        "zzzz": b"\x93\x01\x02\x03",
+        "ZZZZ": [1, 2, 3],
+        "error_object": object(),
+        "error_integer": 1 << 129,
+        "list": [{}, {"x": "a"}, {"error_custom": T()}],
+    }
+    payload_expected = {
+        "tttt": {"iuopç": [{"abcd": 1, "bcde": True}, {}]},
+        "zzzz": b"\x93\x01\x02\x03",
+        "ZZZZ": [1, 2, 3],
+        "error_object": "Can not serialize [object] object",
+        "error_integer": "Integer value out of range",
+        "list": [{}, {"x": "a"}, {"error_custom": "Can not serialize [T] object"}],
+    }
 
     super_span._set_struct_tag("payload", payload)
     super_span.set_tag("payload", "meta_payload")
@@ -254,7 +274,7 @@ def test_encode_meta_struct():
     assert items[0][0][b"trace_id"] == items[0][1][b"trace_id"]
     for j in range(2):
         assert b"client.testing" == items[0][j][b"name"]
-    assert msgpack.unpackb(items[0][0][b"meta_struct"][b"payload"]) == payload
+    assert msgpack.unpackb(items[0][0][b"meta_struct"][b"payload"]) == payload_expected
 
 
 def decode(obj, reconstruct=True):

tests/vendor/msgpack/test_except.py

@@ -18,8 +18,7 @@ class DummyException(Exception):
 
 
 def test_raise_on_find_unsupported_value():
-    with raises(TypeError):
-        packb(datetime.datetime.now())
+    assert unpackb(packb(datetime.datetime.now())) == "Can not serialize [datetime] object"
 
 
 def test_raise_from_object_hook():

tests/vendor/msgpack/test_limits.py

@@ -6,7 +6,6 @@
 from __future__ import unicode_literals
 
 from msgpack import Packer
-from msgpack import PackOverflowError
 from msgpack import PackValueError
 from msgpack import Unpacker
 from msgpack import UnpackValueError
@@ -19,13 +18,11 @@
 def test_integer():
     x = -(2**63)
     assert unpackb(packb(x)) == x
-    with pytest.raises(PackOverflowError):
-        packb(x - 1)
+    assert unpackb(packb(x - 1)) == "Integer value out of range"
 
     x = 2**64 - 1
     assert unpackb(packb(x)) == x
-    with pytest.raises(PackOverflowError):
-        packb(x + 1)
+    assert unpackb(packb(x + 1)) == "Integer value out of range"
 
 
 def test_array_header():

tests/vendor/msgpack/test_subtype.py

@@ -3,7 +3,7 @@
 
 from collections import namedtuple
 
-import pytest
+from msgpack import unpackb
 
 from ddtrace.internal._encoding import packb
 
@@ -24,9 +24,6 @@ class MyTuple(tuple):
 
 
 def test_types():
-    with pytest.raises(TypeError):
-        assert packb(MyDict()) == packb(dict())
-    with pytest.raises(TypeError):
-        assert packb(MyList()) == packb(list())
-    with pytest.raises(TypeError):
-        assert packb(MyNamedTuple(1, 2)) == packb((1, 2))
+    assert unpackb(packb(MyDict())) == "Can not serialize [MyDict] object"
+    assert unpackb(packb(MyList())) == "Can not serialize [MyList] object"
+    assert unpackb(packb(MyNamedTuple(1, 2))) == "Can not serialize [MyNamedTuple] object"