Skip to content

Addressed additional review comments from PR/119716. #126757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oontvoo merged 6 commits into from
Feb 18, 2025
Merged

Addressed additional review comments from PR/119716. #126757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a8b914
Addressed additional review comments from PR/119716.
oontvoo Feb 11, 2025
8cb7a81
typo
oontvoo Feb 11, 2025
a3f51ca
change MakeUUID back to UUID
oontvoo Feb 12, 2025
d52e2aa
add llvm prefix
oontvoo Feb 13, 2025
7dd7230
Merge branch 'main' into followup_119716
oontvoo Feb 13, 2025
8ce02d9
Merge branch 'main' into followup_119716
oontvoo Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lldb/include/lldb/Core/Telemetry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ struct LLDBBaseTelemetryInfo : public llvm::telemetry::TelemetryInfo {
void serialize(llvm::telemetry::Serializer &serializer) const override;
};

/// The base Telemetry manager instance in LLDB
/// The base Telemetry manager instance in LLDB.
/// This class declares additional instrumentation points
/// applicable to LLDB.
class TelemetryManager : public llvm::telemetry::Manager {
Expand Down
16 changes: 6 additions & 10 deletions lldb/source/Core/Telemetry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@
namespace lldb_private {
namespace telemetry {

using ::llvm::Error;
using ::llvm::telemetry::Destination;
using ::llvm::telemetry::Serializer;
using ::llvm::telemetry::TelemetryInfo;
using namespace llvm::telemetry;

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

[[maybe_unused]] static std::string MakeUUID(lldb_private::Debugger *debugger) {
[[maybe_unused]] static std::string MakeUUID(Debugger *debugger) {
uint8_t random_bytes[16];
if (auto ec = llvm::getRandomBytes(random_bytes, 16)) {
LLDB_LOG(GetLog(LLDBLog::Object),
"Failed to generate random bytes for UUID: {0}", ec.message());
// fallback to using timestamp + debugger ID.
// Fallback to using timestamp + debugger ID.
return llvm::formatv(
"{0}_{1}", std::chrono::steady_clock::now().time_since_epoch().count(),
debugger->GetID());
}
return lldb_private::UUID(random_bytes).GetAsString();
return UUID(random_bytes).GetAsString();
}

TelemetryManager::TelemetryManager(
std::unique_ptr<llvm::telemetry::Config> config)
TelemetryManager::TelemetryManager(std::unique_ptr<Config> config)
: m_config(std::move(config)) {}

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

} // namespace telemetry
Expand Down