Skip to content

perf(core): [SDK Overhead Reduction 8] Reduce context serialization allocations #5599

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
adinauer merged 5 commits into from
Jun 25, 2026
Merged

perf(core): [SDK Overhead Reduction 8] Reduce context serialization allocations #5599

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b13f34
perf(core): Reduce context serialization allocations
adinauer Jun 23, 2026
200bec9
fix(core): Avoid KeySetView in context serialization
adinauer Jun 24, 2026
e3e0df8
docs(core): Add contexts changelog entry
adinauer Jun 24, 2026
7e885d1
Merge remote-tracking branch 'origin/perf/sdk-overhead-reduction' int…
adinauer Jun 25, 2026
507d84e
Merge branch 'perf/sdk-overhead-reduction' into perf/sdk-overhead-red…
adinauer Jun 25, 2026
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
8 changes: 4 additions & 4 deletions sentry/src/main/java/io/sentry/MonitorContexts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
import io.sentry.util.Objects;
import io.sentry.vendor.gson.stream.JsonToken;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.ConcurrentHashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public final class MonitorContexts extends ConcurrentHashMap<String, Object>
implements JsonSerializable {
private static final long serialVersionUID = 3987329379811822556L;
private static final String[] EMPTY_KEYS = new String[0];

public MonitorContexts() {}

Expand Down Expand Up @@ -49,8 +49,8 @@ public void serialize(final @NotNull ObjectWriter writer, final @NotNull ILogger
throws IOException {
writer.beginObject();
// Serialize in alphabetical order to keep determinism.
final List<String> sortedKeys = Collections.list(keys());
Collections.sort(sortedKeys);
final String[] sortedKeys = keySet().toArray(EMPTY_KEYS);
Arrays.sort(sortedKeys);
for (final String key : sortedKeys) {
final Object value = get(key);
if (value != null) {
Expand Down
8 changes: 4 additions & 4 deletions sentry/src/main/java/io/sentry/protocol/Contexts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
import io.sentry.util.Objects;
import io.sentry.vendor.gson.stream.JsonToken;
import java.io.IOException;
import java.util.Collections;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
Expand All @@ -28,6 +27,7 @@
public class Contexts implements JsonSerializable {
private static final long serialVersionUID = 252445813254943011L;
public static final String REPLAY_ID = "replay_id";
private static final String[] EMPTY_KEYS = new String[0];

private final @NotNull ConcurrentHashMap<String, Object> internalStorage =
new ConcurrentHashMap<>();
Expand Down Expand Up @@ -302,8 +302,8 @@ public void serialize(final @NotNull ObjectWriter writer, final @NotNull ILogger
throws IOException {
writer.beginObject();
// Serialize in alphabetical order to keep determinism.
final List<String> sortedKeys = Collections.list(keys());
Collections.sort(sortedKeys);
final String[] sortedKeys = internalStorage.keySet().toArray(EMPTY_KEYS);
Arrays.sort(sortedKeys);
for (final String key : sortedKeys) {
final Object value = get(key);
if (value != null) {
Expand Down
19 changes: 19 additions & 0 deletions sentry/src/test/java/io/sentry/MonitorContextsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package io.sentry

import io.sentry.protocol.SerializationUtils
import kotlin.test.Test
import kotlin.test.assertEquals
import org.mockito.kotlin.mock

class MonitorContextsTest {
@Test
fun `serializes entries in alphabetical order`() {
val contexts =
MonitorContexts().apply {
put("b", 2)
put("a", 1)
}

assertEquals("{\"a\":1,\"b\":2}", SerializationUtils.serializeToString(contexts, mock()))
}
}
Loading