Remove com.google from perfetto data source names
Caused a bit of ambiguity. Sticking with just linux.*
Bug: 72378055
Change-Id: I727fe6257c897470634dc287c3c4642ad411b629
diff --git a/docs/running_perfetto.md b/docs/running_perfetto.md
index ba59432..0763505 100644
--- a/docs/running_perfetto.md
+++ b/docs/running_perfetto.md
@@ -62,7 +62,7 @@
data_sources {
config {
- name: "com.google.perfetto.ftrace"
+ name: "linux.ftrace"
target_buffer: 0
ftrace_config {
buffer_size_kb: 40 # Kernel ftrace buffer size.
@@ -74,7 +74,7 @@
data_sources {
config {
- name: "com.google.perfetto.process_stats"
+ name: "linux.process_stats"
target_buffer: 0
}
}
diff --git a/src/perfetto_cmd/perfetto_cmd.cc b/src/perfetto_cmd/perfetto_cmd.cc
index ac5f8da..5a86919 100644
--- a/src/perfetto_cmd/perfetto_cmd.cc
+++ b/src/perfetto_cmd/perfetto_cmd.cc
@@ -130,7 +130,7 @@
test_config.add_buffers()->set_size_kb(4096);
test_config.set_duration_ms(2000);
auto* ds_config = test_config.add_data_sources()->mutable_config();
- ds_config->set_name("com.google.perfetto.ftrace");
+ ds_config->set_name("linux.ftrace");
ds_config->mutable_ftrace_config()->add_ftrace_events("sched_switch");
ds_config->mutable_ftrace_config()->add_ftrace_events("cpu_idle");
ds_config->mutable_ftrace_config()->add_ftrace_events("cpu_frequency");
diff --git a/src/traced/probes/probes_producer.cc b/src/traced/probes/probes_producer.cc
index a18854e..a18181d 100644
--- a/src/traced/probes/probes_producer.cc
+++ b/src/traced/probes/probes_producer.cc
@@ -40,9 +40,9 @@
uint64_t kInitialConnectionBackoffMs = 100;
uint64_t kMaxConnectionBackoffMs = 30 * 1000;
-constexpr char kFtraceSourceName[] = "com.google.perfetto.ftrace";
-constexpr char kProcessStatsSourceName[] = "com.google.perfetto.process_stats";
-constexpr char kInodeMapSourceName[] = "com.google.perfetto.inode_file_map";
+constexpr char kFtraceSourceName[] = "linux.ftrace";
+constexpr char kProcessStatsSourceName[] = "linux.process_stats";
+constexpr char kInodeMapSourceName[] = "linux.inode_file_map";
} // namespace.
@@ -239,7 +239,7 @@
PERFETTO_DCHECK(state_ == kNotConnected);
state_ = kConnecting;
endpoint_ = ProducerIPCClient::Connect(
- socket_name_, this, "com.google.perfetto.traced_probes", task_runner_);
+ socket_name_, this, "perfetto.traced_probes", task_runner_);
}
void ProbesProducer::IncreaseConnectionBackoff() {
diff --git a/src/tracing/test/tracing_integration_test.cc b/src/tracing/test/tracing_integration_test.cc
index c56b7a7..0f8dba6 100644
--- a/src/tracing/test/tracing_integration_test.cc
+++ b/src/tracing/test/tracing_integration_test.cc
@@ -93,7 +93,7 @@
// Create and connect a Producer.
producer_endpoint_ = ProducerIPCClient::Connect(
- kProducerSockName, &producer_, "com.google.perfetto.mock_producer",
+ kProducerSockName, &producer_, "perfetto.mock_producer",
task_runner_.get());
auto on_producer_connect =
task_runner_->CreateCheckpoint("on_producer_connect");
diff --git a/test/configs/atrace.cfg b/test/configs/atrace.cfg
index 9267238..1362a20 100644
--- a/test/configs/atrace.cfg
+++ b/test/configs/atrace.cfg
@@ -6,7 +6,7 @@
# TODO(hjd): Add some atrace config here.
data_sources {
config {
- name: "com.google.perfetto.ftrace"
+ name: "linux.ftrace"
target_buffer: 0
ftrace_config {
atrace_categories: "input"
diff --git a/test/configs/ftrace.cfg b/test/configs/ftrace.cfg
index 2bb2810..65ea849 100644
--- a/test/configs/ftrace.cfg
+++ b/test/configs/ftrace.cfg
@@ -5,7 +5,7 @@
data_sources {
config {
- name: "com.google.perfetto.ftrace"
+ name: "linux.ftrace"
target_buffer: 0
ftrace_config {
buffer_size_kb: 40 # 4 (page size) * 10
@@ -245,20 +245,20 @@
data_sources {
config {
- name: "com.google.perfetto.process_stats"
+ name: "linux.process_stats"
target_buffer: 0
}
}
data_sources {
config {
- name: "com.google.perfetto.inode_file_map"
+ name: "linux.inode_file_map"
target_buffer: 0
}
}
producers {
- producer_name: "com.google.perfetto.traced_probes"
+ producer_name: "perfetto.traced_probes"
shm_size_kb: 4096
page_size_kb: 4
}
diff --git a/test/configs/long_trace.cfg b/test/configs/long_trace.cfg
index ee62800..e81ecab 100644
--- a/test/configs/long_trace.cfg
+++ b/test/configs/long_trace.cfg
@@ -10,7 +10,7 @@
data_sources {
config {
- name: "com.google.perfetto.ftrace"
+ name: "linux.ftrace"
target_buffer: 1
ftrace_config {
buffer_size_kb: 40 # 4 (page size) * 10
@@ -141,20 +141,20 @@
data_sources {
config {
- name: "com.google.perfetto.process_stats"
+ name: "linux.process_stats"
target_buffer: 0
}
}
data_sources {
config {
- name: "com.google.perfetto.inode_file_map"
+ name: "linux.inode_file_map"
target_buffer: 0
}
}
producers {
- producer_name: "com.google.perfetto.traced_probes"
+ producer_name: "perfetto.traced_probes"
shm_size_kb: 4096
page_size_kb: 4
}
diff --git a/test/end_to_end_integrationtest.cc b/test/end_to_end_integrationtest.cc
index acaeb12..13a56b2 100644
--- a/test/end_to_end_integrationtest.cc
+++ b/test/end_to_end_integrationtest.cc
@@ -86,7 +86,7 @@
// Create the buffer for ftrace.
auto* ds_config = trace_config.add_data_sources()->mutable_config();
- ds_config->set_name("com.google.perfetto.ftrace");
+ ds_config->set_name("linux.ftrace");
ds_config->set_target_buffer(0);
// Setup the config for ftrace.
