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

Instrument Java Websocket API (JSR356) #8440

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
port dynamodb span link tests
  • Loading branch information
@amarziali
amarziali committed Mar 10, 2025
commit 978afb6bc805f6e2c99008decac34487b7f78414
89 changes: 40 additions & 49 deletions ...ava-agent/instrumentation/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTraceId
import datadog.trace.bootstrap.instrumentation.api.SpanAttributes
import datadog.trace.bootstrap.instrumentation.api.SpanLink
import datadog.trace.core.tagprocessor.SpanPointersProcessor
import groovy.json.JsonSlurper
import org.testcontainers.containers.GenericContainer
import org.testcontainers.utility.DockerImageName
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
Expand All @@ -23,6 +25,7 @@ import software.amazon.awssdk.services.dynamodb.model.PutItemRequest
import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType
import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest
import spock.lang.Shared

import java.time.Duration

class DynamoDbClientTest extends AgentTestRunner {
Expand Down Expand Up @@ -188,6 +191,15 @@ class DynamoDbClientTest extends AgentTestRunner {
operationName "aws.http"
resourceName "DynamoDb.UpdateItem"
spanType DDSpanTypes.HTTP_CLIENT
links {
link(DDTraceId.ZERO, 0, SpanLink.DEFAULT_FLAGS, SpanAttributes.builder()
.put("ptr.kind", SpanPointersProcessor.DYNAMODB_PTR_KIND)
.put("ptr.dir", SpanPointersProcessor.DOWN_DIRECTION)
// First 32 chars of SHA256("dynamodb-one-key-table|id|test-id-1||")
.put("ptr.hash", "ca8daaa857b00545ed5186a915cf1ab5")
.put("link.kind", SpanPointersProcessor.LINK_KIND)
.build())
}
tags {
defaultTags()
tag "component", "java-aws-sdk"
Expand All @@ -205,18 +217,6 @@ class DynamoDbClientTest extends AgentTestRunner {
tag "span.kind", "client"
tag "aws.requestId", { it != null }
tag "_dd.span_links", { it != null }
// Assert the span links
def spanLinks = tags["_dd.span_links"]
assert spanLinks != null
def links = new JsonSlurper().parseText(spanLinks)
assert links.size() == 1
def link = links[0]
assert link["attributes"] != null
assert link["attributes"]["ptr.kind"] == SpanPointersProcessor.DYNAMODB_PTR_KIND
assert link["attributes"]["ptr.dir"] == SpanPointersProcessor.DOWN_DIRECTION
// First 32 chars of SHA256("dynamodb-one-key-table|id|test-id-1||")
assert link["attributes"]["ptr.hash"] == "ca8daaa857b00545ed5186a915cf1ab5"
assert link["attributes"]["link.kind"] == SpanPointersProcessor.LINK_KIND
}
}
}
Expand Down Expand Up @@ -293,6 +293,15 @@ class DynamoDbClientTest extends AgentTestRunner {
operationName "aws.http"
resourceName "DynamoDb.UpdateItem"
spanType DDSpanTypes.HTTP_CLIENT
links {
link(DDTraceId.ZERO, 0, SpanLink.DEFAULT_FLAGS, SpanAttributes.builder()
.put("ptr.kind", SpanPointersProcessor.DYNAMODB_PTR_KIND)
.put("ptr.dir", SpanPointersProcessor.DOWN_DIRECTION)
// First 32 chars of SHA256("dynamodb-two-key-table|primaryKey|customer-123|sortKey|order-456")
.put("ptr.hash", "90922c7899a82ea34406fdcdfb95161e")
.put("link.kind", SpanPointersProcessor.LINK_KIND)
.build())
}
tags {
defaultTags()
tag "component", "java-aws-sdk"
Expand All @@ -310,18 +319,6 @@ class DynamoDbClientTest extends AgentTestRunner {
tag "span.kind", "client"
tag "aws.requestId", { it != null }
tag "_dd.span_links", { it != null }
// Assert the span links
def spanLinks = tags["_dd.span_links"]
assert spanLinks != null
def links = new JsonSlurper().parseText(spanLinks)
assert links.size() == 1
def link = links[0]
assert link["attributes"] != null
assert link["attributes"]["ptr.kind"] == SpanPointersProcessor.DYNAMODB_PTR_KIND
assert link["attributes"]["ptr.dir"] == SpanPointersProcessor.DOWN_DIRECTION
// First 32 chars of SHA256("dynamodb-two-key-table|primaryKey|customer-123|sortKey|order-456")
assert link["attributes"]["ptr.hash"] == "90922c7899a82ea34406fdcdfb95161e"
assert link["attributes"]["link.kind"] == SpanPointersProcessor.LINK_KIND
}
}
}
Expand Down Expand Up @@ -384,6 +381,15 @@ class DynamoDbClientTest extends AgentTestRunner {
operationName "aws.http"
resourceName "DynamoDb.DeleteItem"
spanType DDSpanTypes.HTTP_CLIENT
links {
link(DDTraceId.ZERO, 0, SpanLink.DEFAULT_FLAGS, SpanAttributes.builder()
.put("ptr.kind", SpanPointersProcessor.DYNAMODB_PTR_KIND)
.put("ptr.dir", SpanPointersProcessor.DOWN_DIRECTION)
// First 32 chars of SHA256("dynamodb-one-key-table|id|delete-test-id||")
.put("ptr.hash", "65031164be5e929fddd274a02cba3f9f")
.put("link.kind", SpanPointersProcessor.LINK_KIND)
.build())
}
tags {
defaultTags()
tag "component", "java-aws-sdk"
Expand All @@ -401,18 +407,6 @@ class DynamoDbClientTest extends AgentTestRunner {
tag "span.kind", "client"
tag "aws.requestId", { it != null }
tag "_dd.span_links", { it != null }
// Assert the span links
def spanLinks = tags["_dd.span_links"]
assert spanLinks != null
def links = new JsonSlurper().parseText(spanLinks)
assert links.size() == 1
def link = links[0]
assert link["attributes"] != null
assert link["attributes"]["ptr.kind"] == SpanPointersProcessor.DYNAMODB_PTR_KIND
assert link["attributes"]["ptr.dir"] == SpanPointersProcessor.DOWN_DIRECTION
// First 32 chars of SHA256("dynamodb-one-key-table|id|delete-test-id||")
assert link["attributes"]["ptr.hash"] == "65031164be5e929fddd274a02cba3f9f"
assert link["attributes"]["link.kind"] == SpanPointersProcessor.LINK_KIND
}
}
}
Expand Down Expand Up @@ -486,6 +480,15 @@ class DynamoDbClientTest extends AgentTestRunner {
operationName "aws.http"
resourceName "DynamoDb.DeleteItem"
spanType DDSpanTypes.HTTP_CLIENT
links {
link(DDTraceId.ZERO, 0, SpanLink.DEFAULT_FLAGS, SpanAttributes.builder()
.put("ptr.kind", SpanPointersProcessor.DYNAMODB_PTR_KIND)
.put("ptr.dir", SpanPointersProcessor.DOWN_DIRECTION)
// First 32 chars of SHA256("dynamodb-two-key-table|primaryKey|user-789|sortKey|profile")
.put("ptr.hash", "e5ce1148208c6f88041c73ceb9bbbf3a")
.put("link.kind", SpanPointersProcessor.LINK_KIND)
.build())
}
tags {
defaultTags()
tag "component", "java-aws-sdk"
Expand All @@ -503,18 +506,6 @@ class DynamoDbClientTest extends AgentTestRunner {
tag "span.kind", "client"
tag "aws.requestId", { it != null }
tag "_dd.span_links", { it != null }
// Assert the span links
def spanLinks = tags["_dd.span_links"]
assert spanLinks != null
def links = new JsonSlurper().parseText(spanLinks)
assert links.size() == 1
def link = links[0]
assert link["attributes"] != null
assert link["attributes"]["ptr.kind"] == SpanPointersProcessor.DYNAMODB_PTR_KIND
assert link["attributes"]["ptr.dir"] == SpanPointersProcessor.DOWN_DIRECTION
// First 32 chars of SHA256("dynamodb-two-key-table|primaryKey|user-789|sortKey|profile")
assert link["attributes"]["ptr.hash"] == "e5ce1148208c6f88041c73ceb9bbbf3a"
assert link["attributes"]["link.kind"] == SpanPointersProcessor.LINK_KIND
}
}
}
Expand Down