Skip to content

Commit c272f97

Browse files
committed
Updating tests
1 parent 17ac9d6 commit c272f97

File tree

3 files changed

+223
-185
lines changed

3 files changed

+223
-185
lines changed

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/delay/PeriodicTaskExecutor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static PeriodicTaskExecutor create(PeriodicDelay initialPeriodicDelay) {
3030
initialPeriodicDelay);
3131
}
3232

33-
PeriodicTaskExecutor(
33+
public PeriodicTaskExecutor(
3434
ScheduledExecutorService executorService, PeriodicDelay initialPeriodicDelay) {
3535
this.executorService = executorService;
3636
this.periodicDelay = initialPeriodicDelay;
@@ -52,7 +52,6 @@ public void setPeriodicDelay(PeriodicDelay periodicDelay) {
5252
scheduledFuture.cancel(false);
5353
}
5454
this.periodicDelay = periodicDelay;
55-
periodicDelay.reset();
5655
scheduleNext();
5756
} finally {
5857
delaySetLock.unlock();

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ public void start(Callback callback, Supplier<Request> requestSupplier) {
102102
public void stop() {
103103
if (isRunning.compareAndSet(true, false)) {
104104
hasStopped.set(true);
105-
executor.executeNow();
106105
executor.stop();
107106
}
108107
}
109108

110109
private void enableRetryMode(@Nullable Duration suggestedDelay) {
111110
if (retryModeEnabled.compareAndSet(false, true)) {
111+
periodicRetryDelay.reset();
112112
if (suggestedDelay != null && periodicRetryDelay instanceof AcceptsDelaySuggestion) {
113113
((AcceptsDelaySuggestion) periodicRetryDelay).suggestDelay(suggestedDelay);
114114
}
@@ -118,6 +118,7 @@ private void enableRetryMode(@Nullable Duration suggestedDelay) {
118118

119119
private void disableRetryMode() {
120120
if (retryModeEnabled.compareAndSet(true, false)) {
121+
periodicRequestDelay.reset();
121122
executor.setPeriodicDelay(periodicRequestDelay);
122123
}
123124
}

0 commit comments

Comments
 (0)