8000 Instrument Jetty websocket pojo by amarziali · Pull Request #8562 · DataDog/dd-trace-java · GitHub
[go: up one dir, main page]
Skip to content

Instrument Jetty websocket pojo #8562

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 9 commits into from
Mar 24, 2025
Merged

Instrument Jetty websocket pojo #8562

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
66fa6de
Instrument Jetty websocket pojo
amarziali Mar 10, 2025
77a318c
spotbugs and muzzle
amarziali Mar 14, 2025
47430cc
fix muzzle and other tests
amarziali Mar 17, 2025
f628ebd
capital S
amarziali Mar 17, 2025
049b1b0
exclude jetty 12.1 because of api changes
amarziali Mar 17, 2025
cc3d6a6
add isLatestTest for all latest tests
amarziali Mar 17, 2025
293a68e
Merge branch 'master' into andrea.marziali/jetty-websocket
amarziali Mar 20, 2025
03a01af
Code review comments
amarziali Mar 21, 2025
d7fa0b5
Merge branch 'master' into andrea.marziali/jetty-websocket
amarziali Mar 21, 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
spotbugs and muzzle
  • Loading branch information
@amarziali
amarziali committed Mar 17, 2025
commit 77a318c2c32099a0fa97cb0f6a06172c0ff3528d
3 changes: 3 additions & 0 deletions dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ addTestSuiteForDir("latestDepTest", "test")

compileMain_java11Java.configure {
setJavaVersion(it, 11)
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
[compileTestGroovy, compileLatestDepTestGroovy].each {
it.javaLauncher = getJavaLauncherFor(11)
}

dependencies {
main_java11CompileOnly group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.0.0'
main_java11CompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.0'

testImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.0.0'
latestDepTestImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.+'
Expand Down
2 changes: 2 additions & 0 deletions ...-10/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/WebSocketAdvices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import javax.websocket.Endpoint;
Expand All @@ -13,6 +14,7 @@
import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketMessageMetadata;
import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;

@SuppressFBWarnings("UC_USELESS_OBJECT_STACK")
public class WebSocketAdvices {
public static class OpenClose9Advice {
@Advice.OnMethodEnter(suppress = Throwable.class)
Expand Down
0