Skip to content

proof of concept for message durability with small files (fit a batch request) #2

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

Open
apuig wants to merge 16 commits into
base: master
Choose a base branch
from
Open

proof of concept for message durability with small files (fit a batch request) #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
24fcc00
fix OOM error in test
apuig Mar 19, 2025
8d81420
setup wiremock test
apuig Mar 20, 2025
3d232fa
remove
apuig Mar 20, 2025
82fb908
simple wiremock test
apuig Mar 21, 2025
205e2de
remove callback
apuig Mar 24, 2025
af74b24
remove backo, add failsafe
apuig Mar 24, 2025
85ef909
fallback appender
apuig Mar 25, 2025
ab780a4
values
apuig Mar 25, 2025
2d06abf
doc
apuig Mar 26, 2025
f73e156
stole ReversedLinesFileReader at commons-io:2.18.0
apuig Mar 31, 2025
0d2527e
ReversedLinesFileReader truncate consumed lines
apuig Mar 31, 2025
389875f
truncate lines on resend
apuig Mar 31, 2025
ac0bc1f
stop retry on rate limit
apuig Mar 31, 2025
e100ede
store small batch size
apuig Apr 1, 2025
eb58c68
fix end of batch in tmp files. Change test execution
apuig Apr 10, 2025
10a5ac6
cleanup
apuig Apr 13, 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
Prev Previous commit
Next Next commit
remove callback
  • Loading branch information
@apuig
apuig committed Mar 24, 2025
commit 205e2dee5fa36c06a5bab76252fb133d46c05ce7
22 changes: 0 additions & 22 deletions analytics/src/main/java/com/segment/analytics/Analytics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ public static class Builder {
private int maximumFlushAttempts;
private int maximumQueueSizeInBytes;
private long flushIntervalInMillis;
private List<Callback> callbacks;
private int queueCapacity;
private boolean forceTlsV1 = false;
private GsonBuilder gsonBuilder;
Expand Down Expand Up @@ -318,21 +317,6 @@ public Builder threadFactory(ThreadFactory threadFactory) {
return this;
}

/** Add a {@link Callback} to be notified when an event is processed. */
public Builder callback(Callback callback) {
if (callback == null) {
throw new NullPointerException("Null callback");
}
if (callbacks == null) {
callbacks = new ArrayList<>();
}
if (callbacks.contains(callback)) {
throw new IllegalStateException("Callback is already registered.");
}
callbacks.add(callback);
return this;
}

/** Use a {@link Plugin} to configure the builder. */
@Beta
public Builder plugin(Plugin plugin) {
Expand Down Expand Up @@ -407,11 +391,6 @@ public Analytics build() {
if (threadFactory == null) {
threadFactory = Platform.get().defaultThreadFactory();
}
if (callbacks == null) {
callbacks = Collections.emptyList();
} else {
callbacks = Collections.unmodifiableList(callbacks);
}

HttpLoggingInterceptor interceptor =
new HttpLoggingInterceptor(
Expand Down Expand Up @@ -463,7 +442,6 @@ public void log(String message) {
log,
threadFactory,
networkExecutor,
callbacks,
writeKey,
gson);

Expand Down
20 changes: 3 additions & 17 deletions analytics/src/main/java/com/segment/analytics/internal/AnalyticsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ public class AnalyticsClient {
private final int maximumRetries;
private final int maximumQueueByteSize;
private final Log log;
private final List<Callback> callbacks;
private final ExecutorService networkExecutor;
private final Thread looperThread;
private final AtomicBoolean isShutDown;
Expand All @@ -76,7 +75,6 @@ public static AnalyticsClient create(
Log log,
ThreadFactory threadFactory,
ExecutorService networkExecutor,
List<Callback> callbacks,
String writeKey,
Gson gsonInstance) {
return new AnalyticsClient(
Expand All @@ -91,7 +89,6 @@ public static AnalyticsClient create(
log,
threadFactory,
networkExecutor,
callbacks,
new AtomicBoolean(false),
writeKey,
gsonInstance);
Expand All @@ -109,7 +106,6 @@ public AnalyticsClient(
Log log,
ThreadFactory threadFactory,
ExecutorService networkExecutor,
List<Callback> callbacks,
AtomicBoolean isShutDown,
String writeKey,
Gson gsonInstance) {
Expand All @@ -122,8 +118,7 @@ public AnalyticsClient(
this.maximumRetries = maximumRetries;
this.maximumQueueByteSize = maximumQueueSizeInBytes;
this.log = log;
this.callbacks = callbacks;
this.looperThread = threadFactory.newThread(new Looper());
this.looperThread = threadFactory.newThread(new Looper());
this.networkExecutor = networkExecutor;
this.isShutDown = isShutDown;
this.writeKey = writeKey;
Expand Down Expand Up @@ -290,11 +285,7 @@ static BatchUploadTask create(AnalyticsClient client, Batch batch, int maxRetrie
}

private void notifyCallbacksWithException(Batch batch, Exception exception) {
for (Message message : batch.batch()) {
for (Callback callback : client.callbacks) {
callback.failure(message, exception);
}
}
// XXX failure
}

/** Returns {@code true} to indicate a batch should be retried. {@code false} otherwise. */
Expand All @@ -308,12 +299,7 @@ boolean upload() {
if (response.isSuccessful()) {
client.log.print(VERBOSE, "Uploaded batch %s.", batch.sequence());

for (Message message : batch.batch()) {
for (Callback callback : client.callbacks) {
callback.success(message);
}
}

// XXX success
return false;
}

Expand Down
34 changes: 0 additions & 34 deletions analytics/src/test/java/com/segment/analytics/AnalyticsBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,46 +381,12 @@ public void buildsWithThreadFactory() {
assertThat(analytics).isNotNull();
}

@Test
public void nullCallback() {
try {
builder.callback(null);
fail("Should fail for null callback");
} catch (NullPointerException e) {
assertThat(e).hasMessage("Null callback");
}
}

@Test
public void duplicateCallback() {
Callback callback = mock(Callback.class);
try {
builder.callback(callback).callback(callback);
} catch (IllegalStateException e) {
assertThat(e).hasMessage("Callback is already registered.");
}
}

@Test
public void buildsWithValidCallback() {
Analytics analytics = builder.callback(mock(Callback.class)).build();
assertThat(analytics).isNotNull();
}

@Test
public void buildsWithForceTlsV1() {
Analytics analytics = builder.forceTlsVersion1().build();
assertThat(analytics).isNotNull();
}

@Test
public void multipleCallbacks() {
Analytics analytics =
builder.callback(mock(Callback.class)).callback(mock(Callback.class)).build();

assertThat(analytics).isNotNull();
}

@Test
public void nullPlugin() {
try {
Expand Down
Loading