Skip to content

Improve detail of E2E test assertions #4543

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
adinauer merged 11 commits into from
Jul 8, 2025
Merged

Improve detail of E2E test assertions #4543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d533746
Bump OTel SDK to 1.51.0, instrumentation to 2.17.0 and semconv to 1.34.0
adinauer Jul 1, 2025
3166922
Restore span names for GraphQL on the new version of OpenTelemetry (b…
adinauer Jul 3, 2025
3b663e8
Merge branch 'main' into feat/bump-otel-1_51_0
adinauer Jul 3, 2025
12959a7
more assertions for e2e tests
adinauer Jul 4, 2025
81aa960
Use non alpha version for semconv
adinauer Jul 4, 2025
5f65fa7
Merge branch 'feat/bump-otel-1_51_0' into feat/more-detailed-e2e-asse…
adinauer Jul 4, 2025
162ec3b
Merge branch 'main' into feat/more-detailed-e2e-assertions
adinauer Jul 7, 2025
c413fb1
fix changelog
adinauer Jul 7, 2025
20f0231
Format code
getsentry-bot Jul 7, 2025
f10f259
Merge branch 'main' into feat/more-detailed-e2e-assertions
adinauer Jul 8, 2025
4d67f9c
api file and format
adinauer Jul 8, 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
12 changes: 10 additions & 2 deletions ...a-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/GraphqlGreetingSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ class GraphqlGreetingSystemTest {

testHelper.ensureNoErrors(response)
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithDescription(transaction, "Query.greeting")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"graphql",
"Query.greeting",
)
}
}

Expand All @@ -32,7 +36,11 @@ class GraphqlGreetingSystemTest {
error.message?.message?.startsWith("Unresolved RuntimeException for executionId ") ?: false
}
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithDescription(transaction, "Query.greeting")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"graphql",
"Query.greeting",
)
}
}
}
18 changes: 15 additions & 3 deletions ...ta-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/GraphqlProjectSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ class GraphqlProjectSystemTest {
testHelper.ensureNoErrors(response)
assertEquals("proj-slug", response?.data?.project?.slug)
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithDescription(transaction, "Query.project")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"graphql",
"Query.project",
)
}
}

Expand All @@ -34,7 +38,11 @@ class GraphqlProjectSystemTest {
testHelper.ensureNoErrors(response)
assertNotNull(response?.data?.addProject)
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithDescription(transaction, "Mutation.addProject")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"graphql",
"Mutation.addProject",
)
}
}

Expand All @@ -48,7 +56,11 @@ class GraphqlProjectSystemTest {
error.message?.message?.startsWith("Unresolved RuntimeException for executionId ") ?: false
}
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithDescription(transaction, "Mutation.addProject")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"graphql",
"Mutation.addProject",
)
}
}
}
6 changes: 5 additions & 1 deletion ...karta-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/GraphqlTaskSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ class GraphqlTaskSystemTest {
assertEquals("C3", firstTask.creator?.id)

testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithDescription(transaction, "Query.tasks")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"graphql",
"Query.tasks",
)
}
}
}
65 changes: 64 additions & 1 deletion ...ot-jakarta-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,70 @@ class PersonSystemTest {

testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughOtelApi") &&
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi")
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi") &&
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"db",
"insert into person (firstName, lastName) values (?, ?)",
)
}
}

@Test
fun `create person creates transaction if no sampled flag in sentry-trace header`() {
val restClient = testHelper.restClient
val person = Person("firstA", "lastB")
val returnedPerson =
restClient.createPerson(
person,
mapOf(
"sentry-trace" to "f9118105af4a2d42b4124532cd1065ff-424cffc8f94feeee",
"baggage" to
"sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rate=1,sentry-trace_id=f9118105af4a2d42b4124532cd1065ff,sentry-transaction=HTTP%20GET",
),
)
assertEquals(200, restClient.lastKnownStatusCode)

assertEquals(person.firstName, returnedPerson!!.firstName)
assertEquals(person.lastName, returnedPerson!!.lastName)

testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughOtelApi") &&
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi") &&
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"db",
"insert into person (firstName, lastName) values (?, ?)",
)
}
}

@Test
fun `create person creates transaction if sampled true in sentry-trace header`() {
val restClient = testHelper.restClient
val person = Person("firstA", "lastB")
val returnedPerson =
restClient.createPerson(
person,
mapOf(
"sentry-trace" to "f9118105af4a2d42b4124532cd1065ff-424cffc8f94feeee-1",
"baggage" to
"sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rate=1,sentry-trace_id=f9118105af4a2d42b4124532cd1065ff,sentry-transaction=HTTP%20GET",
),
)
assertEquals(200, restClient.lastKnownStatusCode)

assertEquals(person.firstName, returnedPerson!!.firstName)
assertEquals(person.lastName, returnedPerson!!.lastName)

testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughOtelApi") &&
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi") &&
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"db",
"insert into person (firstName, lastName) values (?, ?)",
)
}
}
}
18 changes: 15 additions & 3 deletions ...boot-jakarta-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/TodoSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ class TodoSystemTest {
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "todoSpanOtelApi") &&
testHelper.doesTransactionContainSpanWithOp(transaction, "todoSpanSentryApi") &&
testHelper.doesTransactionContainSpanWithOp(transaction, "http.client")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"http.client",
"GET https://jsonplaceholder.typicode.com/todos/1",
)
}
}

Expand All @@ -34,7 +38,11 @@ class TodoSystemTest {
assertEquals(200, restClient.lastKnownStatusCode)

testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "http.client")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"http.client",
"GET https://jsonplaceholder.typicode.com/todos/1",
)
}
}

Expand All @@ -47,7 +55,11 @@ class TodoSystemTest {
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "todoRestClientSpanOtelApi") &&
testHelper.doesTransactionContainSpanWithOp(transaction, "todoRestClientSpanSentryApi") &&
testHelper.doesTransactionContainSpanWithOp(transaction, "http.client")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"http.client",
"GET https://jsonplaceholder.typicode.com/todos/1",
)
}
}
}
12 changes: 10 additions & 2 deletions ...t-jakarta-opentelemetry/src/test/kotlin/io/sentry/systemtest/GraphqlGreetingSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ class GraphqlGreetingSystemTest {

testHelper.ensureNoErrors(response)
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "query GreetingQuery")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"query GreetingQuery",
"query GreetingQuery",
)
}
}

Expand All @@ -32,7 +36,11 @@ class GraphqlGreetingSystemTest {
error.message?.message?.startsWith("Unresolved RuntimeException for executionId ") ?: false
}
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "query GreetingQuery")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"query GreetingQuery",
"query GreetingQuery",
)
}
}
}
18 changes: 15 additions & 3 deletions ...ot-jakarta-opentelemetry/src/test/kotlin/io/sentry/systemtest/GraphqlProjectSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ class GraphqlProjectSystemTest {
testHelper.ensureNoErrors(response)
assertEquals("proj-slug", response?.data?.project?.slug)
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "query ProjectQuery")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"query ProjectQuery",
"query ProjectQuery",
)
}
}

Expand All @@ -34,7 +38,11 @@ class GraphqlProjectSystemTest {
testHelper.ensureNoErrors(response)
assertNotNull(response?.data?.addProject)
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "mutation AddProjectMutation")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"mutation AddProjectMutation",
"mutation AddProjectMutation",
)
}
}

Expand All @@ -48,7 +56,11 @@ class GraphqlProjectSystemTest {
error.message?.message?.startsWith("Unresolved RuntimeException for executionId ") ?: false
}
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "mutation AddProjectMutation")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"mutation AddProjectMutation",
"mutation AddProjectMutation",
)
}
}
}
6 changes: 5 additions & 1 deletion ...-boot-jakarta-opentelemetry/src/test/kotlin/io/sentry/systemtest/GraphqlTaskSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ class GraphqlTaskSystemTest {
assertEquals("C3", firstTask.creator?.id)

testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "query TasksAndAssigneesQuery")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"query TasksAndAssigneesQuery",
"query TasksAndAssigneesQuery",
)
}
}
}
65 changes: 64 additions & 1 deletion ...pring-boot-jakarta-opentelemetry/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,70 @@ class PersonSystemTest {

testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughOtelApi") &&
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi")
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi") &&
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"db",
"insert into person (firstName, lastName) values (?, ?)",
)
}
}

@Test
fun `create person creates transaction if no sampled flag in sentry-trace header`() {
val restClient = testHelper.restClient
val person = Person("firstA", "lastB")
val returnedPerson =
restClient.createPerson(
person,
mapOf(
"sentry-trace" to "f9118105af4a2d42b4124532cd1065ff-424cffc8f94feeee",
"baggage" to
"sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rate=1,sentry-trace_id=f9118105af4a2d42b4124532cd1065ff,sentry-transaction=HTTP%20GET",
),
)
assertEquals(200, restClient.lastKnownStatusCode)

assertEquals(person.firstName, returnedPerson!!.firstName)
assertEquals(person.lastName, returnedPerson!!.lastName)

testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughOtelApi") &&
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi") &&
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"db",
"insert into person (firstName, lastName) values (?, ?)",
)
}
}

@Test
fun `create person creates transaction if sampled true in sentry-trace header`() {
val restClient = testHelper.restClient
val person = Person("firstA", "lastB")
val returnedPerson =
restClient.createPerson(
person,
mapOf(
"sentry-trace" to "f9118105af4a2d42b4124532cd1065ff-424cffc8f94feeee-1",
"baggage" to
"sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rate=1,sentry-trace_id=f9118105af4a2d42b4124532cd1065ff,sentry-transaction=HTTP%20GET",
),
)
assertEquals(200, restClient.lastKnownStatusCode)

assertEquals(person.firstName, returnedPerson!!.firstName)
assertEquals(person.lastName, returnedPerson!!.lastName)

testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughOtelApi") &&
testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi") &&
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"db",
"insert into person (firstName, lastName) values (?, ?)",
)
}
}
}
12 changes: 10 additions & 2 deletions ...-spring-boot-jakarta-opentelemetry/src/test/kotlin/io/sentry/systemtest/TodoSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ class TodoSystemTest {
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "todoSpanOtelApi") &&
testHelper.doesTransactionContainSpanWithOp(transaction, "todoSpanSentryApi") &&
testHelper.doesTransactionContainSpanWithOp(transaction, "http.client")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"http.client",
"GET https://jsonplaceholder.typicode.com/todos/1",
)
}
}

Expand All @@ -34,7 +38,11 @@ class TodoSystemTest {
assertEquals(200, restClient.lastKnownStatusCode)

testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithOp(transaction, "http.client")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"http.client",
"GET https://jsonplaceholder.typicode.com/todos/1",
)
}
}

Expand Down
12 changes: 10 additions & 2 deletions ...les-spring-boot-jakarta/src/test/kotlin/io/sentry/systemtest/GraphqlGreetingSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ class GraphqlGreetingSystemTest {

testHelper.ensureNoErrors(response)
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithDescription(transaction, "Query.greeting")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"graphql",
"Query.greeting",
)
}
}

Expand All @@ -32,7 +36,11 @@ class GraphqlGreetingSystemTest {
error.message?.message?.startsWith("Unresolved RuntimeException for executionId ") ?: false
}
testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
testHelper.doesTransactionContainSpanWithDescription(transaction, "Query.greeting")
testHelper.doesTransactionContainSpanWithOpAndDescription(
transaction,
"graphql",
"Query.greeting",
)
}
}
}
Loading
Loading