fix(webconnectivitylte): add 10k*i scope to all IDs (#1513)

Arguably IDs starting from 10k for getaddrinfo more obviously have a scope. Related to ooni/probe#2677.
ooni · Feb 13, 2024 · 5f716f2 · 5f716f2
1 parent a37f0d2
commit 5f716f2
Show file tree

Hide file tree

Showing 241 changed files with 4,594 additions and 4,594 deletions.
diff --git a/internal/experiment/webconnectivitylte/idgenerator.go b/internal/experiment/webconnectivitylte/idgenerator.go
@@ -3,11 +3,11 @@ package webconnectivitylte
 import "sync/atomic"
 
 const (
-	idGeneratorGetaddrinfoOffset       = 0
-	idGeneratorDNSOverUDPOffset        = 10_000
-	idGeneratorDNSOverHTTPSOffset      = 20_000
-	idGeneratorEndpointCleartextOffset = 30_000
-	idGeneratorEndpointSecureOffset    = 40_000
+	idGeneratorGetaddrinfoOffset       = 10_000
+	idGeneratorDNSOverUDPOffset        = 20_000
+	idGeneratorDNSOverHTTPSOffset      = 30_000
+	idGeneratorEndpointCleartextOffset = 40_000
+	idGeneratorEndpointSecureOffset    = 50_000
 )
 
 // IDGenerator helps with generating IDs that neatly fall into namespaces.

diff --git a/...inipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis.json b/...inipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis.json
@@ -6,22 +6,22 @@
     "FinalResponseFailure": "unknown_error"
   },
   "DNSLookupSuccess": [
-    1,
     10001,
-    20001
+    20001,
+    30001
   ],
   "DNSLookupSuccessWithInvalidAddresses": [],
   "DNSLookupSuccessWithValidAddress": [
-    1,
     10001,
-    20001
+    20001,
+    30001
   ],
   "DNSLookupSuccessWithBogonAddresses": [],
   "DNSLookupSuccessWithInvalidAddressesClassic": [],
   "DNSLookupSuccessWithValidAddressClassic": [
-    1,
     10001,
-    20001
+    20001,
+    30001
   ],
   "DNSLookupUnexpectedFailure": [],
   "DNSLookupUnexplainedFailure": [],
@@ -36,7 +36,7 @@
   "TCPConnectUnexplainedFailureDuringWebFetch": [],
   "TCPConnectUnexplainedFailureDuringConnectivityCheck": [],
   "TLSHandshakeExpectedFailure": [
-    40001
+    50001
   ],
   "TLSHandshakeUnexpectedFailure": [],
   "TLSHandshakeUnexpectedFailureDuringWebFetch": [],
@@ -59,9 +59,9 @@
       "TagDepth": 0,
       "Type": 2,
       "Failure": "ssl_invalid_certificate",
-      "TransactionID": 40001,
+      "TransactionID": 50001,
       "TagFetchBody": true,
-      "DNSTransactionID": 20001,
+      "DNSTransactionID": 30001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "",
       "DNSQueryType": null,
@@ -73,7 +73,7 @@
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
       "IPAddressBogon": false,
-      "EndpointTransactionID": 40001,
+      "EndpointTransactionID": 50001,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "104.154.89.105:443",
@@ -106,9 +106,9 @@
       "TagDepth": 0,
       "Type": 0,
       "Failure": "",
-      "TransactionID": 20001,
+      "TransactionID": 30001,
       "TagFetchBody": null,
-      "DNSTransactionID": 20001,
+      "DNSTransactionID": 30001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "",
       "DNSQueryType": "A",
@@ -153,9 +153,9 @@
       "TagDepth": 0,
       "Type": 0,
       "Failure": "",
-      "TransactionID": 10001,
+      "TransactionID": 20001,
       "TagFetchBody": null,
-      "DNSTransactionID": 10001,
+      "DNSTransactionID": 20001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "",
       "DNSQueryType": "A",
@@ -200,9 +200,9 @@
       "TagDepth": 0,
       "Type": 0,
       "Failure": "",
-      "TransactionID": 1,
+      "TransactionID": 10001,
       "TagFetchBody": null,
-      "DNSTransactionID": 1,
+      "DNSTransactionID": 10001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "",
       "DNSQueryType": "ANY",
@@ -247,9 +247,9 @@
       "TagDepth": 0,
       "Type": 0,
       "Failure": "dns_no_answer",
-      "TransactionID": 20001,
+      "TransactionID": 30001,
       "TagFetchBody": null,
-      "DNSTransactionID": 20001,
+      "DNSTransactionID": 30001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "dns_no_answer",
       "DNSQueryType": "AAAA",
@@ -292,9 +292,9 @@
       "TagDepth": 0,
       "Type": 0,
       "Failure": "dns_no_answer",
-      "TransactionID": 10001,
+      "TransactionID": 20001,
       "TagFetchBody": null,
-      "DNSTransactionID": 10001,
+      "DNSTransactionID": 20001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "dns_no_answer",
       "DNSQueryType": "AAAA",

diff --git a/...ine/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis_classic.json b/...ine/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis_classic.json
@@ -6,16 +6,16 @@
     "FinalResponseFailure": "unknown_error"
   },
   "DNSLookupSuccess": [
-    1
+    10001
   ],
   "DNSLookupSuccessWithInvalidAddresses": [],
   "DNSLookupSuccessWithValidAddress": [
-    1
+    10001
   ],
   "DNSLookupSuccessWithBogonAddresses": [],
   "DNSLookupSuccessWithInvalidAddressesClassic": [],
   "DNSLookupSuccessWithValidAddressClassic": [
-    1
+    10001
   ],
   "DNSLookupUnexpectedFailure": [],
   "DNSLookupUnexplainedFailure": [],
@@ -30,7 +30,7 @@
   "TCPConnectUnexplainedFailureDuringWebFetch": [],
   "TCPConnectUnexplainedFailureDuringConnectivityCheck": [],
   "TLSHandshakeExpectedFailure": [
-    40001
+    50001
   ],
   "TLSHandshakeUnexpectedFailure": [],
   "TLSHandshakeUnexpectedFailureDuringWebFetch": [],
@@ -53,9 +53,9 @@
       "TagDepth": 0,
       "Type": 2,
       "Failure": "ssl_invalid_certificate",
-      "TransactionID": 40001,
+      "TransactionID": 50001,
       "TagFetchBody": true,
-      "DNSTransactionID": 20001,
+      "DNSTransactionID": 30001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "",
       "DNSQueryType": null,
@@ -67,7 +67,7 @@
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
       "IPAddressBogon": false,
-      "EndpointTransactionID": 40001,
+      "EndpointTransactionID": 50001,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "104.154.89.105:443",
@@ -100,9 +100,9 @@
       "TagDepth": 0,
       "Type": 0,
       "Failure": "",
-      "TransactionID": 1,
+      "TransactionID": 10001,
       "TagFetchBody": null,
-      "DNSTransactionID": 1,
+      "DNSTransactionID": 10001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "",
       "DNSQueryType": "ANY",

diff --git a/...pipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/measurement.json b/...pipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/measurement.json
@@ -58,7 +58,7 @@
         "tags": [
           "depth=0"
         ],
-        "transaction_id": 20001
+        "transaction_id": 30001
       },
       {
         "answers": null,
@@ -73,7 +73,7 @@
         "tags": [
           "depth=0"
         ],
-        "transaction_id": 20001
+        "transaction_id": 30001
       },
       {
         "answers": [
@@ -96,7 +96,7 @@
         "tags": [
           "depth=0"
         ],
-        "transaction_id": 1
+        "transaction_id": 10001
       },
       {
         "answers": [
@@ -119,7 +119,7 @@
         "tags": [
           "depth=0"
         ],
-        "transaction_id": 10001
+        "transaction_id": 20001
       },
       {
         "answers": null,
@@ -134,7 +134,7 @@
         "tags": [
           "depth=0"
         ],
-        "transaction_id": 10001
+        "transaction_id": 20001
       }
     ],
     "requests": [],
@@ -151,7 +151,7 @@
           "depth=0",
           "fetch_body=true"
         ],
-        "transaction_id": 40001
+        "transaction_id": 50001
       }
     ],
     "tls_handshakes": [
@@ -170,7 +170,7 @@
           "fetch_body=true"
         ],
         "tls_version": "",
-        "transaction_id": 40001
+        "transaction_id": 50001
       }
     ],
     "x_control_request": {

diff --git a/...ipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json b/...ipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json
@@ -4,9 +4,9 @@
       "TagDepth": 0,
       "Type": 0,
       "Failure": "dns_no_answer",
-      "TransactionID": 20001,
+      "TransactionID": 30001,
       "TagFetchBody": null,
-      "DNSTransactionID": 20001,
+      "DNSTransactionID": 30001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "dns_no_answer",
       "DNSQueryType": "AAAA",
@@ -49,9 +49,9 @@
       "TagDepth": 0,
       "Type": 0,
       "Failure": "dns_no_answer",
-      "TransactionID": 10001,
+      "TransactionID": 20001,
       "TagFetchBody": null,
-      "DNSTransactionID": 10001,
+      "DNSTransactionID": 20001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "dns_no_answer",
       "DNSQueryType": "AAAA",
@@ -96,9 +96,9 @@
       "TagDepth": 0,
       "Type": 0,
       "Failure": "",
-      "TransactionID": 20001,
+      "TransactionID": 30001,
       "TagFetchBody": null,
-      "DNSTransactionID": 20001,
+      "DNSTransactionID": 30001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "",
       "DNSQueryType": "A",
@@ -143,9 +143,9 @@
       "TagDepth": 0,
       "Type": 0,
       "Failure": "",
-      "TransactionID": 1,
+      "TransactionID": 10001,
       "TagFetchBody": null,
-      "DNSTransactionID": 1,
+      "DNSTransactionID": 10001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "",
       "DNSQueryType": "ANY",
@@ -190,9 +190,9 @@
       "TagDepth": 0,
       "Type": 0,
       "Failure": "",
-      "TransactionID": 10001,
+      "TransactionID": 20001,
       "TagFetchBody": null,
-      "DNSTransactionID": 10001,
+      "DNSTransactionID": 20001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "",
       "DNSQueryType": "A",
@@ -235,13 +235,13 @@
     }
   ],
   "KnownTCPEndpoints": {
-    "40001": {
+    "50001": {
       "TagDepth": 0,
       "Type": 2,
       "Failure": "ssl_invalid_certificate",
-      "TransactionID": 40001,
+      "TransactionID": 50001,
       "TagFetchBody": true,
-      "DNSTransactionID": 20001,
+      "DNSTransactionID": 30001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "",
       "DNSQueryType": null,
@@ -253,7 +253,7 @@
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
       "IPAddressBogon": false,
-      "EndpointTransactionID": 40001,
+      "EndpointTransactionID": 50001,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "104.154.89.105:443",

diff --git a/...testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations_classic.json b/...testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations_classic.json
@@ -5,9 +5,9 @@
       "TagDepth": 0,
       "Type": 0,
       "Failure": "",
-      "TransactionID": 1,
+      "TransactionID": 10001,
       "TagFetchBody": null,
-      "DNSTransactionID": 1,
+      "DNSTransactionID": 10001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "",
       "DNSQueryType": "ANY",
@@ -50,13 +50,13 @@
     }
   ],
   "KnownTCPEndpoints": {
-    "40001": {
+    "50001": {
       "TagDepth": 0,
       "Type": 2,
       "Failure": "ssl_invalid_certificate",
-      "TransactionID": 40001,
+      "TransactionID": 50001,
       "TagFetchBody": true,
-      "DNSTransactionID": 20001,
+      "DNSTransactionID": 30001,
       "DNSDomain": "expired.badssl.com",
       "DNSLookupFailure": "",
       "DNSQueryType": null,
@@ -68,7 +68,7 @@
       "IPAddress": "104.154.89.105",
       "IPAddressASN": 396982,
       "IPAddressBogon": false,
-      "EndpointTransactionID": 40001,
+      "EndpointTransactionID": 50001,
       "EndpointProto": "tcp",
       "EndpointPort": "443",
       "EndpointAddress": "104.154.89.105:443",