Skip to content

Fix parsing new BuildOperationMetrics #237

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.

Sign up for GitHub

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

Merged
fortmarek merged 1 commit into from
Sep 16, 2025
Merged

Fix parsing new BuildOperationMetrics #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions Sources/XCLogParser/activityparser/ActivityParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,15 +389,28 @@ public class ActivityParser {
minorVersion: try parseAsInt(token: iterator.next()),
metrics: try parseAsJson(token: iterator.next(),
type: jsonType),
buildOperationMetrics: nil,
backtrace: nil)
case .some("TaskBacktrace"):
let jsonType = IDEActivityLogSectionAttachment.BuildOperationTaskBacktrace.self
return try IDEActivityLogSectionAttachment(identifier: identifier,
majorVersion: try parseAsInt(token: iterator.next()),
minorVersion: try parseAsInt(token: iterator.next()),
metrics: nil,
buildOperationMetrics: nil,
backtrace: try parseAsJson(token: iterator.next(),
type: jsonType))
case .some("BuildOperationMetrics"):
let jsonType = IDEActivityLogSectionAttachment.BuildOperationMetrics.self
return try IDEActivityLogSectionAttachment(identifier: identifier,
majorVersion: try parseAsInt(token: iterator.next()),
minorVersion: try parseAsInt(token: iterator.next()),
metrics: nil,
buildOperationMetrics: try parseAsJson(
token: iterator.next(),
type: jsonType
),
backtrace: nil)
default:
throw XCLogParserError.parseError("Unexpected attachment identifier \(identifier)")
}
Expand Down
22 changes: 22 additions & 0 deletions Sources/XCLogParser/activityparser/IDEActivityModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,19 +658,22 @@ public class IDEActivityLogSectionAttachment: Encodable {
public let majorVersion: UInt64
public let minorVersion: UInt64
public let metrics: BuildOperationTaskMetrics?
public let buildOperationMetrics: BuildOperationMetrics?
public let backtrace: BuildOperationTaskBacktrace?

public init(
identifier: String,
majorVersion: UInt64,
minorVersion: UInt64,
metrics: BuildOperationTaskMetrics?,
buildOperationMetrics: BuildOperationMetrics?,
backtrace: BuildOperationTaskBacktrace?
) throws {
self.identifier = identifier
self.majorVersion = majorVersion
self.minorVersion = minorVersion
self.metrics = metrics
self.buildOperationMetrics = buildOperationMetrics
self.backtrace = backtrace
}

Expand Down Expand Up @@ -769,4 +772,23 @@ public class IDEActivityLogSectionAttachment: Encodable {
private struct EmptyObject: Codable {
// Empty struct for objects with no properties
}

public struct BuildOperationMetrics: Codable {
public let clangCacheHits: Int
public let clangCacheMisses: Int
public let swiftCacheHits: Int
public let swiftCacheMisses: Int

public init(
clangCacheHits: Int,
clangCacheMisses: Int,
swiftCacheHits: Int,
swiftCacheMisses: Int
) {
self.clangCacheHits = clangCacheHits
self.clangCacheMisses = clangCacheMisses
self.swiftCacheHits = swiftCacheHits
self.swiftCacheMisses = swiftCacheMisses
}
}
}
14 changes: 11 additions & 3 deletions Tests/XCLogParserTests/ActivityParserTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,20 @@ class ActivityParserTests: XCTestCase {
Token.string("501796C4-6BE4-4F80-9F9D-3269617ECC17"),
Token.string("localizedResultString"),
Token.string("xcbuildSignature"),
Token.list(2),
Token.list(3),
Token.classNameRef("IDEFoundation.IDEActivityLogSectionAttachment"),
Token.string("com.apple.dt.ActivityLogSectionAttachment.TaskBacktrace"),
Token.int(1),
Token.int(0),
// swiftlint:disable:next line_length
Token.json(#"[{"description":"'Planning Swift module ConcurrencyExtras (arm64)' had never run","category":{"ruleNeverBuilt":{}},"identifier":{"storage":{"task":{"_0":[0,80,50,58,116,97,114,103,101,116,45,67,111,110,99,117,114,114,101,110,99,121,69,120,116,114,97,115,45,101,102,52,50,51,48,52,53,57,52,98,102,56,53,50,102,52,51,56,101,102,55,99,51,97,49,51,54,98,50,99,57,48,100,102,56,55,49,56,97,102,50,98,57,100,51,97,97,99,48,100,48,100,99,97,50,50,98,52,99,50,57,99,50,45,58,66,101,116,97,32,68,101,98,117,103,58,51,99,57,97,99,57,53,50,98,52,99,56,49,100,57,99,99,49,55,100,49,97,102,52,55,49,97,48,52,53,101,56]}}},"frameKind":{"genericTask":{}}}]"#),
Token.classNameRef("IDEFoundation.IDEActivityLogSectionAttachment"),
Token.string("com.apple.dt.ActivityLogSectionAttachment.BuildOperationMetrics"),
Token.int(1),
Token.int(0),
// swiftlint:disable:next line_length
Token.json(#"{"clangCacheHits":0,"clangCacheMisses":2,"swiftCacheHits":0,"swiftCacheMisses":8}"#),
Token.classNameRef("IDEFoundation.IDEActivityLogSectionAttachment"),
Token.string("com.apple.dt.ActivityLogSectionAttachment.TaskMetrics"),
Token.int(1),
Token.int(0),
Expand Down Expand Up @@ -345,9 +351,11 @@ class ActivityParserTests: XCTestCase {
XCTAssertEqual("501796C4-6BE4-4F80-9F9D-3269617ECC17", logSection.uniqueIdentifier)
XCTAssertEqual("localizedResultString", logSection.localizedResultString)
XCTAssertEqual("xcbuildSignature", logSection.xcbuildSignature)
XCTAssertEqual(2, logSection.attachments.count)
XCTAssertEqual(3, logSection.attachments.count)
XCTAssertEqual(logSection.attachments[0].backtrace?.frames.first?.category, .ruleNeverBuilt)
XCTAssertEqual(logSection.attachments[1].metrics?.wcDuration, 1)
print(logSection.attachments)
XCTAssertEqual(logSection.attachments[1].buildOperationMetrics?.clangCacheMisses, 2)
XCTAssertEqual(logSection.attachments[2].metrics?.wcDuration, 1)
XCTAssertEqual(0, logSection.unknown)
}

Expand Down