Stack sampling profiler: set process and thread information

components/metrics/call_stack_profile_metrics_provider_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/metrics/call_stack_profile_metrics_provider.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 187 matching lines @@
 
     profile.profile_duration = profile_durations[i];
     profile.sampling_period = profile_sampling_periods[i];
 
     profiles.push_back(profile);
   }
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingEnabled();
   AppendProfiles(
-      CallStackProfileParams(CallStackProfileParams::PROCESS_STARTUP,
+      CallStackProfileParams(CallStackProfileParams::BROWSER_PROCESS,
+                             CallStackProfileParams::UI_THREAD,
+                             CallStackProfileParams::PROCESS_STARTUP,
                              CallStackProfileParams::MAY_SHUFFLE),
       profiles);
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   ASSERT_EQ(static_cast<int>(arraysize(profile_sample_frames)),
             uma_proto.sampled_profile().size());
   for (size_t i = 0; i < arraysize(profile_sample_frames); ++i) {
     SCOPED_TRACE("profile " + base::SizeTToString(i));
     const SampledProfile& sampled_profile = uma_proto.sampled_profile().Get(i);
@@ skipping 41 matching lines @@
       EXPECT_EQ(profile_expected_name_md5_prefixes[i][j],
                 module_identifier.name_md5_prefix());
     }
 
     ASSERT_TRUE(call_stack_profile.has_profile_duration_ms());
     EXPECT_EQ(profile_durations[i].InMilliseconds(),
               call_stack_profile.profile_duration_ms());
     ASSERT_TRUE(call_stack_profile.has_sampling_period_ms());
     EXPECT_EQ(profile_sampling_periods[i].InMilliseconds(),
               call_stack_profile.sampling_period_ms());
+    ASSERT_TRUE(sampled_profile.has_process());
+    EXPECT_EQ(BROWSER_PROCESS, sampled_profile.process());
+    ASSERT_TRUE(sampled_profile.has_thread());
+    EXPECT_EQ(UI_THREAD, sampled_profile.thread());
     ASSERT_TRUE(sampled_profile.has_trigger_event());
     EXPECT_EQ(SampledProfile::PROCESS_STARTUP, sampled_profile.trigger_event());
   }
 }
 
 // Checks that all duplicate samples are collapsed with
 // preserve_sample_ordering = false.
 TEST_F(CallStackProfileMetricsProviderTest, RepeatedStacksUnordered) {
   const uintptr_t module_base_address = 0x1000;
 
@@ skipping 27 matching lines @@
     sample.insert(sample.end(), &sample_frames[i][0],
                   &sample_frames[i][0] + arraysize(sample_frames[i]));
   }
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingEnabled();
   AppendProfiles(
-      CallStackProfileParams(CallStackProfileParams::PROCESS_STARTUP,
+      CallStackProfileParams(CallStackProfileParams::BROWSER_PROCESS,
+                             CallStackProfileParams::UI_THREAD,
+                             CallStackProfileParams::PROCESS_STARTUP,
                              CallStackProfileParams::MAY_SHUFFLE),
       std::vector<Profile>(1, profile));
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   ASSERT_EQ(1, uma_proto.sampled_profile().size());
   const SampledProfile& sampled_profile = uma_proto.sampled_profile().Get(0);
   ASSERT_TRUE(sampled_profile.has_call_stack_profile());
   const CallStackProfile& call_stack_profile =
       sampled_profile.call_stack_profile();
@@ skipping 59 matching lines @@
     Sample& sample = profile.samples.back();
     sample.insert(sample.end(), &sample_frames[i][0],
                   &sample_frames[i][0] + arraysize(sample_frames[i]));
   }
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingEnabled();
-  AppendProfiles(CallStackProfileParams(CallStackProfileParams::PROCESS_STARTUP,
+  AppendProfiles(CallStackProfileParams(CallStackProfileParams::BROWSER_PROCESS,
+                                        CallStackProfileParams::UI_THREAD,
+                                        CallStackProfileParams::PROCESS_STARTUP,
                                         CallStackProfileParams::PRESERVE_ORDER),
                  std::vector<Profile>(1, profile));
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   ASSERT_EQ(1, uma_proto.sampled_profile().size());
   const SampledProfile& sampled_profile = uma_proto.sampled_profile().Get(0);
   ASSERT_TRUE(sampled_profile.has_call_stack_profile());
   const CallStackProfile& call_stack_profile =
       sampled_profile.call_stack_profile();
@@ skipping 32 matching lines @@
   Profile profile;
 
   profile.samples.push_back(Sample(1, frame));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingEnabled();
   AppendProfiles(
-      CallStackProfileParams(CallStackProfileParams::PROCESS_STARTUP,
+      CallStackProfileParams(CallStackProfileParams::BROWSER_PROCESS,
+                             CallStackProfileParams::UI_THREAD,
+                             CallStackProfileParams::PROCESS_STARTUP,
                              CallStackProfileParams::MAY_SHUFFLE),
       std::vector<Profile>(1, profile));
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   ASSERT_EQ(1, uma_proto.sampled_profile().size());
   const SampledProfile& sampled_profile = uma_proto.sampled_profile().Get(0);
   ASSERT_TRUE(sampled_profile.has_call_stack_profile());
   const CallStackProfile& call_stack_profile =
       sampled_profile.call_stack_profile();
@@ skipping 17 matching lines @@
     Profile profile;
     profile.samples.push_back(
         Sample(1, Frame(0x1000, Frame::kUnknownModuleIndex)));
 
     profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
     // Use the sampling period to distinguish the two profiles.
     profile.sampling_period = base::TimeDelta::FromMilliseconds(i);
 
     provider.OnRecordingEnabled();
     AppendProfiles(
-        CallStackProfileParams(CallStackProfileParams::PROCESS_STARTUP,
+        CallStackProfileParams(CallStackProfileParams::BROWSER_PROCESS,
+                               CallStackProfileParams::UI_THREAD,
+                               CallStackProfileParams::PROCESS_STARTUP,
                                CallStackProfileParams::MAY_SHUFFLE),
         std::vector<Profile>(1, profile));
     ChromeUserMetricsExtension uma_proto;
     provider.ProvideGeneralMetrics(&uma_proto);
 
     ASSERT_EQ(1, uma_proto.sampled_profile().size());
     const SampledProfile& sampled_profile = uma_proto.sampled_profile().Get(0);
     ASSERT_TRUE(sampled_profile.has_call_stack_profile());
     const CallStackProfile& call_stack_profile =
         sampled_profile.call_stack_profile();
     ASSERT_TRUE(call_stack_profile.has_sampling_period_ms());
     EXPECT_EQ(i, call_stack_profile.sampling_period_ms());
   }
 }
 
 // Checks that pending profiles are provided to ProvideGeneralMetrics
 // when collected before CallStackProfileMetricsProvider is instantiated.
 TEST_F(CallStackProfileMetricsProviderTest,
        ProfilesProvidedWhenCollectedBeforeInstantiation) {
   Profile profile;
   profile.samples.push_back(
       Sample(1, Frame(0x1000, Frame::kUnknownModuleIndex)));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   AppendProfiles(
-      CallStackProfileParams(CallStackProfileParams::PROCESS_STARTUP,
+      CallStackProfileParams(CallStackProfileParams::BROWSER_PROCESS,
+                             CallStackProfileParams::UI_THREAD,
+                             CallStackProfileParams::PROCESS_STARTUP,
                              CallStackProfileParams::MAY_SHUFFLE),
       std::vector<Profile>(1, profile));
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingEnabled();
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   EXPECT_EQ(1, uma_proto.sampled_profile_size());
 }
 
 // Checks that pending profiles are not provided to ProvideGeneralMetrics
 // while recording is disabled.
 TEST_F(CallStackProfileMetricsProviderTest, ProfilesNotProvidedWhileDisabled) {
   Profile profile;
   profile.samples.push_back(
       Sample(1, Frame(0x1000, Frame::kUnknownModuleIndex)));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingDisabled();
   AppendProfiles(
-      CallStackProfileParams(CallStackProfileParams::PROCESS_STARTUP,
+      CallStackProfileParams(CallStackProfileParams::BROWSER_PROCESS,
+                             CallStackProfileParams::UI_THREAD,
+                             CallStackProfileParams::PROCESS_STARTUP,
                              CallStackProfileParams::MAY_SHUFFLE),
       std::vector<Profile>(1, profile));
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   EXPECT_EQ(0, uma_proto.sampled_profile_size());
 }
 
 // Checks that pending profiles are not provided to ProvideGeneralMetrics
 // if recording is disabled while profiling.
 TEST_F(CallStackProfileMetricsProviderTest,
        ProfilesNotProvidedAfterChangeToDisabled) {
   Profile profile;
   profile.samples.push_back(
       Sample(1, Frame(0x1000, Frame::kUnknownModuleIndex)));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingEnabled();
   base::StackSamplingProfiler::CompletedCallback callback =
       CallStackProfileMetricsProvider::GetProfilerCallback(
-          CallStackProfileParams(CallStackProfileParams::PROCESS_STARTUP,
+          CallStackProfileParams(CallStackProfileParams::BROWSER_PROCESS,
+                                 CallStackProfileParams::UI_THREAD,
+                                 CallStackProfileParams::PROCESS_STARTUP,
                                  CallStackProfileParams::MAY_SHUFFLE));
 
   provider.OnRecordingDisabled();
   callback.Run(std::vector<Profile>(1, profile));
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   EXPECT_EQ(0, uma_proto.sampled_profile_size());
 }
 
 // Checks that pending profiles are not provided to ProvideGeneralMetrics if
 // recording is enabled, but then disabled and reenabled while profiling.
 TEST_F(CallStackProfileMetricsProviderTest,
        ProfilesNotProvidedAfterChangeToDisabledThenEnabled) {
   Profile profile;
   profile.samples.push_back(
       Sample(1, Frame(0x1000, Frame::kUnknownModuleIndex)));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingEnabled();
   base::StackSamplingProfiler::CompletedCallback callback =
       CallStackProfileMetricsProvider::GetProfilerCallback(
-          CallStackProfileParams(CallStackProfileParams::PROCESS_STARTUP,
+          CallStackProfileParams(CallStackProfileParams::BROWSER_PROCESS,
+                                 CallStackProfileParams::UI_THREAD,
+                                 CallStackProfileParams::PROCESS_STARTUP,
                                  CallStackProfileParams::MAY_SHUFFLE));
 
   provider.OnRecordingDisabled();
   provider.OnRecordingEnabled();
   callback.Run(std::vector<Profile>(1, profile));
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   EXPECT_EQ(0, uma_proto.sampled_profile_size());
 }
 
 // Checks that pending profiles are not provided to ProvideGeneralMetrics
 // if recording is disabled, but then enabled while profiling.
 TEST_F(CallStackProfileMetricsProviderTest,
        ProfilesNotProvidedAfterChangeFromDisabled) {
   Profile profile;
   profile.samples.push_back(
       Sample(1, Frame(0x1000, Frame::kUnknownModuleIndex)));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingDisabled();
   base::StackSamplingProfiler::CompletedCallback callback =
       CallStackProfileMetricsProvider::GetProfilerCallback(
-          CallStackProfileParams(CallStackProfileParams::PROCESS_STARTUP,
+          CallStackProfileParams(CallStackProfileParams::BROWSER_PROCESS,
+                                 CallStackProfileParams::UI_THREAD,
+                                 CallStackProfileParams::PROCESS_STARTUP,
                                  CallStackProfileParams::MAY_SHUFFLE));
 
   provider.OnRecordingEnabled();
   callback.Run(std::vector<Profile>(1, profile));
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   EXPECT_EQ(0, uma_proto.sampled_profile_size());
 }
 
 }  // namespace metrics