Merge pull request #73 from DataSQRL/easy-coverage

Easy coverage

Author: velo

.mvn/extensions.xml

@@ -0,0 +1,24 @@
+<!--
+
+    Copyright © 2024 DataSQRL (contact@datasqrl.com)
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<extensions>
+  <extension>
+    <groupId>com.marvinformatics.jacoco</groupId>
+    <artifactId>easy-jacoco-maven-plugin</artifactId>
+    <version>0.1.1</version>
+  </extension>
+</extensions>

flink-sql-runner/pom.xml

@@ -272,6 +272,23 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>com.marvinformatics.jacoco</groupId>
+        <artifactId>easy-jacoco-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>instrument-uber-jar</id>
+            <goals>
+              <goal>instrument-jar</goal>
+            </goals>
+            <configuration>
+              <source>${project.build.directory}/flink-sql-runner.uber.jar</source>
+              <destination>${project.build.directory}/flink-sql-runner.jacoco.jar</destination>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>

flink-sql-runner/src/test/java/com/datasqrl/FlinkMainIT.java

@@ -29,11 +29,6 @@
 import com.nextbreakpoint.flink.client.model.TerminationMode;
 import com.nextbreakpoint.flink.client.model.UploadStatus;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.sql.SQLException;
@@ -50,8 +45,6 @@
 import org.apache.flink.shaded.curator5.com.google.common.base.Objects;
 import org.apache.flink.shaded.curator5.com.google.common.collect.Lists;
 import org.awaitility.core.ThrowingRunnable;
-import org.jacoco.core.instr.Instrumenter;
-import org.jacoco.core.runtime.OfflineInstrumentationAccessGenerator;
 import org.jdbi.v3.core.Jdbi;
 import org.jdbi.v3.core.statement.SqlLogger;
 import org.jdbi.v3.core.statement.StatementContext;
@@ -250,29 +243,11 @@ JarRunResponseBody execute(String... arguments) {
     return restoreAndExecute(null, arguments);
   }
 
-  private int instrument(final File src, final File dest) throws IOException {
-    if (dest.exists()) {
-      return 0;
-    }
-    var instrumenter = new Instrumenter(new OfflineInstrumentationAccessGenerator());
-
-    dest.getParentFile().mkdirs();
-    try (final InputStream input = new FileInputStream(src);
-        final OutputStream output = new FileOutputStream(dest)) {
-      return instrumenter.instrumentAll(input, output, src.getAbsolutePath());
-    } catch (final IOException e) {
-      dest.delete();
-      throw e;
-    }
-  }
-
   @SneakyThrows
   JarRunResponseBody restoreAndExecute(String savepointPath, String... arguments) {
-    var originalFile = new File("target/flink-sql-runner.uber.jar");
-    var instrumentedJarFile = new File("target/flink-sql-runner.jacoco.jar");
-    instrument(originalFile, instrumentedJarFile);
+    var originalFile = new File("target/flink-sql-runner.jacoco.jar");
 
-    var uploadResponse = client.uploadJar(instrumentedJarFile);
+    var uploadResponse = client.uploadJar(originalFile);
 
     assertThat(uploadResponse.getStatus()).isEqualTo(UploadStatus.SUCCESS);
 

pom.xml

@@ -286,19 +286,26 @@
       </plugin>
 
       <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.13</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>prepare-agent</goal>
-              <goal>prepare-agent-integration</goal>
-              <goal>report</goal>
-              <goal>report-integration</goal>
-            </goals>
-          </execution>
-        </executions>
+        <groupId>com.marvinformatics.jacoco</groupId>
+        <artifactId>easy-jacoco-maven-plugin</artifactId>
+        <version>0.1.1</version>
+        <configuration>
+          <projectRules>
+            <rule>
+              <limits>
+                <limit>
+                  <counter>INSTRUCTION</counter>
+                  <value>COVEREDRATIO</value>
+                  <minimum>0.70</minimum>
+                </limit>
+              </limits>
+            </rule>
+          </projectRules>
+          <haltOnFailure>true</haltOnFailure>
+          <projectExtraProperties>
+            <license.skip>true</license.skip>
+          </projectExtraProperties>
+        </configuration>
       </plugin>
     </plugins>
   </build>

testing/coverage/pom.xml

@@ -32,7 +32,6 @@
   <modules>
     <module>system-functions-sample</module>
     <module>udf-sample</module>
-    <module>coverage</module>
   </modules>
 
 </project>