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.

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

RUMM-3081 fix invalid cpu ticks per seconds #1182

Merged
merged 1 commit into from
Mar 1, 2023
Merged

RUMM-3081 fix invalid cpu ticks per seconds #1182

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: 10 additions & 3 deletions Datadog/Example/Scenarios/RUM/MobileVitals/RUMMobileVitalsScenario.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
Expand All @@ -18,7 +18,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="ca2-aW-xR8">
<rect key="frame" x="143" y="423" width="128" height="60"/>
<rect key="frame" x="143" y="410" width="128" height="90"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SSx-AL-9bb">
<rect key="frame" x="0.0" y="0.0" width="128" height="30"/>
Expand All @@ -34,6 +34,13 @@
<action selector="blockMainThreadButtonTapped:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="CCI-ts-9al"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6oU-go-pxW" userLabel="Start New View">
<rect key="frame" x="0.0" y="60" width="128" height="30"/>
<state key="normal" title="Start New View"/>
<connections>
<action selector="startNewViewButtonTapped:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="oCj-5m-88S"/>
</connections>
</button>
</subviews>
</stackView>
</subviews>
Expand Down
8 changes: 8 additions & 0 deletions Datadog/Example/Scenarios/RUM/MobileVitals/RUMMobileVitalsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/

import UIKit
import Datadog

final class RUMMobileVitalsViewController: UIViewController {

Expand All @@ -25,4 +26,11 @@ final class RUMMobileVitalsViewController: UIViewController {
}
}

@IBAction func startNewViewButtonTapped(_ sender: Any){
print("Start New View button tapped... Starting new view...")

Global.rum.startView(key: "sample view")
Global.rum.stopView(key: "sample view")
}

}
2 changes: 1 addition & 1 deletion Sources/Datadog/RUM/RUMMonitor/Scopes/RUMViewScope.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ internal class RUMViewScope: RUMScope, RUMContextProvider {
view: .init(
action: .init(count: actionsCount.toInt64),
cpuTicksCount: cpuInfo?.greatestDiff,
cpuTicksPerSecond: cpuInfo?.greatestDiff?.divideIfNotZero(by: Double(timeSpent)),
cpuTicksPerSecond: timeSpent > 1.0 ? cpuInfo?.greatestDiff?.divideIfNotZero(by: Double(timeSpent)) : nil,
crash: isCrash ? .init(count: 1) : .init(count: 0),
cumulativeLayoutShift: nil,
customTimings: customTimings.reduce(into: [:]) { acc, element in
Expand Down
35 changes: 35 additions & 0 deletions Tests/DatadogIntegrationTests/Scenarios/RUM/RUMMobileVitalsScenarioTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ private extension ExampleApplication {
func tapBlockMainThreadButton() {
buttons["Block Main Thread"].tap()
}

func tapStartNewViewButton() {
buttons["Start New View"].tap()
}
}

class RUMMobileVitalsScenarioTests: IntegrationTests, RUMCommonAsserts {
Expand Down Expand Up @@ -66,4 +70,35 @@ class RUMMobileVitalsScenarioTests: IntegrationTests, RUMCommonAsserts {
let longTask2 = longTaskEvents[1]
XCTAssertGreaterThan(longTask2.longTask.duration, 3_000_000_000)
}

func testRUMShortTimeSpentCPUScenario() throws {
// Server session recording RUM events send to `HTTPServerMock`.
let rumServerSession = server.obtainUniqueRecordingSession()

let app = ExampleApplication()
app.launchWith(
testScenarioClassName: "RUMMobileVitalsScenario",
serverConfiguration: HTTPServerMockConfiguration(
rumEndpoint: rumServerSession.recordingURL
)
)

// NOTE: RUMM-1086 even tapNoOpButton() can take up to 0.25sec in my local,
// therefore i used `threshold: 2.5` for long tasks in this scenario
app.tapStartNewViewButton()
try app.endRUMSession()

// Get RUM Sessions with expected number of View visits
let recordedRUMRequests = try rumServerSession.pullRecordedRequests(timeout: dataDeliveryTimeout) { requests in
try RUMSessionMatcher.singleSession(from: requests)?.hasEnded() ?? false
}

assertRUM(requests: recordedRUMRequests)

let session = try XCTUnwrap(RUMSessionMatcher.singleSession(from: recordedRUMRequests))
sendCIAppLog(session)

let lastViewEvent = try XCTUnwrap(session.viewVisits[1].viewEvents.last)
XCTAssertNil(lastViewEvent.view.cpuTicksPerSecond)
}
}