Commit c5e54900 authored by Salvador Guerrero's avatar Salvador Guerrero Committed by Chromium LUCI CQ

Converted trace events in content_settings to typed arguments

This CL modifies the trace events logged in components/content_settings
to used the new API with typed arguments.

Change-Id: I20f64bb9cefaef739651f12fbaa1f6340ae9c25d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2627938Reviewed-by: default avatarBalazs Engedy <engedy@chromium.org>
Reviewed-by: default avatarEric Seckler <eseckler@chromium.org>
Reviewed-by: default avataroysteine <oysteine@chromium.org>
Commit-Queue: Salvador Guerrero <salg@google.com>
Cr-Commit-Position: refs/heads/master@{#846243}
parent 07a923db
...@@ -60,6 +60,7 @@ static_library("browser") { ...@@ -60,6 +60,7 @@ static_library("browser") {
"//net", "//net",
"//services/network/public/mojom", "//services/network/public/mojom",
"//services/preferences/public/cpp", "//services/preferences/public/cpp",
"//services/tracing/public/cpp",
"//url", "//url",
] ]
......
...@@ -13,5 +13,7 @@ include_rules = [ ...@@ -13,5 +13,7 @@ include_rules = [
"+net/cookies", "+net/cookies",
"+ppapi/buildflags", "+ppapi/buildflags",
"+services/preferences/public", "+services/preferences/public",
"+services/tracing/public",
"+third_party/blink/public/common/features.h", "+third_party/blink/public/common/features.h",
"+third_party/perfetto/protos/perfetto/trace/track_event",
] ]
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#include "components/prefs/scoped_user_pref_update.h" #include "components/prefs/scoped_user_pref_update.h"
#include "services/preferences/public/cpp/dictionary_value_update.h" #include "services/preferences/public/cpp/dictionary_value_update.h"
#include "services/preferences/public/cpp/scoped_pref_update.h" #include "services/preferences/public/cpp/scoped_pref_update.h"
#include "services/tracing/public/cpp/perfetto/macros.h"
#include "third_party/perfetto/protos/perfetto/trace/track_event/chrome_content_settings_event_info.pbzero.h"
namespace content_settings { namespace content_settings {
...@@ -117,7 +119,7 @@ PrefProvider::PrefProvider(PrefService* prefs, ...@@ -117,7 +119,7 @@ PrefProvider::PrefProvider(PrefService* prefs,
off_the_record_(off_the_record), off_the_record_(off_the_record),
store_last_modified_(store_last_modified), store_last_modified_(store_last_modified),
clock_(base::DefaultClock::GetInstance()) { clock_(base::DefaultClock::GetInstance()) {
TRACE_EVENT_BEGIN0("startup", "PrefProvider::PrefProvider"); TRACE_EVENT_BEGIN("startup", "PrefProvider::PrefProvider");
DCHECK(prefs_); DCHECK(prefs_);
// Verify preferences version. // Verify preferences version.
if (!prefs_->HasPrefPath(prefs::kContentSettingsVersion)) { if (!prefs_->HasPrefPath(prefs::kContentSettingsVersion)) {
...@@ -126,7 +128,7 @@ PrefProvider::PrefProvider(PrefService* prefs, ...@@ -126,7 +128,7 @@ PrefProvider::PrefProvider(PrefService* prefs,
} }
if (prefs_->GetInteger(prefs::kContentSettingsVersion) > if (prefs_->GetInteger(prefs::kContentSettingsVersion) >
ContentSettingsPattern::kContentSettingsPatternVersion) { ContentSettingsPattern::kContentSettingsPatternVersion) {
TRACE_EVENT_END0("startup", "PrefProvider::PrefProvider"); TRACE_EVENT_END("startup"); // PrefProvider::PrefProvider.
return; return;
} }
...@@ -163,8 +165,12 @@ PrefProvider::PrefProvider(PrefService* prefs, ...@@ -163,8 +165,12 @@ PrefProvider::PrefProvider(PrefService* prefs,
num_exceptions); num_exceptions);
} }
TRACE_EVENT_END1("startup", "PrefProvider::PrefProvider", TRACE_EVENT_END("startup", [num_exceptions](perfetto::EventContext ctx) {
"NumberOfExceptions", num_exceptions); perfetto::protos::pbzero::ChromeContentSettingsEventInfo* event_args =
ctx.event()->set_chrome_content_settings_event_info();
event_args->set_number_of_exceptions(
num_exceptions); // PrefProvider::PrefProvider.
});
} }
PrefProvider::~PrefProvider() { PrefProvider::~PrefProvider() {
......
...@@ -162,7 +162,7 @@ constexpr MessageInfo kChromeLatencyInfo = {kChromeLatencyInfoIndices, ...@@ -162,7 +162,7 @@ constexpr MessageInfo kChromeLatencyInfo = {kChromeLatencyInfoIndices,
kChromeLatencyInfoComplexMessages}; kChromeLatencyInfoComplexMessages};
// Proto Message: ChromeFrameReporter // Proto Message: ChromeFrameReporter
constexpr int kChromeFrameReporterIndices[] = {1, 2, 3, 4, -1}; constexpr int kChromeFrameReporterIndices[] = {1, 2, 3, 4, 5, -1};
constexpr MessageInfo kChromeFrameReporter = {kChromeFrameReporterIndices, constexpr MessageInfo kChromeFrameReporter = {kChromeFrameReporterIndices,
nullptr}; nullptr};
...@@ -190,10 +190,15 @@ constexpr int kChromeWindowHandleEventInfoIndices[] = {1, 2, -1}; ...@@ -190,10 +190,15 @@ constexpr int kChromeWindowHandleEventInfoIndices[] = {1, 2, -1};
constexpr MessageInfo kChromeWindowHandleEventInfo = { constexpr MessageInfo kChromeWindowHandleEventInfo = {
kChromeWindowHandleEventInfoIndices, nullptr}; kChromeWindowHandleEventInfoIndices, nullptr};
// Proto Message: ChromeContentSettingsEventInfo
constexpr int kChromeContentSettingsEventInfoIndices[] = {1, -1};
constexpr MessageInfo kChromeContentSettingsEventInfo = {
kChromeContentSettingsEventInfoIndices, nullptr};
// Proto Message: TrackEvent // Proto Message: TrackEvent
constexpr int kTrackEventIndices[] = {1, 2, 3, 5, 6, 9, 10, 11, 12, 16, constexpr int kTrackEventIndices[] = {
17, 24, 25, 26, 27, 28, 29, 30, 31, 32, 1, 2, 3, 5, 6, 9, 10, 11, 12, 16, 17, 24, 25, 26, 27, 28,
33, 34, 35, 36, 38, 39, 40, 41, 42, -1}; 29, 30, 31, 32, 33, 34, 35, 36, 38, 39, 40, 41, 42, 43, -1};
constexpr MessageInfo const* kTrackEventComplexMessages[] = { constexpr MessageInfo const* kTrackEventComplexMessages[] = {
nullptr, nullptr,
nullptr, nullptr,
...@@ -223,7 +228,8 @@ constexpr MessageInfo const* kTrackEventComplexMessages[] = { ...@@ -223,7 +228,8 @@ constexpr MessageInfo const* kTrackEventComplexMessages[] = {
&kChromeApplicationStateInfo, &kChromeApplicationStateInfo,
&kChromeRendererSchedulerState, &kChromeRendererSchedulerState,
&kChromeWindowHandleEventInfo, &kChromeWindowHandleEventInfo,
nullptr}; nullptr,
&kChromeContentSettingsEventInfo};
constexpr MessageInfo kTrackEvent = {kTrackEventIndices, constexpr MessageInfo kTrackEvent = {kTrackEventIndices,
kTrackEventComplexMessages}; kTrackEventComplexMessages};
......
...@@ -86,6 +86,8 @@ const AllowlistEntry kEventArgsAllowlist[] = { ...@@ -86,6 +86,8 @@ const AllowlistEntry kEventArgsAllowlist[] = {
kMemoryPressureEventsAllowedArgs}, kMemoryPressureEventsAllowedArgs},
{"renderer_host", "*", kRendererHostAllowedArgs}, {"renderer_host", "*", kRendererHostAllowedArgs},
{"shutdown", "*", nullptr}, {"shutdown", "*", nullptr},
// Now recorded in perfetto proto:
// perfetto/trace/track_event/chrome_content_settings_event_info.proto.
{"startup", "PrefProvider::PrefProvider", nullptr}, {"startup", "PrefProvider::PrefProvider", nullptr},
{"startup", "TestAllowlist*", nullptr}, {"startup", "TestAllowlist*", nullptr},
{"toplevel", "*", nullptr}, {"toplevel", "*", nullptr},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment