fix(websteps): use correct input for each URL measurement (#536)

Closes https://github.com/ooni/probe/issues/1798
2021-10-05 12:29:00 +02:00
parent 9b52a050ba
commit 3f511d100b
3 changed files with 11 additions and 5 deletions
@@ -133,8 +133,6 @@ func (mx *Measurer) runAsync(ctx context.Context, sess model.ExperimentSession,
 		ctx, URL, measurex.NewHTTPRequestHeaderForMeasuring(), cookies)
 	for m := range in {
 		out <- &model.ExperimentAsyncTestKeys{
-			MeasurementRuntime: m.TotalRuntime.Seconds(),
-			TestKeys:           &TestKeys{URLMeasurement: m},
 			Extensions: map[string]int64{
 				archival.ExtHTTP.Name:         archival.ExtHTTP.V,
 				archival.ExtDNS.Name:          archival.ExtDNS.V,
@@ -142,6 +140,9 @@ func (mx *Measurer) runAsync(ctx context.Context, sess model.ExperimentSession,
 				archival.ExtTCPConnect.Name:   archival.ExtTCPConnect.V,
 				archival.ExtTLSHandshake.Name: archival.ExtTLSHandshake.V,
 			},
+			Input:              model.MeasurementTarget(m.URL),
+			MeasurementRuntime: m.TotalRuntime.Seconds(),
+			TestKeys:           &TestKeys{URLMeasurement: m},
 		}
 	}
 }