Skip to content

Commit

Permalink
[mq] working branch - merge 71f6c40 on top of main at 0d05c69
Browse files Browse the repository at this point in the history
{"baseBranch":"main","baseCommit":"0d05c694bb3a62658edcbeebe2c6127d3b3c6030","createdAt":"2024-05-16T16:52:20.352354Z","headSha":"71f6c4083c9e803a90f7f6d9f4b261792d903684","id":"a01ded4b-fc98-4628-b555-6e65316f8b95","priority":"200","pullRequestNumber":"25669","queuedAt":"2024-05-16T17:42:58.355422Z","status":"STATUS_QUEUED","triggeredBy":"duncan.harvey@datadoghq.com"}
  • Loading branch information
dd-mergequeue[bot] committed May 16, 2024
2 parents 7cb1635 + 71f6c40 commit 6710d1d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkg/serverless/trace/trace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/DataDog/datadog-agent/pkg/serverless/random"
"github.com/DataDog/datadog-agent/pkg/trace/config"
"github.com/DataDog/datadog-agent/pkg/trace/testutil"
"github.com/DataDog/datadog-agent/pkg/util/testutil/flake"
)

func setupTraceAgentTest(t *testing.T) {
Expand Down Expand Up @@ -90,6 +91,7 @@ func TestStartEnabledTrueValidConfigValidPath(t *testing.T) {
}

func TestLoadConfigShouldBeFast(t *testing.T) {
flake.Mark(t)
setupTraceAgentTest(t)

startTime := time.Now()
Expand Down

0 comments on commit 6710d1d

Please sign in to comment.