Merge pull request #620 from ooni/oonirun/add-run-id-to-anotations

Adds `ooni_run_link_id` to annotations
ooni · Oct 11, 2023 · c152544 · c152544
2 parents 368b509 + c0d34c2
commit c152544
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/app/src/main/java/org/openobservatory/ooniprobe/model/database/TestDescriptor.java b/app/src/main/java/org/openobservatory/ooniprobe/model/database/TestDescriptor.java
@@ -263,6 +263,7 @@ public OONIRunSuite getTestSuite(Context context) {
                         for (String url : nettest.getInputs())
                             Url.checkExistingUrl(url);
                     }
+                    test.setOoniRunLinkId(runId);
                     test.setInputs(nettest.getInputs());
                     return test;
                 }

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/model/settings/Settings.java b/app/src/main/java/org/openobservatory/ooniprobe/model/settings/Settings.java
@@ -77,6 +77,10 @@ public void setOrigin(String origin) {
 		annotations.origin = origin;
 	}
 
+	public void setOoniRunLinkId(Long ooniRunLinkId) {
+		annotations.ooniRunLinkId = String.valueOf(ooniRunLinkId);
+	}
+
 	private class OONIMKTaskConfigAdapter implements OONIMKTaskConfig {
 		private String serialized;
 		private Settings settings;
@@ -103,6 +107,9 @@ public static class Annotations {
 		@SerializedName("origin")
 		public String origin;
 
+		@SerializedName("ooni_run_link_id")
+		public String ooniRunLinkId;
+
 		public Annotations(Context c) {
 			this.network_type = ReachabilityManager.getNetworkType(c);
 			this.flavor = BuildConfig.FLAVOR;

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/test/test/AbstractTest.java b/app/src/main/java/org/openobservatory/ooniprobe/test/test/AbstractTest.java
@@ -52,6 +52,7 @@ public abstract class AbstractTest implements Serializable {
     private final int urlResId;
     private final int runtime;
     private List<String> inputs;
+    private Long ooniRunLinkId;
     private Integer max_runtime;
     private Network network;
 
@@ -81,6 +82,9 @@ void run(Context c, PreferenceManager pm, AppLogger logger, Gson gson, Settings
         settings.inputs = inputs;
         settings.setMaxRuntime(max_runtime);
         settings.setOrigin(origin);
+        if (ooniRunLinkId != null && ooniRunLinkId > 0) {
+            settings.setOoniRunLinkId(ooniRunLinkId);
+        }
         measurements = new SparseArray<>();
 
         ThirdPartyServices.addLogExtra("settings", ((Application) c.getApplicationContext()).getGson().toJson(settings));
@@ -349,7 +353,11 @@ public void setInputs(List<String> inputs) {
         this.inputs = inputs;
     }
 
-    public Integer getMax_runtime() {
+	public void setOoniRunLinkId(Long ooniRunLinkId) {
+		this.ooniRunLinkId = ooniRunLinkId;
+	}
+
+	public Integer getMax_runtime() {
         return max_runtime;
     }