Skip to content

Commit 55dba06

Browse files
authored
Addressed additional review comments from PR/119716. (#126757)
1 parent a6f2a1e commit 55dba06

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

lldb/include/lldb/Core/Telemetry.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct LLDBBaseTelemetryInfo : public llvm::telemetry::TelemetryInfo {
5656
void serialize(llvm::telemetry::Serializer &serializer) const override;
5757
};
5858

59-
/// The base Telemetry manager instance in LLDB
59+
/// The base Telemetry manager instance in LLDB.
6060
/// This class declares additional instrumentation points
6161
/// applicable to LLDB.
6262
class TelemetryManager : public llvm::telemetry::Manager {

lldb/source/Core/Telemetry.cpp

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@
2929
namespace lldb_private {
3030
namespace telemetry {
3131

32-
using ::llvm::Error;
33-
using ::llvm::telemetry::Destination;
34-
using ::llvm::telemetry::Serializer;
35-
using ::llvm::telemetry::TelemetryInfo;
32+
using namespace llvm::telemetry;
3633

3734
static uint64_t ToNanosec(const SteadyTimePoint Point) {
3835
return std::chrono::nanoseconds(Point.time_since_epoch()).count();
@@ -46,28 +43,27 @@ void LLDBBaseTelemetryInfo::serialize(Serializer &serializer) const {
4643
serializer.write("end_time", ToNanosec(end_time.value()));
4744
}
4845

49-
[[maybe_unused]] static std::string MakeUUID(lldb_private::Debugger *debugger) {
46+
[[maybe_unused]] static std::string MakeUUID(Debugger *debugger) {
5047
uint8_t random_bytes[16];
5148
if (auto ec = llvm::getRandomBytes(random_bytes, 16)) {
5249
LLDB_LOG(GetLog(LLDBLog::Object),
5350
"Failed to generate random bytes for UUID: {0}", ec.message());
54-
// fallback to using timestamp + debugger ID.
51+
// Fallback to using timestamp + debugger ID.
5552
return llvm::formatv(
5653
"{0}_{1}", std::chrono::steady_clock::now().time_since_epoch().count(),
5754
debugger->GetID());
5855
}
59-
return lldb_private::UUID(random_bytes).GetAsString();
56+
return UUID(random_bytes).GetAsString();
6057
}
6158

62-
TelemetryManager::TelemetryManager(
63-
std::unique_ptr<llvm::telemetry::Config> config)
59+
TelemetryManager::TelemetryManager(std::unique_ptr<Config> config)
6460
: m_config(std::move(config)) {}
6561

6662
llvm::Error TelemetryManager::preDispatch(TelemetryInfo *entry) {
6763
// Do nothing for now.
6864
// In up-coming patch, this would be where the manager
6965
// attach the session_uuid to the entry.
70-
return Error::success();
66+
return llvm::Error::success();
7167
}
7268

7369
std::unique_ptr<TelemetryManager> TelemetryManager::g_instance = nullptr;

0 commit comments

Comments
 (0)