updater to full name

piochelepiotr · piochelepiotr · commit a2735d4bea41 · 2024-04-25T16:25:54.000-04:00
diff --git a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractMessageInstrumentation.java b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractMessageInstrumentation.java
@@ -42,7 +42,7 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      packageName + ".SchemaExtractor", packageName + ".Decorator",
+      packageName + ".SchemaExtractor",
     };
   }
 
diff --git a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractParserInstrumentation.java b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractParserInstrumentation.java
@@ -43,7 +43,7 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      packageName + ".SchemaExtractor", packageName + ".Decorator",
+      packageName + ".SchemaExtractor",
     };
   }
 
diff --git a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/DynamicMessageInstrumentation.java b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/DynamicMessageInstrumentation.java
@@ -32,7 +32,7 @@ public String instrumentedType() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      packageName + ".SchemaExtractor", packageName + ".Decorator",
+      packageName + ".SchemaExtractor",
     };
   }
 
diff --git a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/SchemaExtractor.java b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/SchemaExtractor.java
@@ -103,7 +103,7 @@ public static boolean extractProperty(
         description = "Group type";
         break;
       case TYPE_MESSAGE:
-        ref = "#/components/schemas/" + field.getMessageType().getName();
+        ref = "#/components/schemas/" + field.getMessageType().getFullName();
         // Recursively add nested message schemas
         if (!extractSchema(field.getMessageType(), builder, depth)) {
           return false;
@@ -147,11 +147,12 @@ public static boolean extractProperty(
 
   public static boolean extractSchema(Descriptor descriptor, SchemaBuilder builder, int depth) {
     depth++;
-    if (!builder.shouldExtractSchema(descriptor.getFullName(), depth)) {
+    String schemaName = descriptor.getFullName();
+    if (!builder.shouldExtractSchema(schemaName, depth)) {
       return false;
     }
     for (FieldDescriptor field : descriptor.getFields()) {
-      if (!extractProperty(field, descriptor.getName(), field.getName(), builder, depth)) {
+      if (!extractProperty(field, schemaName, field.getName(), builder, depth)) {
         return false;
       }
     }
@@ -183,7 +184,7 @@ public static void attachSchemaOnSpan(
     }
     AgentDataStreamsMonitoring dsm = AgentTracer.get().getDataStreamsMonitoring();
     span.setTag(DDTags.SCHEMA_TYPE, PROTOBUF);
-    span.setTag(DDTags.SCHEMA_NAME, descriptor.getName());
+    span.setTag(DDTags.SCHEMA_NAME, descriptor.getFullName());
     span.setTag(DDTags.SCHEMA_OPERATION, operation);
     // do a check against the schema sampler to avoid forcing the trace sampling decision too often.
     if (!dsm.canSampleSchema(operation)) {
diff --git a/dd-java-agent/instrumentation/protobuf/src/test/groovy/AbstractMessageInstrumentationTest.groovy b/dd-java-agent/instrumentation/protobuf/src/test/groovy/AbstractMessageInstrumentationTest.groovy
@@ -4,7 +4,7 @@ import datadog.trace.api.DDTags
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 
 import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
-import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
 
 class AbstractMessageInstrumentationTest extends AgentTestRunner {
   @Override
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/SchemaBuilder.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/SchemaBuilder.java
@@ -70,19 +70,15 @@ public boolean shouldExtractSchema(String schemaName, int depth) {
 
   public static class OpenApiSchema {
     public String openapi = "3.0.0";
-    public Components components;
-
-    public OpenApiSchema() {
-      this.components = new Components();
-    }
+    public final Components components = new Components();
 
     public static class Components {
-      public Map<String, Schema> schemas = new LinkedHashMap<>();
+      public final Map<String, Schema> schemas = new LinkedHashMap<>();
     }
 
     public static class Schema {
       public String type = "object";
-      public Map<String, Property> properties = new LinkedHashMap<>();
+      public final Map<String, Property> properties = new LinkedHashMap<>();
     }
 
     public static class Property {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {`
`42`	`42`	`@Override`
`43`	`43`	`public String[] helperClassNames() {`
`44`	`44`	`return new String[] {`
`45`		`- packageName + ".SchemaExtractor", packageName + ".Decorator",`
	`45`	`+ packageName + ".SchemaExtractor",`
`46`	`46`	`};`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {`
`43`	`43`	`@Override`
`44`	`44`	`public String[] helperClassNames() {`
`45`	`45`	`return new String[] {`
`46`		`- packageName + ".SchemaExtractor", packageName + ".Decorator",`
	`46`	`+ packageName + ".SchemaExtractor",`
`47`	`47`	`};`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public String instrumentedType() {`
`32`	`32`	`@Override`
`33`	`33`	`public String[] helperClassNames() {`
`34`	`34`	`return new String[] {`
`35`		`- packageName + ".SchemaExtractor", packageName + ".Decorator",`
	`35`	`+ packageName + ".SchemaExtractor",`
`36`	`36`	`};`
`37`	`37`	`}`
`38`	`38`