8000 Instrument Java Websocket API (JSR356) by amarziali · Pull Request #8440 · DataDog/dd-trace-java · GitHub
[go: up one dir, main page]
Skip to content

Instrument Java Websocket API (JSR356) #8440

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 15 commits into from
Mar 10, 2025
Merged

Instrument Java Websocket API (JSR356) #8440

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2139fd8
Instrument Java Websocket API (JSR356)
amarziali Feb 6, 2025
fef4b82
Port span link related tests
amarziali Mar 3, 2025
aa9501d
Handle route for undertow upgrades
amarziali Mar 4, 2025
dba5896
fix jetty11 test
amarziali Mar 4, 2025
36fbdba
make sure instrumentation is applied in spring boot test
amarziali Mar 4, 2025
e6d51a2
add coverage for spanlinkattributes
amarziali Mar 4, 2025
54da9d3
spotless
amarziali Mar 4, 2025
9f7a27e
fix undertow test
amarziali Mar 4, 2025
046ca28
fix muzzle for tomcat
amarziali Mar 4, 2025
2421a36
codenarc
amarziali Mar 4, 2025
2614843
fix forbidden api
amarziali Mar 5, 2025
5be57c0
apply review
amarziali Mar 5, 2025
f760e30
change linkassert signature
amarziali Mar 5, 2025
55238f7
Add suggestions
amarziali Mar 5, 2025
978afb6
port dynamodb span link tests
amarziali Mar 10, 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
spotless
  • Loading branch information
@amarziali
amarziali committed Mar 10, 2025
commit 54da9d3d2c0aea2a2e7de05e6564fc417a61b4d8
7 changes: 6 additions & 1 deletion dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/LinksAssert.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package datadog.trace.agent.test.asserts

import datadog.trace.api.DDTraceId
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext
import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink
import datadog.trace.bootstrap.instrumentation.api.SpanAttributes
import datadog.trace.bootstrap.instrumentation.api.SpanLink
Expand Down Expand Up @@ -31,7 +32,11 @@ class LinksAssert {
}

def link(DDSpan linked, byte flags = SpanLink.DEFAULT_FLAGS, SpanAttributes attributes = SpanAttributes.EMPTY, String traceState = '') {
link(linked.traceId, linked.spanId, flags, attributes, traceState)
link(linked.context(), flags, attributes, traceState)
}

def link(AgentSpanContext context, byte flags = SpanLink.DEFAULT_FLAGS, SpanAttributes attributes = SpanAttributes.EMPTY, String traceState = '') {
link(context.traceId, context.spanId, flags, attributes, traceState)
}

def link(DDTraceId traceId, def spanId, byte flags = SpanLink.DEFAULT_FLAGS, SpanAttributes attributes = SpanAttributes.EMPTY, String traceState = '') {
Expand Down
4 changes: 1 addition & 3 deletions dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/SpanAssert.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package datadog.trace.agent.test.asserts

import static TagsAssert.assertTags
import static datadog.trace.agent.test.asserts.LinksAssert.assertLinks

import datadog.trace.api.DDSpanId
import datadog.trace.api.DDTraceId
import datadog.trace.core.DDSpan
Expand All @@ -11,6 +8,7 @@ import groovy.transform.stc.SimpleType

import java.util.regex.Pattern

import static datadog.trace.agent.test.asserts.LinksAssert.assertLinks
import static datadog.trace.agent.test.asserts.TagsAssert.assertTags

class SpanAssert {
Expand Down
0