Skip to content

[ResourceMonitor] Add more meaningful release log information part 2.#41142

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
basuke:eng/basuke/288174
Mar 13, 2025
Merged

[ResourceMonitor] Add more meaningful release log information part 2.#41142
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
basuke:eng/basuke/288174

Conversation

@basuke
Copy link
Copy Markdown
Contributor

@basuke basuke commented Feb 22, 2025

c7af5b9

[ResourceMonitor] Add more meaningful release log information part 2.
https://bugs.webkit.org/show_bug.cgi?id=288174
rdar://145259890

Reviewed by Chris Dumez.

Adding new log category and move current release logs to that category. And also add more meaningful information
for the record.

This is part 2, targeting WebKit.

* Source/WebCore/loader/ResourceMonitor.cpp:
(WebCore::ResourceMonitor::networkUsageLevel const):
* Source/WebCore/loader/ResourceMonitor.h:
* Source/WebCore/loader/ResourceMonitorChecker.cpp:
(WebCore::ResourceMonitorChecker::checkEligibility):
(WebCore::ResourceMonitorChecker::setContentRuleList):
(WebCore::ResourceMonitorChecker::finishPendingQueries):
(WebCore::ResourceMonitorChecker::setNetworkUsageThreshold):
* Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::shouldOffloadIFrameForHost):
* Source/WebKit/NetworkProcess/NetworkSession.cpp:
(WebKit::NetworkSession::resourceMonitorThrottler):
* Source/WebKit/Platform/Logging.h:
* Source/WebKit/Platform/cocoa/WebPrivacyHelpers.mm:
(WebKit::ResourceMonitorURLsController::prepare):
* Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformLoadResourceMonitorRuleList):
* Source/WebKit/UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::loadOrUpdateResourceMonitorRuleList):
* Source/WebKit/WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::updateBytesTransferredOverNetwork):
* Source/WebKit/WebProcess/WebCoreSupport/WebLocalFrameLoaderClient.cpp:
(WebKit::WebLocalFrameLoaderClient::didExceedNetworkUsageThreshold):
* Source/WebKit/WebProcess/WebProcess.cpp:
(WebKit::WebProcess::setResourceMonitorContentRuleList):
(WebKit::WebProcess::setResourceMonitorContentRuleListAsync):

Canonical link: https://commits.webkit.org/292052@main

cb014aa

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision ❌ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🛠 🧪 merge ✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2 ✅ 🛠 playstation
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@basuke basuke requested a review from cdumez as a code owner February 22, 2025 08:59
@basuke basuke self-assigned this Feb 22, 2025
@basuke basuke added the New Bugs Unclassified bugs are placed in this component until the correct component can be determined. label Feb 22, 2025
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 22, 2025
@basuke basuke requested a review from cdumez February 23, 2025 21:28
@basuke basuke removed the merging-blocked Applied to prevent a change from being merged label Mar 11, 2025
@basuke basuke force-pushed the eng/basuke/288174 branch from 69d77be to 395375e Compare March 11, 2025 01:28
@basuke basuke requested a review from cdumez March 11, 2025 01:28
@basuke basuke force-pushed the eng/basuke/288174 branch from 395375e to f6d5afb Compare March 11, 2025 14:33
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely not OK to print out a host with PUBLIC_LOG_STRING.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can use url.host().utf8().data()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sad to be creating a new String for no good reason now.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can keep the code as is. It was more efficient.

@basuke basuke force-pushed the eng/basuke/288174 branch from f6d5afb to cb014aa Compare March 11, 2025 17:53
@basuke basuke requested a review from cdumez March 11, 2025 17:53
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 11, 2025
@basuke basuke added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels Mar 13, 2025
@webkit-commit-queue webkit-commit-queue force-pushed the eng/basuke/288174 branch 2 times, most recently from bc603ea to 43eb66e Compare March 13, 2025 01:19
https://bugs.webkit.org/show_bug.cgi?id=288174
rdar://145259890

Reviewed by Chris Dumez.

Adding new log category and move current release logs to that category. And also add more meaningful information
for the record.

This is part 2, targeting WebKit.

* Source/WebCore/loader/ResourceMonitor.cpp:
(WebCore::ResourceMonitor::networkUsageLevel const):
* Source/WebCore/loader/ResourceMonitor.h:
* Source/WebCore/loader/ResourceMonitorChecker.cpp:
(WebCore::ResourceMonitorChecker::checkEligibility):
(WebCore::ResourceMonitorChecker::setContentRuleList):
(WebCore::ResourceMonitorChecker::finishPendingQueries):
(WebCore::ResourceMonitorChecker::setNetworkUsageThreshold):
* Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::shouldOffloadIFrameForHost):
* Source/WebKit/NetworkProcess/NetworkSession.cpp:
(WebKit::NetworkSession::resourceMonitorThrottler):
* Source/WebKit/Platform/Logging.h:
* Source/WebKit/Platform/cocoa/WebPrivacyHelpers.mm:
(WebKit::ResourceMonitorURLsController::prepare):
* Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformLoadResourceMonitorRuleList):
* Source/WebKit/UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::loadOrUpdateResourceMonitorRuleList):
* Source/WebKit/WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::updateBytesTransferredOverNetwork):
* Source/WebKit/WebProcess/WebCoreSupport/WebLocalFrameLoaderClient.cpp:
(WebKit::WebLocalFrameLoaderClient::didExceedNetworkUsageThreshold):
* Source/WebKit/WebProcess/WebProcess.cpp:
(WebKit::WebProcess::setResourceMonitorContentRuleList):
(WebKit::WebProcess::setResourceMonitorContentRuleListAsync):

Canonical link: https://commits.webkit.org/292052@main
@webkit-commit-queue
Copy link
Copy Markdown
Collaborator

Committed 292052@main (c7af5b9): https://commits.webkit.org/292052@main

Reviewed commits have been landed. Closing PR #41142 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit c7af5b9 into WebKit:main Mar 13, 2025
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Mar 13, 2025
@basuke basuke deleted the eng/basuke/288174 branch March 13, 2025 01:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

New Bugs Unclassified bugs are placed in this component until the correct component can be determined.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants