Skip to content

feat: fix support of transitive dependencies in conversion of protobuf messages to json #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thugrock7 merged 3 commits into from
Apr 30, 2025
Merged

feat: fix support of transitive dependencies in conversion of protobuf messages to json #419

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45de24d
recursive handling of dependencies
thugrock7 Apr 22, 2025
bcf0b52
removing unnecessary lines
thugrock7 Apr 22, 2025
c9edce3
Merge remote-tracking branch 'origin/main' into yash-grpc-test
thugrock7 Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
recursive handling of dependencies
  • Loading branch information
@thugrock7
thugrock7 committed Apr 22, 2025
commit 45de24d29197ea0eabf7bba4f0d0fe9d6441a187
2 changes: 1 addition & 1 deletion ...va/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/GrpcSpanDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static void addMessageAttribute(Object message, Span span, AttributeKey<S
String jsonOutput = ProtobufMessageConverter.getMessage(mb);
span.setAttribute(key, jsonOutput);
} catch (Exception e) {
log.error("Failed to decode message as JSON", e);
log.debug("Failed to decode message as JSON", e);
}
} else {
log.debug("message is not an instance of com.google.protobuf.Message");
Expand Down
75 changes: 63 additions & 12 deletions ...pentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/ProtobufMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@
import io.opentelemetry.javaagent.instrumentation.hypertrace.com.google.protobuf.util.JsonFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/** Utility class to convert protobuf messages to JSON. */
public class ProtobufMessageConverter {
private static final Logger log = LoggerFactory.getLogger(ProtobufMessageConverter.class);
private static final Map<String, FileDescriptor> fileDescriptorCache = new HashMap<>();
Expand Down Expand Up @@ -75,25 +78,73 @@ private static Descriptor getRelocatedDescriptor(Descriptors.Descriptor original
String fileKey = unrelocatedFileDescriptor.getName();
if (fileDescriptorCache.containsKey(fileKey)) {
FileDescriptor relocatedFileDescriptor = fileDescriptorCache.get(fileKey);
return relocatedFileDescriptor.findMessageTypeByName(originalDescriptor.getName());

// Check if the message type exists in the relocated descriptor
Descriptor messageType =
relocatedFileDescriptor.findMessageTypeByName(originalDescriptor.getName());
if (messageType == null) {
log.debug("Message type not found in cached descriptor: {}", originalDescriptor.getName());
}

return messageType;
}

// Process all dependencies recursively, including transitive ones
FileDescriptor fileDescriptor =
processFileDescriptorWithDependencies(unrelocatedFileDescriptor, new HashSet<>());

// Find the message type in the relocated descriptor
Descriptor result = fileDescriptor.findMessageTypeByName(originalDescriptor.getName());
if (result == null) {
log.debug("Message type not found in new descriptor: {}", originalDescriptor.getName());
}

// Process all dependencies first
return result;
}

/**
* Process a file descriptor and all its dependencies recursively.
*
* @param unrelocatedFileDescriptor The file descriptor to process
* @param processedFiles Set of file names that have already been processed to avoid circular
* dependencies
* @return The relocated file descriptor
*/
private static FileDescriptor processFileDescriptorWithDependencies(
Descriptors.FileDescriptor unrelocatedFileDescriptor, Set<String> processedFiles)
throws Exception {
String fileKey = unrelocatedFileDescriptor.getName();

// Check if we've already processed this file
if (fileDescriptorCache.containsKey(fileKey)) {
return fileDescriptorCache.get(fileKey);
}

// Mark this file as processed to avoid circular dependencies
processedFiles.add(fileKey);

List<FileDescriptor> dependencies = new ArrayList<>();

// Process all direct dependencies first
for (Descriptors.FileDescriptor dependency : unrelocatedFileDescriptor.getDependencies()) {
String depKey = dependency.getName();
if (!fileDescriptorCache.containsKey(depKey)) {
// Convert the dependency file descriptor
com.google.protobuf.DescriptorProtos.FileDescriptorProto depProto = dependency.toProto();
byte[] depBytes = depProto.toByteArray();
FileDescriptorProto relocatedDepProto = FileDescriptorProto.parseFrom(depBytes);

// Build with empty dependencies first (we'll fill them in later)
// Skip if we've already processed this dependency in this call chain
if (processedFiles.contains(depKey)) {
if (fileDescriptorCache.containsKey(depKey)) {
dependencies.add(fileDescriptorCache.get(depKey));
}
continue;
}

if (!fileDescriptorCache.containsKey(depKey)) {
// Process this dependency recursively
FileDescriptor relocatedDep =
FileDescriptor.buildFrom(relocatedDepProto, new FileDescriptor[] {});
fileDescriptorCache.put(depKey, relocatedDep);
processFileDescriptorWithDependencies(dependency, processedFiles);
dependencies.add(relocatedDep);
} else {
dependencies.add(fileDescriptorCache.get(depKey));
}
dependencies.add(fileDescriptorCache.get(depKey));
}

// Now build the current file descriptor with its dependencies
Expand All @@ -106,7 +157,7 @@ private static Descriptor getRelocatedDescriptor(Descriptors.Descriptor original
FileDescriptor.buildFrom(relocatedFileProto, dependencies.toArray(new FileDescriptor[0]));
fileDescriptorCache.put(fileKey, relocatedFileDescriptor);

return relocatedFileDescriptor.findMessageTypeByName(originalDescriptor.getName());
return relocatedFileDescriptor;
}

/**
Expand Down