From 13c02dd54a2c2f7f8b511e8469b442fcd7759586 Mon Sep 17 00:00:00 2001
From: Aaron Gable <aaron@letsencrypt.org>
Date: Mon, 4 Nov 2024 11:11:23 -0800
Subject: [PATCH] Simplify TestTraces to reduce specificity

(cherry picked from commit c9159be23b910a6674487a45a8a52942aa7245ae)
---
 test/integration/otel_test.go | 55 +++++------------------------------
 1 file changed, 8 insertions(+), 47 deletions(-)

diff --git a/test/integration/otel_test.go b/test/integration/otel_test.go
index f8ac7f92d66..d9ca2ae7f0f 100644
--- a/test/integration/otel_test.go
+++ b/test/integration/otel_test.go
@@ -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()
@@ -206,10 +198,12 @@ 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",
@@ -217,46 +211,13 @@ func TestTraces(t *testing.T) {
 			{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))),
 		},
 	}