Skip to content

Align retry logic for all test framework instrumentations #8803

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

Merged
daniel-mohedano merged 11 commits into from
May 14, 2025
Merged

Align retry logic for all test framework instrumentations #8803

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b5ca4e8
align karate execution instrumentation ordering
daniel-mohedano May 8, 2025
72fa990
align scalatest execution instrumentation ordering
daniel-mohedano May 8, 2025
64034a7
align testng execution instrumentation ordering
daniel-mohedano May 8, 2025
f8cff99
refactor execution history logic after alignment
daniel-mohedano May 9, 2025
ad337c0
fix test duration calculation
daniel-mohedano May 12, 2025
a5087e1
fix testng execution history creation and fixtures
daniel-mohedano May 12, 2025
bfbc0f1
fix auto test retries global counter increment
daniel-mohedano May 12, 2025
5f76e24
revert useless change in cucumber
daniel-mohedano May 12, 2025
21f3ac7
pr suggestions
daniel-mohedano May 14, 2025
97e4285
Merge branch 'master' into daniel.mohedano/unify-retry-detection
daniel-mohedano May 14, 2025
3268b48
get test status from span
daniel-mohedano May 14, 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
Next Next commit
align karate execution instrumentation ordering
  • Loading branch information
@daniel-mohedano
daniel-mohedano committed May 8, 2025
commit b5ca4e866bc163dc775b472886fb84878d710008
11 changes: 11 additions & 0 deletions ...mentation/karate/src/main/java/datadog/trace/instrumentation/karate/ExecutionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
public class ExecutionContext {

private final TestExecutionPolicy executionPolicy;
private boolean suppressFailures;
private boolean failed;
private long startTimestamp;

Expand All @@ -34,6 +35,16 @@ public boolean getAndResetFailed() {
return failed;
}

public void setSuppressFailures(boolean suppressFailures) {
this.suppressFailures = suppressFailures;
}

public boolean getAndResetSuppressFailures() {
boolean suppressFailures = this.suppressFailures;
this.suppressFailures = false;
return suppressFailures;
}

public TestExecutionPolicy getExecutionPolicy() {
return executionPolicy;
}
Expand Down
18 changes: 13 additions & 5 deletions ...te/src/main/java/datadog/trace/instrumentation/karate/KarateExecutionInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,18 @@ public void methodAdvice(MethodTransformer transformer) {
public static class RetryAdvice {
@Advice.OnMethodEnter
public static void beforeExecute(@Advice.This ScenarioRuntime scenarioRuntime) {
InstrumentationContext.get(Scenario.class, ExecutionContext.class)
.computeIfAbsent(scenarioRuntime.scenario, ExecutionContext::create)
.setStartTimestamp(System.currentTimeMillis());
ExecutionContext executionContext =
InstrumentationContext.get(Scenario.class, ExecutionContext.class)
.computeIfAbsent(scenarioRuntime.scenario, ExecutionContext::create);
executionContext.setStartTimestamp(System.currentTimeMillis());

// Indicate beforehand if the failures should be suppressed. This aligns the ordering with the
// rest of the frameworks
TestExecutionPolicy executionPolicy = executionContext.getExecutionPolicy();
executionContext.setSuppressFailures(executionPolicy.suppressFailures());

scenarioRuntime.magicVariables.putIfAbsent(
KarateUtils.EXECUTION_HISTORY_MAGICVARIABLE, executionPolicy);
}

@Advice.OnMethodExit
Expand Down Expand Up @@ -137,8 +146,7 @@ public static void onAddingStepResult(

executionContext.setFailed(true);

TestExecutionPolicy retryPolicy = executionContext.getExecutionPolicy();
if (retryPolicy.suppressFailures()) {
if (executionContext.getAndResetSuppressFailures()) {
stepResult = new StepResult(stepResult.getStep(), KarateUtils.abortedResult());
stepResult.setFailedReason(result.getError());
stepResult.setErrorIgnored(true);
Expand Down