fix tests

Author: vandonr

dd-java-agent/instrumentation/protobuf/src/test/groovy/com/datadog/instrumentation/protobuf/AbstractMessageInstrumentationTest.groovy

@@ -183,7 +183,7 @@ class AbstractMessageInstrumentationTest extends AgentTestRunner {
     runUnderTrace("parent_deserialize") {
       AgentSpan span = activeSpan()
       span.setTag(DDTags.MANUAL_KEEP, true)
-      MyMessage.parseFrom(bytes)
+      RecursiveMessage.parseFrom(bytes)
     }
     TEST_WRITER.waitForTraces(2)
     then:

dd-java-agent/instrumentation/protobuf/src/test/groovy/com/datadog/instrumentation/protobuf/DynamicMessageInstrumentationTest.groovy

@@ -22,8 +22,66 @@ class DynamicMessageInstrumentationTest extends AgentTestRunner {
       .setValue("Hello from Protobuf!")
       .build()
     when:
-    String expectedSchema = "{\"components\":{\"schemas\":{\"com.datadog.instrumentation.protobuf.generated.MyMessage\":{\"properties\":{\"id\":{\"extensions\":{\"x-protobuf-number\":\"1\"},\"type\":\"string\"},\"value\":{\"extensions\":{\"x-protobuf-number\":\"2\"},\"type\":\"string\"},\"other_message\":{\"extensions\":{\"x-protobuf-number\":\"3\"},\"items\":{\"\$ref\":\"#/components/schemas/com.datadog.instrumentation.protobuf.generated.OtherMessage\"},\"type\":\"array\"}},\"type\":\"object\"},\"com.datadog.instrumentation.protobuf.generated.OtherMessage\":{\"properties\":{\"name\":{\"extensions\":{\"x-protobuf-number\":\"1\"},\"type\":\"string\"},\"age\":{\"extensions\":{\"x-protobuf-number\":\"2\"},\"format\":\"int32\",\"type\":\"integer\"}},\"type\":\"object\"}}},\"openapi\":\"3.0.0\"}"
-    String expectedSchemaID = "4690647329509494987"
+    String expectedSchema = """{
+         "components":{
+            "schemas":{
+               "com.datadog.instrumentation.protobuf.generated.MyMessage":{
+                  "properties":{
+                     "id":{
+                        "extensions":{
+                           "x-protobuf-number":"1"
+                        },
+                        "type":"string"
+                     },
+                     "value":{
+                        "extensions":{
+                           "x-protobuf-number":"2"
+                        },
+                        "type":"string"
+                     },
+                     "other_message":{
+                        "extensions":{
+                           "x-protobuf-number":"3"
+                        },
+                        "items":{
+                           "\$ref":"#/components/schemas/com.datadog.instrumentation.protobuf.generated.OtherMessage"
+                        },
+                        "type":"array"
+                     },
+                     "nested":{
+                        "\$ref":"#/components/schemas/com.datadog.instrumentation.protobuf.generated.OtherMessage",
+                        "extensions":{
+                           "x-protobuf-number":"4"
+                        }
+                     }
+                  },
+                  "type":"object"
+               },
+               "com.datadog.instrumentation.protobuf.generated.OtherMessage":{
+                  "properties":{
+                     "name":{
+                        "extensions":{
+                           "x-protobuf-number":"1"
+                        },
+                        "type":"string"
+                     },
+                     "age":{
+                        "extensions":{
+                           "x-protobuf-number":"2"
+                        },
+                        "format":"int32",
+                        "type":"integer"
+                     }
+                  },
+                  "type":"object"
+               }
+            }
+         },
+         "openapi":"3.0.0"
+      }"""
+    expectedSchema = expectedSchema.replaceAll("[ \n]", "") // the spaces are just here to make it readable
+    String expectedSchemaID = "2792908287829424040"
+
     var bytes
     runUnderTrace("parent_serialize") {
       AgentSpan span = activeSpan()