Skip to content

Fix SymDB upload size check #8887

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
merged 1 commit into from
May 27, 2025
Merged

Fix SymDB upload size check #8887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
86 changes: 30 additions & 56 deletions dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SymbolSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,37 @@ public void flush() {
String json =
SERVICE_VERSION_ADAPTER.toJson(
new ServiceVersion(serviceName, env, version, "JAVA", scopesToSerialize));
if (json.length() > maxPayloadSize) {
LOGGER.debug(
"Upload split is required for {} scopes: {}/{}",
scopesToSerialize.size(),
json.length(),
maxPayloadSize);
splitAndSend(scopesToSerialize);
updateStats(scopesToSerialize, json);
doUpload(scopesToSerialize, json);
}

private void doUpload(List<Scope> scopesToSerialize, String json) {
byte[] jsonBytes = json.getBytes(StandardCharsets.UTF_8);
byte[] payload = null;
if (isCompressed) {
payload = compressPayload(jsonBytes);
}
if (payload == null) {
if (json.length() > maxPayloadSize) {
LOGGER.warn("Payload is too big: {}/{}", json.length(), maxPayloadSize);
splitAndSend(scopesToSerialize);
return;
}
symbolUploader.uploadAsMultipart(
"",
event,
new BatchUploader.MultiPartContent(jsonBytes, "file", "file.json", APPLICATION_JSON));
} else {
LOGGER.debug("Sending {} jar scopes size={}", scopesToSerialize.size(), json.length());
doUpload(scopesToSerialize, json);
if (payload.length > maxPayloadSize) {
LOGGER.warn("Compressed payload is too big: {}/{}", payload.length, maxPayloadSize);
splitAndSend(scopesToSerialize);
return;
}
LOGGER.debug("Sending {} jar scopes size={}", scopesToSerialize.size(), payload.length);
symbolUploader.uploadAsMultipart(
"",
event,
new BatchUploader.MultiPartContent(payload, "file", "file.gz", APPLICATION_GZIP));
}
}

Expand Down Expand Up @@ -146,16 +167,6 @@ private void splitAndSend(List<Scope> scopesToSerialize) {
SERVICE_VERSION_ADAPTER.toJson(
new ServiceVersion(
serviceName, env, version, "JAVA", Collections.singletonList(scope)));
if (json.length() > maxPayloadSize) {
// this jar scope is still too big, split it by classes
LOGGER.debug(
"Upload split is required for jar scope {}: {}/{}",
scope.getName(),
json.length(),
maxPayloadSize);
splitAndSend(Collections.singletonList(scope));
continue;
}
LOGGER.debug("Sending {} jar scope size={}", scope.getName(), json.length());
doUpload(Collections.singletonList(scope), json);
}
Expand All @@ -168,22 +179,10 @@ private void splitAndSend(List<Scope> scopesToSerialize) {
String jsonFirstHalf =
SERVICE_VERSION_ADAPTER.toJson(
new ServiceVersion(serviceName, env, version, "JAVA", firstHalf));
if (jsonFirstHalf.length() > maxPayloadSize) {
LOGGER.warn(
"Cannot split jar scope list in 2, first half is too big: {}",
jsonFirstHalf.length());
return;
}
doUpload(firstHalf, jsonFirstHalf);
String jsonSecondHalf =
SERVICE_VERSION_ADAPTER.toJson(
new ServiceVersion(serviceName, env, version, "JAVA", secondHalf));
if (jsonSecondHalf.length() > maxPayloadSize) {
LOGGER.warn(
"Cannot split jar scope list in 2, second half is too big: {}",
jsonSecondHalf.length());
return;
}
doUpload(secondHalf, jsonSecondHalf);
}
} else {
Expand Down Expand Up @@ -213,31 +212,6 @@ private void splitAndSend(List<Scope> scopesToSerialize) {
}
}

private void doUpload(List<Scope> scopes, String json) {
updateStats(scopes, json);
byte[] jsonBytes = json.getBytes(StandardCharsets.UTF_8);
byte[] payload = null;
if (isCompressed) {
payload = compressPayload(jsonBytes);
}
if (payload == null) {
if (jsonBytes.length > maxPayloadSize) {
LOGGER.warn("Compressed payload is too big: {}/{}", payload.length, maxPayloadSize);
splitAndSend(scopes);
return;
}
symbolUploader.uploadAsMultipart(
"",
event,
new BatchUploader.MultiPartContent(jsonBytes, "file", "file.json", APPLICATION_JSON));
} else {
symbolUploader.uploadAsMultipart(
"",
event,
new BatchUploader.MultiPartContent(payload, "file", "file.gz", APPLICATION_GZIP));
}
}

private static Scope createJarScope(String jarName, List<Scope> classScopes) {
return Scope.builder(ScopeType.JAR, jarName, 0, 0).name(jarName).scopes(classScopes).build();
}
Expand Down
Loading