luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7733 from Friendseeker/remove-deprecated-thread-id 

[1.x] Remove deprecated `Thread.getId`
This commit is contained in:
eugene yokota 2024-10-06 21:48:16 -04:00 committed by GitHub
parent 09c13af51b 0b34b6b406
commit c5b11a41a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/scala/sbt/internal/AbstractTaskProgress.scala
View File

@ -122,7 +122,7 @@ private[sbt] abstract class AbstractTaskExecuteProgress extends ExecuteProgress[
object AbstractTaskExecuteProgress {
private[sbt] class Timer() {
val startNanos: Long = System.nanoTime()
val threadId: Long = Thread.currentThread().getId
val threadName: String = Thread.currentThread().getName
var endNanos: Long = 0L
def stop(): Unit = {
endNanos = System.nanoTime()

2
main/src/main/scala/sbt/internal/TaskTraceEvent.scala
View File

@ -61,7 +61,7 @@ private[sbt] final class TaskTraceEvent
def durationEvent(name: String, cat: String, t: Timer): String = {
val sb = new java.lang.StringBuilder(name.length + 2)
CompactPrinter.print(new JString(name), sb)
s"""{"name": ${sb.toString}, "cat": "$cat", "ph": "X", "ts": ${(t.startMicros)}, "dur": ${(t.durationMicros)}, "pid": 0, "tid": ${t.threadId}}"""
s"""{"name": ${sb.toString}, "cat": "$cat", "ph": "X", "ts": ${(t.startMicros)}, "dur": ${(t.durationMicros)}, "pid": 0, "tname": ${t.threadName}}"""
}
val entryIterator = currentTimings
while (entryIterator.hasNext) {