Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ protected RollbarThrowableWrapper wrapThrowable(Throwable error) {
protected abstract RESULT sendPayload(C config, Payload payload);

private Body makeBody(ThrowableWrapper error, String description) {
List<TelemetryEvent> telemetryEvents = telemetryEventTracker.dump();
List<TelemetryEvent> telemetryEvents = telemetryEventTracker.getAll();
if (telemetryEvents.isEmpty()) {
return bodyFactory.from(error, description);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@ public RollbarTelemetryEventTracker(
}

@Override
public List<TelemetryEvent> dump() {
List<TelemetryEvent> events = new ArrayList<>(telemetryEvents);
telemetryEvents.clear();
return events;
public List<TelemetryEvent> getAll() {
return new ArrayList<>(telemetryEvents);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
public interface TelemetryEventTracker {

/**
* Dump all the events recorded.
* Get all the events recorded.
*/
List<TelemetryEvent> dump();
List<TelemetryEvent> getAll();

/**
* Record log telemetry event. ({@link TelemetryType#LOG}).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,23 @@ public class RollbarTelemetryEventTrackerTest {
private static final int MINIMUM_CAPACITY_FOR_TELEMETRY_EVENTS = 0;
private static final int MAXIMUM_CAPACITY_FOR_TELEMETRY_EVENTS = 100;

@Test
public void shouldKeepAllTheEventsDuringSessionIfGetAllIsInvoked() {
telemetryEventTracker.recordManualEventFor(LEVEL, SOURCE, MESSAGE);

List<TelemetryEvent> telemetryEventsFirstCall = telemetryEventTracker.getAll();
List<TelemetryEvent> telemetryEventsSecondCall = telemetryEventTracker.getAll();

assertThat(telemetryEventsFirstCall, is(telemetryEventsSecondCall));
}

@Test
public void shouldDiscardOldestEventsWhenMaxCapacityIsReached() {
telemetryEventTracker.recordManualEventFor(LEVEL, SOURCE, MESSAGE);
telemetryEventTracker.recordLogEventFor(LEVEL, SOURCE, MESSAGE);
telemetryEventTracker.recordLogEventFor(LEVEL, SOURCE, MESSAGE);

List<TelemetryEvent> telemetryEvents = telemetryEventTracker.dump();
List<TelemetryEvent> telemetryEvents = telemetryEventTracker.getAll();

assertThat(telemetryEvents.size(), is(MAXIMUM_TELEMETRY_DATA));
verifyContainsOnlyLogEvents(telemetryEvents);
Expand Down Expand Up @@ -84,7 +94,7 @@ public void shouldTrackANetworkEvent() {
public void shouldSetTheMaximumTelemetryDataLimitedToItsLowerLimit() {
TelemetryEventTracker telemetryEventTracker = newEventTracker(MINIMUM_CAPACITY_FOR_TELEMETRY_EVENTS - 1);

List<TelemetryEvent> telemetryEvents = record70EventsAndDump(telemetryEventTracker);
List<TelemetryEvent> telemetryEvents = record101EventsAndDump(telemetryEventTracker);

assertThat(telemetryEvents.size(), is(MINIMUM_CAPACITY_FOR_TELEMETRY_EVENTS));
}
Expand All @@ -93,7 +103,7 @@ public void shouldSetTheMaximumTelemetryDataLimitedToItsLowerLimit() {
public void shouldSetTheMaximumTelemetryDataLimitedToItsUpperLimit() {
TelemetryEventTracker telemetryEventTracker = newEventTracker(MAXIMUM_CAPACITY_FOR_TELEMETRY_EVENTS + 1);

List<TelemetryEvent> telemetryEvents = record70EventsAndDump(telemetryEventTracker);
List<TelemetryEvent> telemetryEvents = record101EventsAndDump(telemetryEventTracker);

assertThat(telemetryEvents.size(), is(MAXIMUM_CAPACITY_FOR_TELEMETRY_EVENTS));
}
Expand All @@ -103,7 +113,7 @@ public void shouldSetTheMaximumTelemetryDataLimitedToAValueBetweenBounds() {
int maximumTelemetryEvents = 20;
TelemetryEventTracker telemetryEventTracker = newEventTracker(maximumTelemetryEvents);

List<TelemetryEvent> telemetryEvents = record70EventsAndDump(telemetryEventTracker);
List<TelemetryEvent> telemetryEvents = record101EventsAndDump(telemetryEventTracker);

assertThat(telemetryEvents.size(), is(maximumTelemetryEvents));
}
Expand All @@ -115,19 +125,19 @@ private TelemetryEventTracker newEventTracker(int maximumTelemetryData) {
);
}

private List<TelemetryEvent> record70EventsAndDump(TelemetryEventTracker telemetryEventTracker) {
for (int i = 0; i < 120; i++) {
private List<TelemetryEvent> record101EventsAndDump(TelemetryEventTracker telemetryEventTracker) {
for (int i = 0; i < 101; i++) {
telemetryEventTracker.recordManualEventFor(LEVEL, SOURCE, MESSAGE);
}
return telemetryEventTracker.dump();
return telemetryEventTracker.getAll();
}

private Map<String, Object> getTrackedEventAsJson() {
return getFirstEvent().asJson();
}

private TelemetryEvent getFirstEvent() {
return telemetryEventTracker.dump().get(0);
return telemetryEventTracker.getAll().get(0);
}

private Map<String, Object> getExpectedJsonForALogTelemetryEvent() {
Expand Down
Loading