-
Notifications
You must be signed in to change notification settings - Fork 1k
Failsafe RetryPolicy instrumentation added #15255
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,18 +13,25 @@ | |
|
|
||
| import dev.failsafe.CircuitBreaker; | ||
| import dev.failsafe.CircuitBreakerConfig; | ||
| import dev.failsafe.RetryPolicy; | ||
| import dev.failsafe.RetryPolicyConfig; | ||
| import io.opentelemetry.api.OpenTelemetry; | ||
| import io.opentelemetry.api.common.AttributeKey; | ||
| import io.opentelemetry.api.common.Attributes; | ||
| import io.opentelemetry.api.metrics.LongCounter; | ||
| import io.opentelemetry.api.metrics.LongHistogram; | ||
| import io.opentelemetry.api.metrics.Meter; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.LongStream; | ||
|
|
||
| /** Entrypoint for instrumenting Failsafe components. */ | ||
| public final class FailsafeTelemetry { | ||
| private static final String INSTRUMENTATION_NAME = "io.opentelemetry.failsafe-3.0"; | ||
|
|
||
| private static final AttributeKey<String> CIRCUIT_BREAKER_NAME = | ||
| AttributeKey.stringKey("failsafe.circuit_breaker.name"); | ||
| private static final AttributeKey<String> RETRY_POLICY_NAME = | ||
| AttributeKey.stringKey("failsafe.retry_policy.name"); | ||
|
|
||
| /** Returns a new {@link FailsafeTelemetry} configured with the given {@link OpenTelemetry}. */ | ||
| public static FailsafeTelemetry create(OpenTelemetry openTelemetry) { | ||
|
|
@@ -70,4 +77,44 @@ public <R> CircuitBreaker<R> createCircuitBreaker( | |
| .onClose(buildInstrumentedCloseListener(userConfig, stateChangesCounter, attributes)) | ||
| .build(); | ||
| } | ||
|
|
||
| /** | ||
| * Returns an instrumented {@link RetryPolicy} by given values. | ||
| * | ||
| * @param delegate user configured {@link RetryPolicy} to be instrumented | ||
| * @param retryPolicyName identifier of given {@link RetryPolicy} | ||
| * @param <R> {@link RetryPolicy}'s result type | ||
| * @return instrumented {@link RetryPolicy} | ||
| */ | ||
| public <R> RetryPolicy<R> createRetryPolicy(RetryPolicy<R> delegate, String retryPolicyName) { | ||
| RetryPolicyConfig<R> userConfig = delegate.getConfig(); | ||
| Meter meter = openTelemetry.getMeter(INSTRUMENTATION_NAME); | ||
| LongCounter executionCounter = | ||
| meter | ||
| .counterBuilder("failsafe.retry_policy.execution.count") | ||
| .setDescription( | ||
| "Count of execution events processed by the retry policy. " | ||
| + "Each event represents one complete execution flow (initial attempt + any retries). " | ||
| + "This metric does not count individual retry attempts - it counts each time the policy is invoked.") | ||
| .build(); | ||
| LongHistogram attemptsHistogram = | ||
| meter | ||
| .histogramBuilder("failsafe.retry_policy.attempts") | ||
| .setDescription("Histogram of number of attempts for each execution.") | ||
| .ofLongs() | ||
| .setExplicitBucketBoundariesAdvice( | ||
| LongStream.range(1, userConfig.getMaxAttempts() + 1) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @onurkybsi what's typical could you come up with a smallish static set, e.g. also worth reading open-telemetry/semantic-conventions#316 (comment)
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hey @trask, I didn't take having enormous numbers into the account maybe. Do you think we should? If so, I can refactor this part to build up a list which distributes the range(1 to maxAttempt) evenly considering a maximum number of buckets like 10. Maybe something like this: private static List<Long> buildBoundaries(int maxNumOfBuckets, long maxNumOfAttempts) {
List<Long> boundaries = new ArrayList<>(maxNumOfBuckets);
boundaries.add(1L);
double step = (double) (maxNumOfAttempts - 1) / (maxNumOfBuckets - 1);
for (int i = 1; i < maxNumOfBuckets; i++) {
long boundary = Math.min(Math.round(1 + step * i), maxNumOfAttempts);
boundaries.add(boundary);
}
return boundaries.stream()
.distinct()
.sorted()
.toList();
}What do you think?
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. buckets are costly, so I'd try to keep the number small if possible, e.g. with gc duration metrics, we went with just 5 buckets: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/runtime/jvm-metrics.md#metric-jvmgcduration do you have any idea what are typical values for
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's 3 as default in Failsafe and same for resilience4j. I think it wouldn't make sense to have a value more than 5 in most of the cases so maybe just [ 1, 2, 3, 5 ]. What do you say?
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sounds good |
||
| .boxed() | ||
| .collect(Collectors.toList())) | ||
| .build(); | ||
| Attributes attributes = Attributes.of(RETRY_POLICY_NAME, retryPolicyName); | ||
| return RetryPolicy.builder(userConfig) | ||
| .onFailure( | ||
| RetryPolicyEventListenerBuilders.buildInstrumentedFailureListener( | ||
| userConfig, executionCounter, attemptsHistogram, attributes)) | ||
| .onSuccess( | ||
| RetryPolicyEventListenerBuilders.buildInstrumentedSuccessListener( | ||
| userConfig, executionCounter, attemptsHistogram, attributes)) | ||
| .build(); | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.instrumentation.failsafe.v3_0; | ||
|
|
||
| import static io.opentelemetry.api.common.AttributeKey.stringKey; | ||
|
|
||
| import dev.failsafe.RetryPolicyConfig; | ||
| import dev.failsafe.event.EventListener; | ||
| import dev.failsafe.event.ExecutionCompletedEvent; | ||
| import io.opentelemetry.api.common.AttributeKey; | ||
| import io.opentelemetry.api.common.Attributes; | ||
| import io.opentelemetry.api.metrics.LongCounter; | ||
| import io.opentelemetry.api.metrics.LongHistogram; | ||
|
|
||
| final class RetryPolicyEventListenerBuilders { | ||
| private static final AttributeKey<String> OUTCOME_KEY = | ||
| stringKey("failsafe.retry_policy.outcome"); | ||
|
|
||
| private RetryPolicyEventListenerBuilders() {} | ||
|
|
||
| static <R> EventListener<ExecutionCompletedEvent<R>> buildInstrumentedFailureListener( | ||
| RetryPolicyConfig<R> userConfig, | ||
| LongCounter executionCounter, | ||
| LongHistogram attemptsHistogram, | ||
| Attributes commonAttributes) { | ||
| Attributes attributes = commonAttributes.toBuilder().put(OUTCOME_KEY, "failure").build(); | ||
| return e -> { | ||
| executionCounter.add(1, attributes); | ||
| attemptsHistogram.record(e.getAttemptCount(), attributes); | ||
| if (userConfig.getFailureListener() != null) { | ||
| userConfig.getFailureListener().accept(e); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| static <R> EventListener<ExecutionCompletedEvent<R>> buildInstrumentedSuccessListener( | ||
| RetryPolicyConfig<R> userConfig, | ||
| LongCounter executionCounter, | ||
| LongHistogram attemptsHistogram, | ||
| Attributes commonAttributes) { | ||
| Attributes attributes = commonAttributes.toBuilder().put(OUTCOME_KEY, "success").build(); | ||
| return e -> { | ||
| executionCounter.add(1, attributes); | ||
| attemptsHistogram.record(e.getAttemptCount(), attributes); | ||
| if (userConfig.getFailureListener() != null) { | ||
| userConfig.getFailureListener().accept(e); | ||
| } | ||
| }; | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure using a histogram for this is justified. @trask could you provide guidance on this