8d57635c59
Adjusting logs in a few ways:
* The `DAP_LOG` and `DAP_LOG_ERROR` macros now include the file/line of
the log statement.
* Added support for creating a log with a prefix. This simplifies how we
create logs for the `lldb_dap::DAP` instance and `lldb_dap::Transport`
instance, allowing us to not have to pass the client name around as
much.
* Updated logging usage to take the `lldb_dap::Log` as a reference but
it now defaults to `llvm::raw_null_stream` if not configured. This
ensures more uniform access to the logger, even if its not written
anywhere.
The logs now look like:
```
1764896564.038788080 (stdio) --> {"command":"initialize","arguments":{...},"type":"request","seq":1}
1764896564.039064884 DAP.cpp:1007 (stdio) queued (command=initialize seq=1)
1764896564.039768934 (stdio) <-- {"body":{...},"command":"initialize","request_seq":1,"seq":1,"success":true,"type":"response"}
```
54 lines
1.7 KiB
C++
54 lines
1.7 KiB
C++
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "DAPLog.h"
|
|
#include "llvm/Support/raw_ostream.h"
|
|
#include "gmock/gmock.h"
|
|
#include "gtest/gtest.h"
|
|
|
|
using namespace lldb_dap;
|
|
using namespace llvm;
|
|
using namespace testing;
|
|
|
|
static llvm::StringRef last_line(llvm::StringRef str) {
|
|
size_t index = str.find_last_of('\n', str.size() - 1);
|
|
if (index == llvm::StringRef::npos)
|
|
return str;
|
|
return str.substr(index + 1);
|
|
}
|
|
|
|
#define TIMESTAMP_PATTERN "\\[[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3}\\] "
|
|
|
|
TEST(DAPLog, Emit) {
|
|
Log::Mutex mux;
|
|
std::string outs;
|
|
raw_string_ostream os(outs);
|
|
Log log(os, mux);
|
|
Log inner_log = log.WithPrefix("my_prefix:");
|
|
|
|
log.Emit("Hi");
|
|
EXPECT_THAT(last_line(outs), MatchesRegex(TIMESTAMP_PATTERN "Hi\n"));
|
|
|
|
inner_log.Emit("foobar");
|
|
EXPECT_THAT(last_line(outs),
|
|
MatchesRegex(TIMESTAMP_PATTERN "my_prefix: foobar\n"));
|
|
|
|
log.Emit("Hello from a file/line.", "file.cpp", 42);
|
|
EXPECT_THAT(
|
|
last_line(outs),
|
|
MatchesRegex(TIMESTAMP_PATTERN "file.cpp:42 Hello from a file/line.\n"));
|
|
|
|
inner_log.Emit("Hello from a file/line.", "file.cpp", 42);
|
|
EXPECT_THAT(last_line(outs),
|
|
MatchesRegex(TIMESTAMP_PATTERN
|
|
"file.cpp:42 my_prefix: Hello from a file/line.\n"));
|
|
|
|
log.WithPrefix("a").WithPrefix("b").WithPrefix("c").Emit("msg");
|
|
EXPECT_THAT(last_line(outs), MatchesRegex(TIMESTAMP_PATTERN "a b c msg\n"));
|
|
}
|