Skip to content

Enable Pekko HTTP forked tests #12310

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
gh-worker-dd-mergequeue-cf854d merged 4 commits into from
Sep 8, 2026
Merged

Enable Pekko HTTP forked tests #12310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7665635
fix(feature-flags): constrain direct EVP intake origin (#12299)
leoromanovsky Sep 8, 2026
874d5bc
Enable Pekko HTTP forked tests
AlexeyKuznetsov-DD Aug 26, 2026
8adad42
Minor reshuffle.
AlexeyKuznetsov-DD Sep 8, 2026
9f6fb65
Remove direct Pekko advice test
AlexeyKuznetsov-DD Sep 8, 2026
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
8 changes: 7 additions & 1 deletion dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@ plugins {
// we put the test classes in the baseTest test set so that the scala
// version is not inherited
addTestSuite('baseTest')
addForkedTestTask('baseTest')

addTestSuite('latestDepTest')
addForkedTestTask('latestDepTest')

addTestSuiteForDir('latestPekko10Test', 'latestDepTest')
addForkedTestTask('latestPekko10Test')

addTestSuite('iastTest')
addTestSuiteForDir 'latestDepIastTest', 'iastTest'
addTestSuiteForDir('latestDepIastTest', 'iastTest')

muzzle {
pass {
Expand Down
4 changes: 2 additions & 2 deletions ...tation/pekko/pekko-http-1.0/src/baseTest/groovy/PekkoHttpClientInstrumentationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ abstract class PekkoHttpClientInstrumentationTest extends HttpClientTest {
span {
parent()
operationName operation()
resourceName "pekko-http.client.request"
resourceName operation() // resource name is not set so defaults to operationName
spanType DDSpanTypes.HTTP_CLIENT
errored true
tags {
"$Tags.COMPONENT" "pekko-http-client"
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
errorTags(exception)
defaultTags()
defaultTags(false, false)
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions ...n/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpSingleRequestInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ public static class SingleRequestContextPropagationAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void methodEnter(
@Advice.Argument(value = 0, readOnly = false) HttpRequest request) {
if (request == null) {
return;
}
final PekkoHttpHeaders headers = new PekkoHttpHeaders(request);
DECORATE.injectContext(currentContext(), request, headers);
request = headers.getRequest();
Expand Down