Merge branch 'develop' into fix/fix-scheduling-versioning-migrations

build.gradle

@@ -31,7 +31,7 @@ configure(subprojects.findAll { it.projectDir.toPath().resolve('sql').toFile().e
 
   // Remove distributed SQL as part of `clean` task
   task undoDistributeSql(type: Delete) {
-    doLast { // Explicity do last to avoid running during configuration step
+    doLast { // Explicitly do last to avoid running during configuration step
       file("${sp.projectDir}/sql").list().each {
         delete "$rootDir/deployment/postgres-init-db/sql/$it"
       }

constraints/build.gradle

@@ -12,6 +12,9 @@ java {
 
 test {
   useJUnitPlatform()
+  testLogging {
+    exceptionFormat = 'full'
+  }
 }
 
 jacocoTestReport {

contrib/build.gradle

@@ -15,6 +15,9 @@ java {
 
 test {
   useJUnitPlatform()
+  testLogging {
+    exceptionFormat = 'full'
+  }
 }
 
 jacocoTestReport {

db-tests/build.gradle

@@ -18,6 +18,9 @@ jacocoTestReport {
 
 task e2eTest(type: Test) {
   useJUnitPlatform()
+  testLogging {
+    exceptionFormat = 'full'
+  }
 }
 
 dependencies {

e2e-tests/build.gradle

@@ -43,10 +43,14 @@ task e2eTest(type: Test) {
   // Run the tests in parallel to improve performance
   maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
   useJUnitPlatform()
+
+  testLogging {
+    exceptionFormat = 'full'
+  }
 }
 
 dependencies {
-  testImplementation project(":timeline")
+  testImplementation project(":procedural:timeline")
   testImplementation "com.zaxxer:HikariCP:5.1.0"
   testImplementation("org.postgresql:postgresql:42.6.0")
   testImplementation project(':merlin-driver')

e2e-tests/src/test/java/gov/nasa/jpl/aerie/e2e/SchedulingTests.java

@@ -736,7 +736,7 @@ void beforeEach() throws IOException, InterruptedException {
       // Insert the Plan
       fooPlan = hasura.createPlan(
           fooId,
-          "Foo Plan - Simulation Tests",
+          "Foo Plan - Scheduling Tests",
           "720:00:00",
           planStartTimestamp);
 

examples/banananation/build.gradle

@@ -12,6 +12,9 @@ java {
 
 test {
   useJUnitPlatform()
+  testLogging {
+    exceptionFormat = 'full'
+  }
 }
 
 jacocoTestReport {

examples/config-with-defaults/build.gradle

@@ -19,6 +19,9 @@ jar {
 
 test {
   useJUnitPlatform()
+  testLogging {
+    exceptionFormat = 'full'
+  }
 }
 
 jacocoTestReport {

examples/config-without-defaults/build.gradle

@@ -19,6 +19,9 @@ jar {
 
 test {
   useJUnitPlatform()
+  testLogging {
+    exceptionFormat = 'full'
+  }
 }
 
 jacocoTestReport {

examples/foo-missionmodel/build.gradle

@@ -19,6 +19,9 @@ jar {
 
 test {
   useJUnitPlatform()
+  testLogging {
+    exceptionFormat = 'full'
+  }
 }
 
 jacocoTestReport {

examples/minimal-mission-model/build.gradle

@@ -19,6 +19,9 @@ jar {
 
 test {
   useJUnitPlatform()
+  testLogging {
+    exceptionFormat = 'full'
+  }
 }
 
 jacocoTestReport {

examples/streamline-demo/build.gradle

@@ -19,6 +19,9 @@ jar {
 
 test {
   useJUnitPlatform()
+  testLogging {
+    exceptionFormat = 'full'
+  }
 }
 
 jacocoTestReport {

merlin-driver/build.gradle

@@ -17,6 +17,9 @@ test {
   useJUnitPlatform {
     includeEngines 'jqwik', 'junit-jupiter'
   }
+  testLogging {
+    exceptionFormat = 'full'
+  }
 }
 
 jacocoTestReport {

merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/SimulationDriver.java

@@ -165,11 +165,11 @@ void simulateTask(final MissionModel<Model> missionModel, final TaskFactory<Retu
       }
 
       // Schedule all activities.
-      final var taskId = engine.scheduleTask(elapsedTime, task);
+      final var spanId = engine.scheduleTask(elapsedTime, task);
 
       // Drive the engine until we're out of time.
       // TERMINATION: Actually, we might never break if real time never progresses forward.
-      while (!engine.isTaskComplete(taskId)) {
+      while (!engine.getSpan(spanId).isComplete()) {
         final var batch = engine.extractNextJobs(Duration.MAX_VALUE);
 
         // Increment real time, if necessary.
@@ -233,9 +233,11 @@ private static <Model, Output> TaskFactory<Unit> makeTaskFactory(
   {
     // Emit the current activity (defined by directiveId)
     return executor -> scheduler0 -> TaskStatus.calling((TaskFactory<Output>) (executor1 -> scheduler1 -> {
+      scheduler1.pushSpan();
       scheduler1.emit(directiveId, activityTopic);
       return task.create(executor1).step(scheduler1);
     }), scheduler2 -> {
+      scheduler2.popSpan();
       // When the current activity finishes, get the list of the activities that needed this activity to finish to know their start time
       final List<Pair<ActivityDirectiveId, Duration>> dependents = resolved.get(directiveId) == null ? List.of() : resolved.get(directiveId);
       // Iterate over the dependents