8000 WebSocket support for Netty by ValentinZakharov · Pull Request #8632 · DataDog/dd-trace-java · GitHub
[go: up one dir, main page]
Skip to content

WebSocket support for Netty #8632

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
merged 36 commits into from
May 13, 2025
Merged

WebSocket support for Netty #8632

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
e619f2a
Implemented WebSocket support for Netty 4.1
ValentinZakharov Mar 28, 2025
1ab91db
Let propagate unhandled events and fix tests
amarziali Mar 28, 2025
7f96ea2
Refactoring
ValentinZakharov Mar 30, 2025
b2d45a7
Refactor netty test and fix instrumentation
amarziali Apr 3, 2025
0d7330c
Improved pipeline processing - now you can insert handler in any place
ValentinZakharov Apr 3, 2025
7f1138f
Merge branch 'master' into vzakharov/websockets_netty
ValentinZakharov Apr 4, 2025
ee2c5fd
Merge branch 'master' into vzakharov/websockets_netty
ValentinZakharov Apr 7, 2025
203e468
Fixed helper
ValentinZakharov Apr 8, 2025
d753e90
Refactoring
ValentinZakharov Apr 8, 2025
af33164
WebSocket Server support for netty-4.0
ValentinZakharov Apr 9, 2025
e79c661
Missing handlers use cases for netty-4.1
ValentinZakharov Apr 10, 2025
19417b9
Fixed handlers for netty-4.0
ValentinZakharov Apr 10, 2025
6e94f0f
Tests for netty-4.0
ValentinZakharov Apr 10, 2025
c9a7c20
Refactoring
ValentinZakharov Apr 10, 2025
86715ec
WebSocket Server support for netty-3.8
ValentinZakharov Apr 11, 2025
dabfe2d
Tests for netty-3.8
ValentinZakharov Apr 15, 2025
e7f4d7f
Spotless
ValentinZakharov Apr 15, 2025
5fd4cf2
Fixed tests 8000
ValentinZakharov Apr 16, 2025
091ee80
Add profiler env check command to AgentCLI (#8671)
jbachorik Apr 7, 2025
eb18875
Remove dependency on bash from crash/oome uploder scripts (#8652)
jbachorik Apr 7, 2025
66f7b9f
Do not apply JUnit 4 instrumentation to MUnit runners (#8675)
nikita-tkachenko-datadog Apr 7, 2025
d851aa9
Shutdown CI Visibility test event handlers before tracer (#8677)
nikita-tkachenko-datadog Apr 7, 2025
c7ec7ce
Prevent double reporting of Scalatest events when using SBT with test…
nikita-tkachenko-datadog Apr 8, 2025
ba3f346
Fix In-Product when config is empty (#8679)
jpbempel Apr 9, 2025
2203ec4
Expand MUnit runners filter to catch munit.MUnitRunner in JUnit 4 ins…
daniel-mohedano Apr 9, 2025
fef00c7
Remove unused TestEventsHandler methods (#8674)
nikita-tkachenko-datadog Apr 9, 2025
15889fc
Delete print line (#8686)
sarahchen6 Apr 9, 2025
b838ed1
Exclude ProxyLeakTask exception from exception profiling (#8666)
jbachorik Apr 10, 2025
690dd95
Use jvmstat for JDKs 9+ programmatically (#8641)
MattAlp Apr 10, 2025
6510fa4
Update test.retry_reason to use full name of the feature (#8689)
daniel-mohedano Apr 10, 2025
b8b8dab
Allow dogstatsd port to be configurable with DD_DOGSTATSD_PORT (#8693)
randomanderson Apr 14, 2025
5922b70
wait the client handshake
amarziali Apr 17, 2025
78e9c9c
move netty ws client to interested modules
amarziali Apr 17, 2025
bc4b6f0
Merge remote-tracking branch 'origin/master' into vzakharov/websocket…
amarziali Apr 17, 2025
97e7d2f
Added WebSocket tracing check
ValentinZakharov Apr 28, 2025
c817fc9
Merge branch 'master' into vzakharov/websockets_netty
ValentinZakharov Apr 28, 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
Prev Previous commit
Next Next commit
Do not apply JUnit 4 instrumentation to MUnit runners (#8675)
  • Loading branch information
@nikita-tkachenko-datadog @amarziali
nikita-tkachenko-datadog authored and amarziali committed Apr 17, 2025
commit 66f7b9fe03ddc641993800e6d0fc16b79a932f34
4 changes: 4 additions & 0 deletions .../junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.extendsClass;
import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.nameStartsWith;
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
import static net.bytebuddy.matcher.ElementMatchers.not;
Expand Down Expand Up @@ -54,6 +55,9 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
// do not instrument Karate JUnit 4 runner
// since Karate has a dedicated instrumentation
.and(not(extendsClass(named("com.intuit.karate.junit4.Karate"))))
// do not instrument MUnit-JUnit 4 interface runner
// since MUnit has a dedicated instrumentation
.and(not(extendsClass(nameStartsWith("munit.internal.junitinterface."))))
// PowerMock runner is being instrumented,
// so do not instrument its internal delegates
.and(
Expand Down
80D6 2 changes: 2 additions & 0 deletions ...umentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,8 @@ public static TestFrameworkInstrumentation runnerToFramework(Runner runner) {
return TestFrameworkInstrumentation.KARATE;
} else if (runnerClassName.startsWith("io.cucumber")) {
return TestFrameworkInstrumentation.CUCUMBER;
} else if (runnerClassName.startsWith("munit.internal.junitinterface")) {
return TestFrameworkInstrumentation.MUNIT;
} else {
return TestFrameworkInstrumentation.JUNIT4;
}
Expand Down
0