Skip to content

chore: easing restriction max size of custom attributes #105

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 2 commits into from
Jan 17, 2025
Merged

chore: easing restriction max size of custom attributes #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
680a388
chore: easing restriction max size of custom attributes
satsukies Jan 16, 2025
adf5d09
fix: overwrite with different value
satsukies Jan 17, 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
2 changes: 1 addition & 1 deletion sdk/src/main/java/com/deploygate/sdk/CustomAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public final class CustomAttributes {

private static final String TAG = "CustomAttributes";

private static final int MAX_ATTRIBUTES_SIZE = 8;
private static final int MAX_ATTRIBUTES_SIZE = 64;
private static final Pattern VALID_KEY_PATTERN = Pattern.compile("^[a-z][_a-z0-9]{2,31}$");
private static final int MAX_VALUE_LENGTH = 64;

Expand Down
76 changes: 29 additions & 47 deletions sdk/src/test/java/com/deploygate/sdk/CustomAttributesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void put__accept_when_valid_value() {
Truth.assertThat(attributes.putBoolean("valid_boolean", true)).isTrue();

String tooLongString = "this is too long string value. we cannot accept value if size over 64.";
Truth.assertThat(attributes.putString("invalid_too_long_string", "this is too long string value. we cannot accept value if size over 64.")).isFalse();
Truth.assertThat(attributes.putString("invalid_too_long_string", tooLongString)).isFalse();
}

@Test
Expand All @@ -70,20 +70,16 @@ public void size() {
attributes.putString("key1", "overwrite1");
Truth.assertThat(attributes.size()).isEqualTo(1);

attributes.putString("key2", "value2");
attributes.putString("key3", "value3");
attributes.putString("key4", "value4");
attributes.putString("key5", "value5");
attributes.putString("key6", "value6");
attributes.putString("key7", "value7");
attributes.putString("key8", "value8");
Truth.assertThat(attributes.size()).isEqualTo(8);
for (int i = 2; i <= 64; i++) {
attributes.putString("key" + i, "value" + i);
}
Truth.assertThat(attributes.size()).isEqualTo(64);

attributes.putString("key9", "value9");
Truth.assertThat(attributes.size()).isEqualTo(8);
attributes.putString("key65", "value65");
Truth.assertThat(attributes.size()).isEqualTo(64);

attributes.remove("key1");
Truth.assertThat(attributes.size()).isEqualTo(7);
Truth.assertThat(attributes.size()).isEqualTo(63);

attributes.removeAll();
Truth.assertThat(attributes.size()).isEqualTo(0);
Expand Down Expand Up @@ -131,53 +127,43 @@ public void toJSONString() {

@Test
public void not_exceed_max_size() {
Truth.assertThat(attributes.putString("key1", "value1")).isTrue();
Truth.assertThat(attributes.putString("key2", "value2")).isTrue();
Truth.assertThat(attributes.putString("key3", "value3")).isTrue();
Truth.assertThat(attributes.putString("key4", "value4")).isTrue();
Truth.assertThat(attributes.putString("key5", "value5")).isTrue();
Truth.assertThat(attributes.putString("key6", "value6")).isTrue();
Truth.assertThat(attributes.putString("key7", "value7")).isTrue();
Truth.assertThat(attributes.putString("key8", "value8")).isTrue();
for (int i = 1; i <= 64; i++) {
Truth.assertThat(attributes.putString("key" + i, "value" + i)).isTrue();
}

// allow to overwrite
Truth.assertThat(attributes.putString("key1", "overwrite1_1")).isTrue();
// not allow to put value with new key because of max size
Truth.assertThat(attributes.putString("key9", "value9")).isFalse();
Truth.assertThat(attributes.putString("key65", "value65")).isFalse();

attributes.remove("key8");
attributes.remove("key64");

// allow to put value with new key after remove exists key
Truth.assertThat(attributes.putString("key9", "value9")).isTrue();
Truth.assertThat(attributes.putString("key65", "value65")).isTrue();
// allow to overwrite
Truth.assertThat(attributes.putString("key1", "overwrite1_2")).isTrue();
// not allow to put value with new key because of max size
Truth.assertThat(attributes.putString("key10", "value10")).isFalse();
Truth.assertThat(attributes.putString("key66", "value66")).isFalse();

attributes.removeAll();

// allow to put value less than max size
Truth.assertThat(attributes.putString("key1", "another_value1")).isTrue();
Truth.assertThat(attributes.putString("key2", "another_value2")).isTrue();
Truth.assertThat(attributes.putString("key3", "another_value3")).isTrue();
Truth.assertThat(attributes.putString("key4", "another_value4")).isTrue();
Truth.assertThat(attributes.putString("key5", "another_value5")).isTrue();
Truth.assertThat(attributes.putString("key6", "another_value6")).isTrue();
Truth.assertThat(attributes.putString("key7", "another_value7")).isTrue();
Truth.assertThat(attributes.putString("key8", "another_value8")).isTrue();
Truth.assertThat(attributes.putString("key9", "another_value9")).isFalse();
for (int i = 1; i <= 64; i++) {
Truth.assertThat(attributes.putString("key" + i, "another_value" + i)).isTrue();
}
Truth.assertThat(attributes.putString("key65", "another_value65")).isFalse();
}

@Test()
public void not_exceed_max_size_multi_thread() {
// prepare attributes with max size
for (int i = 0; i < 8; i++) {
for (int i = 1; i <= 64; i++) {
attributes.putString("key" + i, "value" + i);
}

// try to put value with multi thread
ExecutorService executors = Executors.newCachedThreadPool();
for (int i = 0; i < 100; i++) {
for (int i = 1; i <= 100; i++) {
final int index = i;
executors.submit(new Runnable() {
@Override
Expand All @@ -187,17 +173,13 @@ public void run() {
});
}

Truth.assertThat(attributes.size()).isEqualTo(8);
String expectedJSON = "{" +
"\"key0\":\"value0\"," +
"\"key1\":\"value1\"," +
"\"key2\":\"value2\"," +
"\"key3\":\"value3\"," +
"\"key4\":\"value4\"," +
"\"key5\":\"value5\"," +
"\"key6\":\"value6\"," +
"\"key7\":\"value7\"" +
"}";
Truth.assertThat(attributes.getJSONString()).isEqualTo(expectedJSON);
Truth.assertThat(attributes.size()).isEqualTo(64);
StringBuilder expectedJSONBuilder = new StringBuilder("{");
for (int i = 1; i < 64; i++) {
expectedJSONBuilder.append(String.format("\"key%d\":\"value%d\",", i, i));
}
expectedJSONBuilder.append("\"key64\":\"value64\"}");

Truth.assertThat(attributes.getJSONString()).isEqualTo(expectedJSONBuilder.toString());
}
}
Loading