Skip to content

Commit dc674c7

Browse files
committed
add filter by standard github tags, upgrade scala and scala libraries
1 parent 56e0603 commit dc674c7

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

osstracker-scraper/src/main/scala/com/netflix/oss/tools/osstrackerscraper/GithubAccess.scala

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ case class IssuesInfo(
3838
val openCountWithLabelInvalid: Int,
3939
val openCountWithLabelQuestion: Int,
4040
val openCountWithLabelWontfix: Int,
41-
val openCountReallyOpen: Int
41+
val openCountTrulyOpen: Int
4242
) {}
4343
case class PRsInfo(val closedPRsSize: Int, val avgPRs: Int) {}
4444

@@ -94,9 +94,18 @@ class GithubAccess(val asOfYYYYMMDD: String, val asOfISO: String, val connectToG
9494
"numContributors" -> commitInfo.contributorLogins.size,
9595
"issues" -> Json.obj(
9696
"openCount" -> issuesInfo.openCount,
97-
"reallyOpenCount" -> issuesInfo.openCountReallyOpen,
97+
"openCountOnlyIssues" -> issuesInfo.openCountTrulyOpen,
9898
"closedCount" -> issuesInfo.closedCount,
99-
"avgTimeToCloseInDays" -> issuesInfo.avgDayToClose
99+
"avgTimeToCloseInDays" -> issuesInfo.avgDayToClose,
100+
"openCountByStandardTags" -> Json.obj(
101+
"bug" -> issuesInfo.openCountWithLabelBug,
102+
"helpWanted" -> issuesInfo.openCountWithLabelHelpWanted,
103+
"question" -> issuesInfo.openCountWithLabelQuestion,
104+
"duplicate" -> issuesInfo.openCountWithLabelDuplicate,
105+
"enhancement" -> issuesInfo.openCountWithLabelEnhancement,
106+
"invalid" -> issuesInfo.openCountWithLabelInvalid,
107+
"wontfix" -> issuesInfo.openCountWithLabelWontfix
108+
),
100109
),
101110
"pullRequests" -> Json.obj(
102111
"openCount" -> openPullRequests.size(),
@@ -154,7 +163,7 @@ class GithubAccess(val asOfYYYYMMDD: String, val asOfISO: String, val connectToG
154163
val (openCountNoLabels, openCountWithLabelBug, openCountWithLabelDuplicate,
155164
openCountWithLabelEnhancement, openCountWithLabelHelpWanted,
156165
openCountWithLabelInvalid, openCountWithLabelQuestion, openCountWithLabelWontfix,
157-
openCountReallyOpen) = getIssuesLabelStats(openIssues)
166+
openCountTrulyOpen) = getIssuesLabelStats(openIssues)
158167

159168

160169
val timeToCloseIssue = closedIssues.map(issue => {
@@ -173,7 +182,7 @@ class GithubAccess(val asOfYYYYMMDD: String, val asOfISO: String, val connectToG
173182
IssuesInfo(closedIssues.size, openIssues.size, avgDaysToCloseIssues, openCountNoLabels, openCountWithLabelBug,
174183
openCountWithLabelDuplicate, openCountWithLabelEnhancement,
175184
openCountWithLabelHelpWanted, openCountWithLabelInvalid, openCountWithLabelQuestion, openCountWithLabelWontfix,
176-
openCountReallyOpen)
185+
openCountTrulyOpen)
177186
}
178187

179188
def getIssuesLabelStats(openIssues: Array[GHIssue]): (Int, Int, Int, Int, Int, Int, Int, Int, Int) = {
@@ -187,15 +196,15 @@ class GithubAccess(val asOfYYYYMMDD: String, val asOfISO: String, val connectToG
187196
val openCountWithLabelEnhancement = countLabelForIssues(openIssues, "enhancement")
188197
val openCountWithLabelInvalid = countLabelForIssues(openIssues, "invalid")
189198
val openCountWithLabelWontfix = countLabelForIssues(openIssues, "wontfix")
190-
val openCountReallyOpen = countReallyOpenIssues(openIssues)
199+
val openCountTrulyOpen = countLabelsForTrueIssues(openIssues)
191200
(
192201
openCountNoLabels, openCountWithLabelBug, openCountWithLabelDuplicate,
193202
openCountWithLabelEnhancement, openCountWithLabelHelpWanted,
194203
openCountWithLabelInvalid, openCountWithLabelQuestion, openCountWithLabelWontfix,
195-
openCountReallyOpen)
204+
openCountTrulyOpen)
196205
}
197206

198-
def countReallyOpenIssues(issues: Array[GHIssue]): Int = {
207+
def countLabelsForTrueIssues(issues: Array[GHIssue]): Int = {
199208
// note that some issues will have bug and enhancement, we need to honor the worst case label (bug)
200209
// note that some issues will have bug and invalid, we don't want to double count
201210
// so, if no label, count it

osstracker-scraper/src/test/scala/com/netflix/oss/tools/osstrackerscraper/GitHubAccessTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ class GitHubAccessTest extends FunSuite {
2020
val access = new GithubAccess("a", "a", false)
2121

2222
val stats = access.getIssuesStats(new Array[GHIssue](0), issues)
23-
assert(stats.openCountReallyOpen == 23)
23+
assert(stats.openCountTrulyOpen == 23)
2424

2525
val issuesJSON2 = scala.io.Source.fromResource("hollow-issues.json").mkString
2626
val issues2 = mapper.readValue(issuesJSON2, classOf[Array[GHIssue]])
2727

2828
val stats2 = access.getIssuesStats(new Array[GHIssue](0), issues2)
29-
assert(stats2.openCountReallyOpen == 13)
29+
assert(stats2.openCountTrulyOpen == 13)
3030
}
3131
}

0 commit comments

Comments
 (0)