refactor(minipipeline): tweak HTTP code (ooni#1414)

The general idea here is to have more orthogonal metrics and to have simpler code to implement them. Part of ooni/probe#2634
Murphy-OrangeMud · Feb 13, 2024 · 784495d · 784495d
1 parent 98d066b
commit 784495d
Show file tree

Hide file tree

Showing 70 changed files with 486 additions and 875 deletions.
diff --git a/internal/cmd/minipipeline/testdata/analysis.json b/internal/cmd/minipipeline/testdata/analysis.json
@@ -15,19 +15,16 @@
   "TLSHandshakeUnexplainedFailureDuringWebFetch": [],
   "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [],
   "HTTPRoundTripUnexpectedFailure": [],
-  "DNSExperimentFailure": null,
-  "DNSPossiblyNonexistingDomains": {},
+  "HTTPFinalResponseSuccessTLSWithoutControl": null,
+  "HTTPFinalResponseSuccessTLSWithControl": 4,
+  "HTTPFinalResponseSuccessTCPWithControl": null,
   "HTTPDiffBodyProportionFactor": 1,
   "HTTPDiffStatusCodeMatch": true,
   "HTTPDiffTitleDifferentLongWords": {},
   "HTTPDiffUncommonHeadersIntersection": {
     "x-drupal-cache": true,
     "x-generator": true
   },
-  "HTTPFinalResponsesWithControl": {
-    "4": true
-  },
-  "HTTPFinalResponsesWithTLS": {
-    "4": true
-  }
+  "DNSExperimentFailure": null,
+  "DNSPossiblyNonexistingDomains": {}
 }
diff --git a/internal/cmd/minipipeline/testdata/analysis_classic.json b/internal/cmd/minipipeline/testdata/analysis_classic.json
@@ -15,19 +15,16 @@
   "TLSHandshakeUnexplainedFailureDuringWebFetch": [],
   "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [],
   "HTTPRoundTripUnexpectedFailure": [],
-  "DNSExperimentFailure": null,
-  "DNSPossiblyNonexistingDomains": null,
+  "HTTPFinalResponseSuccessTLSWithoutControl": null,
+  "HTTPFinalResponseSuccessTLSWithControl": 4,
+  "HTTPFinalResponseSuccessTCPWithControl": null,
   "HTTPDiffBodyProportionFactor": 1,
   "HTTPDiffStatusCodeMatch": true,
   "HTTPDiffTitleDifferentLongWords": {},
   "HTTPDiffUncommonHeadersIntersection": {
     "x-drupal-cache": true,
     "x-generator": true
   },
-  "HTTPFinalResponsesWithControl": {
-    "4": true
-  },
-  "HTTPFinalResponsesWithTLS": {
-    "4": true
-  }
+  "DNSExperimentFailure": null,
+  "DNSPossiblyNonexistingDomains": null
 }