Skip to content
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

Jump to bottom

Simplify TestTraces to reduce specificity #7785

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Simplify TestTraces to reduce specificity #7785

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13c02dd
Simplify TestTraces to reduce specificity
aarongable Nov 4, 2024
0f442f5
Merge branch main into simplify-testtraces
aarongable Nov 4, 2024
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
55 changes: 8 additions & 47 deletions test/integration/otel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,14 +188,6 @@ func httpSpan(endpoint string, children ...expectedSpans) expectedSpans {
}
}

func redisPipelineSpan(op, service string, children ...expectedSpans) expectedSpans {
return expectedSpans{
Operation: "redis.pipeline " + op,
Service: service,
Children: children,
}
}

// TestTraces tests that all the expected spans are present and properly connected
func TestTraces(t *testing.T) {
t.Parallel()
Expand All @@ -206,57 +198,26 @@ func TestTraces(t *testing.T) {
traceID := traceIssuingTestCert(t)

wfe := "boulder-wfe2"
sa := "boulder-sa"
ra := "boulder-ra"
ca := "boulder-ca"

// A very stripped-down version of the expected call graph of a full issuance
// flow: just enough to ensure that our otel tracing is working without
// asserting too much about the exact set of RPCs we use under the hood.
expectedSpans := expectedSpans{
Operation: "TraceTest",
Service: "integration.test",
Children: []expectedSpans{
{Operation: "/directory", Service: wfe},
{Operation: "/acme/new-nonce", Service: wfe, Children: []expectedSpans{
rpcSpan("nonce.NonceService/Nonce", wfe, "nonce-service")}},
httpSpan("/acme/new-acct",
redisPipelineSpan("get", wfe),
redisPipelineSpan("set", wfe),
rpcSpan("sa.StorageAuthorityReadOnly/KeyBlocked", wfe, sa),
rpcSpan("sa.StorageAuthorityReadOnly/GetRegistrationByKey", wfe, sa),
rpcSpan("ra.RegistrationAuthority/NewRegistration", wfe, ra,
rpcSpan("sa.StorageAuthority/KeyBlocked", ra, sa),
rpcSpan("sa.StorageAuthority/NewRegistration", ra, sa))),
httpSpan("/acme/new-order",
rpcSpan("sa.StorageAuthorityReadOnly/GetRegistration", wfe, sa),
redisPipelineSpan("get", wfe),
redisPipelineSpan("set", wfe),
rpcSpan("ra.RegistrationAuthority/NewOrder", wfe, ra,
rpcSpan("sa.StorageAuthority/GetOrderForNames", ra, sa),
rpcSpan("sa.StorageAuthority/NewOrderAndAuthzs", ra, sa))),
httpSpan("/acme/authz-v3/",
rpcSpan("ra.RegistrationAuthority/GetAuthorization", wfe, ra,
rpcSpan("sa.StorageAuthority/GetAuthorization2", ra, sa))),
httpSpan("/acme/chall-v3/",
rpcSpan("ra.RegistrationAuthority/GetAuthorization", wfe, ra,
rpcSpan("sa.StorageAuthority/GetAuthorization2", ra, sa)),
rpcSpan("ra.RegistrationAuthority/PerformValidation", wfe, ra,
rpcSpan("sa.StorageAuthority/GetRegistration", ra, sa))),
httpSpan("/acme/new-acct"),
httpSpan("/acme/new-order"),
httpSpan("/acme/authz-v3/"),
httpSpan("/acme/chall-v3/"),
httpSpan("/acme/finalize/",
rpcSpan("sa.StorageAuthorityReadOnly/GetOrder", wfe, sa),
rpcSpan("ra.RegistrationAuthority/FinalizeOrder", wfe, ra,
rpcSpan("sa.StorageAuthority/KeyBlocked", ra, sa),
rpcSpan("sa.StorageAuthority/GetRegistration", ra, sa),
rpcSpan("sa.StorageAuthority/GetValidOrderAuthorizations2", ra, sa),
rpcSpan("sa.StorageAuthority/SetOrderProcessing", ra, sa),
rpcSpan("ca.CertificateAuthority/IssuePrecertificate", ra, ca),
redisPipelineSpan("get", ra),
rpcSpan("Publisher/SubmitToSingleCTWithResult", ra, "boulder-publisher"),
rpcSpan("ca.CertificateAuthority/IssueCertificateForPrecertificate", ra, ca),
redisPipelineSpan("set", ra),
rpcSpan("sa.StorageAuthority/FinalizeOrder", ra, sa))),
httpSpan("/acme/order/",
rpcSpan("sa.StorageAuthorityReadOnly/GetOrder", wfe, sa)),
httpSpan("/acme/cert/",
rpcSpan("sa.StorageAuthorityReadOnly/GetCertificate", wfe, sa)),
rpcSpan("ca.CertificateAuthority/IssueCertificateForPrecertificate", ra, ca))),
},
}

Expand Down