Skip to content

Commit 939a09e

Browse files
committed
Refactoring unhelpful queue size checks
1 parent b25c4aa commit 939a09e

File tree

1 file changed

+3
-9
lines changed
  • core/src/main/java/com/segment/analytics/kotlin/core

1 file changed

+3
-9
lines changed

core/src/main/java/com/segment/analytics/kotlin/core/Telemetry.kt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ object Telemetry: Subscriber {
9393

9494
private val queue = ConcurrentLinkedQueue<RemoteMetric>()
9595
private var queueBytes = 0
96-
private var queueSizeExceeded = false
97-
private val seenErrors = mutableMapOf<String, Int>()
9896
private var started = false
9997
private var rateLimitEndTime: Long = 0
10098
private var flushFirstError = true
@@ -150,7 +148,6 @@ object Telemetry: Subscriber {
150148
fun reset() {
151149
telemetryJob?.cancel()
152150
resetQueue()
153-
seenErrors.clear()
154151
started = false
155152
rateLimitEndTime = 0
156153
}
@@ -169,7 +166,6 @@ object Telemetry: Subscriber {
169166
if (!metric.startsWith(METRICS_BASE_TAG)) return
170167
if (tags.isEmpty()) return
171168
if (Math.random() > sampleRate) return
172-
if (queue.size >= maxQueueSize) return
173169

174170
addRemoteMetric(metric, tags)
175171
}
@@ -188,7 +184,6 @@ object Telemetry: Subscriber {
188184
if (!enable || sampleRate == 0.0) return
189185
if (!metric.startsWith(METRICS_BASE_TAG)) return
190186
if (tags.isEmpty()) return
191-
if (queue.size >= maxQueueSize) return
192187
if (Math.random() > sampleRate) return
193188

194189
var filteredTags = if(sendWriteKeyOnError) {
@@ -235,7 +230,6 @@ object Telemetry: Subscriber {
235230
var queueCount = queue.size
236231
// Reset queue data size counter since all current queue items will be removed
237232
queueBytes = 0
238-
queueSizeExceeded = false
239233
val sendQueue = mutableListOf<RemoteMetric>()
240234
while (queueCount-- > 0 && !queue.isEmpty()) {
241235
val m = queue.poll()
@@ -303,6 +297,9 @@ object Telemetry: Subscriber {
303297
found.value += value
304298
return
305299
}
300+
if (queue.size >= maxQueueSize) {
301+
return
302+
}
306303

307304
val newMetric = RemoteMetric(
308305
type = METRIC_TYPE,
@@ -315,8 +312,6 @@ object Telemetry: Subscriber {
315312
if (queueBytes + newMetricSize <= maxQueueBytes) {
316313
queue.add(newMetric)
317314
queueBytes += newMetricSize
318-
} else {
319-
queueSizeExceeded = true
320315
}
321316
}
322317

@@ -345,6 +340,5 @@ object Telemetry: Subscriber {
345340
private fun resetQueue() {
346341
queue.clear()
347342
queueBytes = 0
348-
queueSizeExceeded = false
349343
}
350344
}

0 commit comments

Comments
 (0)