Fix build scan link log parsing for multiple tasks (#148)

pom.xml

@@ -35,10 +35,10 @@
     </scm>
 
     <properties>
-        <bamboo.version>7.2.10</bamboo.version>
+        <bamboo.version>8.2.9</bamboo.version>
         <bamboo.data.version>${bamboo.version}</bamboo.data.version>
         <bamboo.product.data.path>
-            ${basedir}/src/test/resources/generated-test-resources-692-license-723.zip
+            ${basedir}/src/test/resources/generated-test-resources-8_2_9.zip
         </bamboo.product.data.path>
         <amps.version>8.13.6</amps.version>
         <atlassian.spring.scanner.version>4.0.0</atlassian.spring.scanner.version>
@@ -405,19 +405,23 @@
     </build>
 
     <profiles>
+        <!--
+            - Bamboo 9.2.4 introduced a db schema breaking change, requiring to generate specific test resources
+            - Bamboo 9.3.0 requires Java 11 or 12
+        -->
         <profile>
             <id>bamboo924OrLater</id>
             <properties>
                 <bamboo.product.data.path>
-                    ${basedir}/src/test/resources/generated-test-resources-923.zip
+                    ${basedir}/src/test/resources/generated-test-resources-9_2_13.zip
                 </bamboo.product.data.path>
             </properties>
         </profile>
         <profile>
-            <id>bamboo93OrLater</id> <!-- same as bamboo924OrLater, but requires Java 11 -->
+            <id>bamboo93OrLater</id>
             <properties>
                 <bamboo.product.data.path>
-                    ${basedir}/src/test/resources/generated-test-resources-923.zip
+                    ${basedir}/src/test/resources/generated-test-resources-9_2_13.zip
                 </bamboo.product.data.path>
                 <required.java.version>[11,12)</required.java.version>
             </properties>

src/main/java/com/gradle/develocity/bamboo/AbstractBuildScanInjector.java

@@ -33,7 +33,7 @@ protected final void setupBuildScansLogInterceptor(BuildContext buildContext) {
         BuildLogger buildLogger = buildLoggerManager.getLogger(buildContext.getPlanResultKey());
         buildLogger
             .getInterceptorStack()
-            .add(new BuildScanLogScanner(new BuildScanCollector(buildContext)));
+            .addForJob(new BuildScanLogScanner(new BuildScanCollector(buildContext)));
     }
 
     protected final void registerDevelocityResources(BuildContext buildContext, File... resources) {

src/test/java/it/com/gradle/develocity/bamboo/injection/GradleInjectionTest.java

@@ -13,13 +13,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import java.util.Arrays;
+import java.util.List;
+
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class GradleInjectionTest extends AbstractInjectionTest {
@@ -186,9 +184,9 @@ void skipsAutoInjectionIfRepositoryShouldBeExcluded(String buildKey) {
     void enforceUrlOverridesConfiguredUrlInProject() {
         // given
         ensurePluginConfiguration(form -> form
-                .setServer("http://localhost:8888")
-                .setDevelocityPluginVersion(DEVELOCITY_PLUGIN_VERSION)
-                .enforceUrl()
+            .setServer("http://localhost:8888")
+            .setDevelocityPluginVersion(DEVELOCITY_PLUGIN_VERSION)
+            .enforceUrl()
         );
 
         PlanKey planKey = PlanKeys.getPlanKey(PROJECT_KEY, "GPPA");
@@ -211,4 +209,27 @@ void enforceUrlOverridesConfiguredUrlInProject() {
         assertThat(output, containsString("http://localhost:8888/"));
     }
 
+    @Test
+    void buildScanLinksAreDetectedForMultipleTasks() {
+        // given
+        ensurePluginConfiguration(form -> form
+            .setServer(mockDevelocityServer.getAddress())
+            .setDevelocityPluginVersion(DEVELOCITY_PLUGIN_VERSION)
+        );
+
+        // Project with 2 tasks
+        PlanKey planKey = PlanKeys.getPlanKey(PROJECT_KEY, "GPMT");
+        JobKey jobKey = Iterables.getOnlyElement(bambooApi.getJobs(planKey)).getKey();
+
+        // when
+        PlanResultKey planResultKey = triggerBuild(planKey, jobKey);
+        waitForBuildToFinish(planResultKey);
+
+        // then
+        List<String> buildScans = getBuildScansFromMetadata(planResultKey).map(s -> Arrays.asList(s.split(","))).orElse(null);
+        assertThat(buildScans, notNullValue());
+        assertThat(buildScans.size(), equalTo(2));
+        assertThat(buildScans, everyItem(containsString(mockDevelocityServer.getAddress().toString())));
+    }
+
 }