Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix part of #5343: Building proto with coverage results for data processing #5439

Merged
merged 107 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from 80 commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
6ec35a7
Fix lint new line and kdoc checks
Rd4dev Jun 4, 2024
1ec224a
Execute Bazel Command to run coverage on the test target
Rd4dev Jun 5, 2024
ee92168
Parse the coverage execution result to acquire the generated coverage…
Rd4dev Jun 5, 2024
075c77c
Implemented functionality to TestBazelWorkspace utility to add source…
Rd4dev Jun 7, 2024
d0519d6
Sample Test data and Listing all contents
Rd4dev Jun 9, 2024
b15b7bb
Added Test for BazelClient - for sample target and non target executions
Rd4dev Jun 9, 2024
f441d11
Added Coverage Runner functionality tests
Rd4dev Jun 10, 2024
cc86309
Added tests for the RunCoverageForTestTarget utility
Rd4dev Jun 11, 2024
4a6073b
Replaced Java Test Sources with Kotlin Sources
Rd4dev Jun 13, 2024
13534a1
Fix Static Checks / Lint warnings
Rd4dev Jun 13, 2024
fc52d82
Fix Buildifier Lint checks
Rd4dev Jun 13, 2024
0226baa
Added tests for TestBazelWorkspaceTest to check addition of source an…
Rd4dev Jun 13, 2024
2fe7485
Fix Lint warnings with TestBazelWorkspaceTest
Rd4dev Jun 13, 2024
bd683b5
Fix Regex Pattern checks
Rd4dev Jun 13, 2024
d410d17
Prototyped parsing and reading the extracted file data as byte array
Rd4dev Jun 15, 2024
ece147a
Updated the runCoverageForTestTarget to parse the data file and read …
Rd4dev Jun 15, 2024
b101ec8
Updated Bazel Client Tests with updated execution to return byte array
Rd4dev Jun 15, 2024
5db0650
Updated BazelClientTest for ParseCoverageDataFile and readDatFileAsBi…
Rd4dev Jun 17, 2024
87be114
Updated CoverageRunnerTest to check with updated getCoverage result r…
Rd4dev Jun 17, 2024
456e81b
Updated RunCoverageForTestTargetTest to check the returned coverage data
Rd4dev Jun 17, 2024
2c65524
Update kdoc to match the function paramaters
Rd4dev Jun 17, 2024
62f9e1d
Removing suspend while keeping the async operations
Rd4dev Jun 17, 2024
5e6d2ef
Updated RunCoverageForTestTarget to take in custom process timeout as…
Rd4dev Jun 17, 2024
31b6401
Initialized bazelClient using lazy field
Rd4dev Jun 17, 2024
81d6855
Adjusted visibility and removed unnecessary documentation for private…
Rd4dev Jun 17, 2024
6cb1da7
Revoking visibility of bazelClient functions as that is called outsid…
Rd4dev Jun 17, 2024
b41fb01
Fix Lint Check issues
Rd4dev Jun 17, 2024
e66ac12
Merge branch 'develop' of https://github.com/Rd4dev/oppia-android int…
Rd4dev Jun 17, 2024
c646840
Merge branch 'develop' of https://github.com/Rd4dev/oppia-android int…
Rd4dev Jun 18, 2024
1ffc83d
Introduce new script RunCoverage.kt to later take in source filename …
Rd4dev Jun 18, 2024
248a20a
Merge branch 'develop' of https://github.com/Rd4dev/oppia-android int…
Rd4dev Jun 19, 2024
d817c85
Map file names to appropriate test and localTest names
Rd4dev Jun 19, 2024
7f1be37
Running Multiple test targets using hardcoded test target names
Rd4dev Jun 19, 2024
9e78d1a
Added Kdoc and processTimeout custom argument with basic clean up
Rd4dev Jun 19, 2024
cc5e981
Seperated logic as class and functions, introduced test file with set…
Rd4dev Jun 20, 2024
5075a1a
Added tests for findTestFile()
Rd4dev Jun 20, 2024
fdaf9cb
Added tests case for RunCoverage to check execution of coverage and f…
Rd4dev Jun 20, 2024
8e28f1d
Cleanup of RunCoverageTest
Rd4dev Jun 20, 2024
92bf266
Fix kdoc lint checks and TestBazelWorkspace Tests
Rd4dev Jun 20, 2024
eb7cdc2
Fix Lint Checks on indentation
Rd4dev Jun 20, 2024
ee078e2
Refactored BazelClient coverage execution to return data as list of s…
Rd4dev Jun 21, 2024
f15e087
Fix Lint checks
Rd4dev Jun 21, 2024
506916d
Removed ending periods in KDoc Strings
Rd4dev Jun 21, 2024
c68487d
Merge branch 'develop' of https://github.com/Rd4dev/oppia-android int…
Rd4dev Jun 21, 2024
0f5cffd
Resolved with conflicts to the code_coverage_bazel_command_execution …
Rd4dev Jun 21, 2024
87d34ad
Update the script to align with changes in BazelClient PR 1.1 to retu…
Rd4dev Jun 21, 2024
0735c64
Introduced coverage.proto and parsed the coverage data and store them…
Rd4dev Jun 21, 2024
307214a
Added sha hash and hit count for branches
Rd4dev Jun 21, 2024
bb2cbb2
Isolate the coverage data to only contain the target coverage data
Rd4dev Jun 21, 2024
653ec68
Fix Lint Checks
Rd4dev Jun 21, 2024
46cc3ff
Include coverage data to proto for any related tests - LocalTest and …
Rd4dev Jun 21, 2024
25a064e
Updated the tests to now check with the CoverageReport proto result
Rd4dev Jun 22, 2024
ba1c66a
Fix KDoc String punctuations, more clearer variable names and simplif…
Rd4dev Jun 22, 2024
438476c
Removed unused Paths import
Rd4dev Jun 22, 2024
ac30ca7
Merge branch 'develop' of https://github.com/Rd4dev/oppia-android int…
Rd4dev Jun 22, 2024
c7c2f2f
Fixed indentation and line spaces for better readability
Rd4dev Jun 22, 2024
1eac413
Merge branch 'code_coverage_bazel_command_execution' of https://githu…
Rd4dev Jun 22, 2024
6a2a029
For Reference: Multiple test cases with LocalTest and Test works but …
Rd4dev Jun 22, 2024
e4ede82
For Reference: Added package group for sharedTest and Test, yet multi…
Rd4dev Jun 22, 2024
9e0189d
Added implementation for script module test content files (to be refa…
Rd4dev Jun 22, 2024
d477d20
Refactored the addSourceAndTestFileWithContent to be suitable for mul…
Rd4dev Jun 22, 2024
6720de7
For Reference: Added App cases, but just having sharedTest in package…
Rd4dev Jun 22, 2024
04243f1
KDoC and reverting sharedTest to test, this passes test
Rd4dev Jun 22, 2024
985e861
For Reference: Even doing app/test fails with NPE
Rd4dev Jun 22, 2024
33f9a0b
Made findTestFile private and removed related tests
Rd4dev Jun 22, 2024
5229ecd
Used kotlin patterns to simplify the and make it more readable
Rd4dev Jun 22, 2024
d9ad634
Returning the coverageDataList as immutable list
Rd4dev Jun 22, 2024
ac4c82b
Fix Lint Checks
Rd4dev Jun 23, 2024
6eb90c7
Fixed Multi Level Source and Test File coverage execution by adding t…
Rd4dev Jun 23, 2024
68c714b
Fix Lint Check
Rd4dev Jun 23, 2024
e0be83a
Removed RunCoverageForTestTarget as it is redundant
Rd4dev Jun 23, 2024
c834aa7
Removed the RunCoverageForTestTarget as the functionality will be re-…
Rd4dev Jun 23, 2024
47a6197
Resolved merge conflicts with upstream code_coverage_bazel_command_ex…
Rd4dev Jun 23, 2024
c654eed
Removed the RunCoverageForTestTarget Build inclusions
Rd4dev Jun 23, 2024
3ab4e1e
Resolved merge conflict while syncing with upstream
Rd4dev Jun 23, 2024
0306258
Refactor execute to use separate helper functions
Rd4dev Jun 23, 2024
6179699
Used mapNotNull to avoid mutability
Rd4dev Jun 23, 2024
0c79e4d
Updated with upstream and removed all the optional declarations to ju…
Rd4dev Jun 24, 2024
73f553d
Merge branch 'develop' into code_coverage_bazel_command_execution
BenHenning Jun 24, 2024
0f63469
Merge branch 'develop' into code_coverage_bazel_command_execution
BenHenning Jun 24, 2024
83eb035
Updated with the revised proto structure and added docs
Rd4dev Jun 24, 2024
bc9a5c0
Throw runtime exception when no coverage result is retrieved
Rd4dev Jun 24, 2024
1b9426d
Fix instrumentation and throw error on invalid path
Rd4dev Jun 26, 2024
85b4bcd
Throw error on missing test files
Rd4dev Jun 26, 2024
356e4fb
Removed accidentally added coverage_reports folder
Rd4dev Jun 26, 2024
b4abdde
Restructuring coverage proto to just compute line coverage
Rd4dev Jun 26, 2024
8e07f50
Updated with upstream
Rd4dev Jun 26, 2024
9734a84
Lint fix and Fix failing Test
Rd4dev Jun 26, 2024
f36eb83
Merge branch 'develop' of https://github.com/Rd4dev/oppia-android int…
Rd4dev Jun 26, 2024
6488d53
Merge branch 'code_coverage_bazel_command_execution' of https://githu…
Rd4dev Jun 26, 2024
6f4b76f
Merge branch 'code_coverage_bazel_command_execution' of https://githu…
Rd4dev Jun 26, 2024
7a020a1
Update the test file exemption list retrieval
Rd4dev Jun 26, 2024
4d8b250
Updated from upstream code_coverage_using_filename
Rd4dev Jun 26, 2024
c123365
Updated tests with the proto structure, multi test cases are still fa…
Rd4dev Jun 26, 2024
d6c1f33
Changed mutable lists to lists
Rd4dev Jun 26, 2024
3b6b049
Removed print statement and refactored same package deps
Rd4dev Jun 26, 2024
d88edf6
Fixed improper dep assignment
Rd4dev Jun 26, 2024
4e89da1
Updated with upstream code_coverage_using_filename
Rd4dev Jun 26, 2024
7a837ea
Refactor runCoverageForTarget to return non-nullable CoverageReport
Rd4dev Jun 26, 2024
cba0815
Fix tests in CoverageRunner and Lint checks
Rd4dev Jun 26, 2024
f6b4620
Fix Lint checks
Rd4dev Jun 26, 2024
cf405c6
Added tests for local and sharedTests separately
Rd4dev Jun 26, 2024
88f286b
Fix Lint check, missed separator
Rd4dev Jun 26, 2024
32d9ae4
Fix Coverage Runner Test
Rd4dev Jun 26, 2024
266d0f4
Resolved conflicts with develop branch
Rd4dev Jun 26, 2024
a0bc41c
Resolved conflicting overloads
Rd4dev Jun 26, 2024
a781919
Merge branch 'develop' into code_coverage_store_as_proto
adhiamboperes Jun 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions scripts/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,16 @@ kt_jvm_binary(
],
)

kt_jvm_binary(
name = "run_coverage",
testonly = True,
data = TEST_FILE_EXEMPTION_ASSETS,
main_class = "org.oppia.android.scripts.coverage.RunCoverageKt",
runtime_deps = [
"//scripts/src/java/org/oppia/android/scripts/coverage:run_coverage_lib",
],
)

# Note that this is intentionally not test-only since it's used by the app build pipeline. Also,
# this apparently needs to be a java_binary to set up runfiles correctly when executed within a
# Starlark rule as a tool.
Expand Down
35 changes: 35 additions & 0 deletions scripts/src/java/org/oppia/android/scripts/common/BazelClient.kt
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,41 @@ class BazelClient(private val rootDirectory: File, private val commandExecutor:
return correctedTargets
}

/**
* Runs code coverage for the specified Bazel test target.
*
* Null return typically occurs when the coverage command fails to generate the 'coverage.dat' file
* This can happen due to: Test failures or misconfigurations that prevent the coverage data
* from being generated properly.
*
* @param bazelTestTarget Bazel test target for which code coverage will be run
* @return the generated coverage data as a list of strings
* or null if the coverage data file could not be parsed
*/
fun runCoverageForTestTarget(bazelTestTarget: String): List<String>? {
val coverageCommandOutputLines = executeBazelCommand(
"coverage",
bazelTestTarget,
"--instrumentation_filter=//"
)
return parseCoverageDataFilePath(coverageCommandOutputLines)?.let { path ->
File(path).readLines()
}
}

private fun parseCoverageDataFilePath(coverageCommandOutputLines: List<String>): String? {
val regex = ".*coverage\\.dat$".toRegex()
for (line in coverageCommandOutputLines) {
val match = regex.find(line)
val extractedPath = match?.value?.substringAfterLast(",")?.trim()
if (extractedPath != null) {
println("Parsed Coverage Data File: $extractedPath")
return extractedPath
}
}
return null
}

/**
* Returns the results of a query command with a potentially large list of [values] that will be
* split up into multiple commands to avoid overflow the system's maximum argument limit.
Expand Down
32 changes: 32 additions & 0 deletions scripts/src/java/org/oppia/android/scripts/coverage/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
"""
Libraries corresponding to developer scripts that obtain coverage data for test targets.
"""

load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library")

kt_jvm_library(
name = "run_coverage_lib",
testonly = True,
srcs = [
"RunCoverage.kt",
],
visibility = ["//scripts:oppia_script_binary_visibility"],
deps = [
"//scripts/src/java/org/oppia/android/scripts/common:bazel_client",
"//scripts/src/java/org/oppia/android/scripts/coverage:coverage_runner",
"//scripts/src/java/org/oppia/android/scripts/proto:script_exemptions_java_proto",
],
)

kt_jvm_library(
name = "coverage_runner",
testonly = True,
srcs = [
"CoverageRunner.kt",
],
visibility = ["//scripts:oppia_script_binary_visibility"],
deps = [
"//scripts/src/java/org/oppia/android/scripts/common:bazel_client",
"//scripts/src/java/org/oppia/android/scripts/proto:coverage_java_proto",
],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,228 @@
package org.oppia.android.scripts.coverage

import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Deferred
import kotlinx.coroutines.async
import org.oppia.android.scripts.common.BazelClient
import org.oppia.android.scripts.common.CommandExecutor
import org.oppia.android.scripts.common.ScriptBackgroundCoroutineDispatcher
import org.oppia.android.scripts.proto.BranchCoverage
import org.oppia.android.scripts.proto.Coverage
import org.oppia.android.scripts.proto.CoverageReport
import org.oppia.android.scripts.proto.CoveredFile
import org.oppia.android.scripts.proto.CoveredLine
import org.oppia.android.scripts.proto.FunctionCoverage
import java.io.File
import java.nio.file.Files
import java.nio.file.Paths
import java.security.MessageDigest

/**
* Class responsible for running coverage analysis asynchronously.
*
* @param repoRoot the root directory of the repository
* @param scriptBgDispatcher the [ScriptBackgroundCoroutineDispatcher] to be used for running the coverage command
* @param commandExecutor executes the specified command in the specified working directory
*/
class CoverageRunner(
private val repoRoot: File,
private val scriptBgDispatcher: ScriptBackgroundCoroutineDispatcher,
private val commandExecutor: CommandExecutor
) {
private val bazelClient by lazy { BazelClient(repoRoot, commandExecutor) }

/**
* Runs coverage analysis asynchronously for the Bazel test target.
*
* @param bazelTestTarget Bazel test target to analyze coverage
* @return a deferred value that contains the coverage data
*/
fun runWithCoverageAsync(
bazelTestTarget: String
): Deferred<CoverageReport> {
return CoroutineScope(scriptBgDispatcher).async {
val coverageResult = retrieveCoverageResult(bazelTestTarget)
?: throw RuntimeException("Failed to retrieve coverage result for $bazelTestTarget")
adhiamboperes marked this conversation as resolved.
Show resolved Hide resolved

parseCoverageData(coverageResult, bazelTestTarget)
}
}

private fun retrieveCoverageResult(
bazelTestTarget: String
): List<String>? {
return bazelClient.runCoverageForTestTarget(bazelTestTarget)
}

private fun parseCoverageData(
coverageData: List<String>,
adhiamboperes marked this conversation as resolved.
Show resolved Hide resolved
bazelTestTarget: String
): CoverageReport {
var filePath = ""
var linesFound = 0
var linesHit = 0
val coveredLines = mutableListOf<CoveredLine>()
adhiamboperes marked this conversation as resolved.
Show resolved Hide resolved
val branchCoverage = mutableListOf<BranchCoverage>()
val functionCoverage = mutableListOf<FunctionCoverage>()

var functionsFound = 0
var functionsHit = 0
var branchesFound = 0
var branchesHit = 0

var parseFile = false
adhiamboperes marked this conversation as resolved.
Show resolved Hide resolved
val extractedFileName = "${extractTargetName(bazelTestTarget)}.kt"

coverageData.forEach { line ->
when {
// SF:<absolute path to the source file>
line.startsWith("SF:") -> {
val sourceFilePath = line.substringAfter("SF:")
if (sourceFilePath.substringAfterLast("/") == extractedFileName) {
filePath = line.substringAfter("SF:")
parseFile = true
} else {
parseFile = false
}
}
parseFile -> {
when {
// DA:<line number>,<execution count>
line.startsWith("DA:") -> {
val parts = line.substringAfter("DA:").split(",")
val lineNumber = parts[0].toInt()
val hitCount = parts[1].toInt()
val coverage =
if (hitCount > 0)
Coverage.FULL
else
Coverage.NONE
coveredLines.add(
CoveredLine.newBuilder()
.setLineNumber(lineNumber)
.setCoverage(coverage)
.build()
)
adhiamboperes marked this conversation as resolved.
Show resolved Hide resolved
}
// BRDA:<line number>,<block number>,<branch number>,<taken>
line.startsWith("BRDA:") -> {
val parts = line.substringAfter("BRDA:").split(",")
val lineNumber = parts[0].toInt()
val blockNumber = parts[1].toInt()
val branchNumber = parts[2].toInt()
val hitCount = parts[3].toInt()
val coverage =
if (hitCount > 0)
Coverage.FULL
else
Coverage.NONE
branchCoverage.add(
BranchCoverage.newBuilder()
.setLineNumber(lineNumber)
.setBlockNumber(blockNumber)
.setBranchNumber(branchNumber)
.setHitCount(hitCount)
.setCoverage(coverage)
.build()
)
}
// FN:<line number of function start>,<function name>
line.startsWith("FN:") -> {
val parts = line.substringAfter("FN:").split(",")
val currentFunctionLineNumber = parts[0].toInt()
val functionName = parts[1]
functionCoverage.add(
FunctionCoverage.newBuilder()
.setLineNumber(currentFunctionLineNumber)
.setFunctionName(functionName)
.setExecutionCount(0)
.setCoverage(Coverage.NONE)
.build()
)
}
// FNDA:<execution count>,<function name>
line.startsWith("FNDA:") -> {
val parts = line.substringAfter("FNDA:").split(",")
val executionCount = parts[0].toInt()
val functionName = parts[1]
val index = functionCoverage.indexOfFirst { it.functionName == functionName }
if (index != -1) {
val updatedFunctionCoverage = functionCoverage[index].toBuilder()
.setExecutionCount(executionCount)
.setCoverage(
if (executionCount > 0)
Coverage.FULL
else
Coverage.NONE
)
.build()
functionCoverage[index] = updatedFunctionCoverage
}
}
// FNF:<number of functions found>
line.startsWith("FNF:") -> {
functionsFound = line.substringAfter("FNF:").toInt()
}
// FNH:<number of function hit>
line.startsWith("FNH:") -> {
functionsHit = line.substringAfter("FNH:").toInt()
}
// BRF:<number of branches found>
line.startsWith("BRF:") -> {
branchesFound = line.substringAfter("BRF:").toInt()
}
// BRH:<number of branches hit>
line.startsWith("BRH:") -> {
branchesHit = line.substringAfter("BRH:").toInt()
}
// LF:<number of instrumented lines>
line.startsWith("LF:") -> {
linesFound = line.substringAfter("LF:").toInt()
}
// LH:<number of lines with a non-zero execution count>
line.startsWith("LH:") -> {
linesHit = line.substringAfter("LH:").toInt()
}
line.startsWith("end_of_record") -> {
parseFile = false
}
}
}
}
}

val file = File(repoRoot, filePath)
val fileSha1Hash = calculateSha1(file.absolutePath)

val coveredFile = CoveredFile.newBuilder()
.setFilePath(filePath)
.setFileSha1Hash(fileSha1Hash)
.addAllCoveredLine(coveredLines)
.addAllBranchCoverage(branchCoverage)
.addAllFunctionCoverage(functionCoverage)
.setFunctionsFound(functionsFound)
.setFunctionsHit(functionsHit)
.setBranchesFound(branchesFound)
.setBranchesHit(branchesHit)
.setLinesFound(linesFound)
.setLinesHit(linesHit)
.build()

return CoverageReport.newBuilder()
.setBazelTestTarget(bazelTestTarget)
.addCoveredFile(coveredFile)
.build()
}
}

private fun extractTargetName(bazelTestTarget: String): String {
val targetName = bazelTestTarget.substringAfterLast(":").trim()
return targetName.removeSuffix("Test").removeSuffix("LocalTest")
}

private fun calculateSha1(filePath: String): String {
val fileBytes = Files.readAllBytes(Paths.get(filePath))
val digest = MessageDigest.getInstance("SHA-1")
val hashBytes = digest.digest(fileBytes)
return hashBytes.joinToString("") { "%02x".format(it) }
}
Loading
Loading