Skip to content

Commit a80d13e

Browse files
remove dependency on abstract message in schema extractor (#7260)
1 parent 3f89f03 commit a80d13e

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractMessageInstrumentation.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ public static void onEnter(@Advice.This AbstractMessage message) {
6363
if (callDepth > 0) {
6464
return;
6565
}
66-
SchemaExtractor.attachSchemaOnSpan(message, activeSpan(), SchemaExtractor.serialization);
66+
if (message == null) {
67+
return;
68+
}
69+
SchemaExtractor.attachSchemaOnSpan(
70+
message.getDescriptorForType(), activeSpan(), SchemaExtractor.serialization);
6771
}
6872

6973
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractParserInstrumentation.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ public static void stopSpan(
8080
}
8181
if (message instanceof AbstractMessage) {
8282
SchemaExtractor.attachSchemaOnSpan(
83-
(AbstractMessage) message, span, SchemaExtractor.deserialization);
83+
((AbstractMessage) message).getDescriptorForType(),
84+
span,
85+
SchemaExtractor.deserialization);
8486
}
8587
}
8688
}

dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/SchemaExtractor.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package datadog.trace.instrumentation.protobuf_java;
22

3-
import com.google.protobuf.AbstractMessage;
43
import com.google.protobuf.Descriptors;
54
import com.google.protobuf.Descriptors.Descriptor;
65
import com.google.protobuf.Descriptors.FieldDescriptor;
@@ -170,13 +169,6 @@ public void iterateOverSchema(SchemaBuilder builder) {
170169
extractSchema(descriptor, builder, 0);
171170
}
172171

173-
public static void attachSchemaOnSpan(AbstractMessage message, AgentSpan span, String operation) {
174-
if (message == null) {
175-
return;
176-
}
177-
attachSchemaOnSpan(message.getDescriptorForType(), span, operation);
178-
}
179-
180172
public static void attachSchemaOnSpan(
181173
Descriptors.Descriptor descriptor, AgentSpan span, String operation) {
182174
if (descriptor == null || span == null) {

0 commit comments

Comments
 (0)