We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent dc5781d commit 9f7d0aaCopy full SHA for 9f7d0aa
18 files changed
BUILD.bazel
@@ -49,7 +49,6 @@ cc_library(
49
"src/datadog/version.cpp",
50
"src/datadog/w3c_propagation.cpp",
51
"src/datadog/base64.h",
52
- "src/datadog/cerr_logger.h",
53
"src/datadog/config_manager.h",
54
"src/datadog/collector_response.h",
55
"src/datadog/datadog_agent.h",
@@ -62,6 +61,7 @@ cc_library(
62
61
"src/datadog/json_serializer.h",
63
"src/datadog/limiter.h",
64
"src/datadog/msgpack.h",
+ "src/datadog/null_logger.h",
65
"src/datadog/parse_util.h",
66
"src/datadog/platform_util.h",
67
"src/datadog/random.h",
@@ -78,6 +78,7 @@ cc_library(
78
"src/datadog/w3c_propagation.h",
79
],
80
hdrs = [
81
+ "include/datadog/cerr_logger.h",
82
"include/datadog/clock.h",
83
"include/datadog/collector.h",
84
"include/datadog/config.h",
examples/hasher/hasher.cpp
@@ -10,6 +10,7 @@
10
// canonical format. Produce a trace whose structure reflects the directory
11
// structure.
12
13
+#include <datadog/cerr_logger.h>
14
#include <datadog/span_config.h>
15
#include <datadog/tracer.h>
16
#include <datadog/tracer_config.h>
@@ -133,6 +134,7 @@ int main() {
133
134
dd::TracerConfig config;
135
config.service = "dd-trace-cpp-example";
136
config.environment = "dev";
137
+ config.logger = std::make_shared<datadog::tracing::CerrLogger>();
138
139
auto validated = dd::finalize_config(config);
140
if (auto *error = validated.if_error()) {
examples/http-server/proxy/proxy.cpp
@@ -8,6 +8,7 @@
8
#include <optional>
9
#include <string_view>
+#include "datadog/cerr_logger.h"
#include "datadog/dict_reader.h"
#include "datadog/dict_writer.h"
#include "datadog/span.h"
@@ -27,6 +28,7 @@ int main() {
27
28
29
config.service = "dd-trace-cpp-http-server-example-proxy";
30
config.service_type = "proxy";
31
32
33
// `finalize_config` validates `config` and applies any settings from
34
// environment variables, such as `DD_AGENT_HOST`.
examples/http-server/server/server.cpp
@@ -21,6 +21,7 @@
21
//
22
// will deliver a response after approximately 23 milliseconds.
23
24
25
#include <datadog/clock.h>
26
#include <datadog/dict_reader.h>
#include <datadog/dict_writer.h>
@@ -110,6 +111,7 @@ int main() {
110
111
112
config.service = "dd-trace-cpp-http-server-example-server";
113
config.service_type = "server";
114
115
116
117
src/datadog/cerr_logger.h include/datadog/cerr_logger.hsrc/datadog/cerr_logger.h renamed to include/datadog/cerr_logger.h
src/datadog/cerr_logger.cpp
@@ -1,4 +1,4 @@
1
-#include "cerr_logger.h"
2
3
#include <iostream>
4
src/datadog/null_logger.h
@@ -0,0 +1,25 @@
+#pragma once
+
+// This component provides a class, `NullLogger`, that implements the `Logger`
+// interface from `logger.h`.
5
+// `NullLogger` is a no-op logger, meaning it doesn't log anything.
6
+//
7
+// `NullLogger` is the default logger used by `Tracer` unless otherwise
+// configured in `TracerConfig`.
+#include <datadog/logger.h>
+namespace datadog {
+namespace tracing {
+class NullLogger : public Logger {
+ public:
17
+ void log_error(const LogFunc&) override{};
18
+ void log_startup(const LogFunc&) override{};
19
20
+ void log_error(const Error&) override{};
+ void log_error(StringView) override{};
+};
+} // namespace tracing
+} // namespace datadog
src/datadog/tracer_config.cpp
@@ -8,9 +8,9 @@
#include <unordered_map>
#include <vector>
#include "datadog_agent.h"
#include "json.hpp"
+#include "null_logger.h"
#include "parse_util.h"
#include "platform_util.h"
#include "string_util.h"
@@ -240,7 +240,7 @@ Expected<FinalizedTracerConfig> finalize_config(const TracerConfig &config) {
240
Expected<FinalizedTracerConfig> finalize_config(const TracerConfig &user_config,
241
const Clock &clock) {
242
auto logger =
243
- user_config.logger ? user_config.logger : std::make_shared<CerrLogger>();
+ user_config.logger ? user_config.logger : std::make_shared<NullLogger>();
244
245
Expected<TracerConfig> env_config = load_tracer_env_config(*logger);
246
if (auto error = env_config.if_error()) {
test/mocks/loggers.h
@@ -16,13 +16,6 @@
using namespace datadog::tracing;
-struct NullLogger : public Logger {
- void log_error(const LogFunc&) override {}
- void log_startup(const LogFunc&) override {}
- void log_error(const Error&) override {}
- void log_error(StringView) override {}
-};
-
struct MockLogger : public Logger {
struct Entry {
enum Kind { DD_ERROR, STARTUP } kind;
test/remote_config/test_remote_config.cpp
@@ -3,7 +3,7 @@
#include "catch.hpp"
#include "datadog/json.hpp"
#include "datadog/remote_config/remote_config.h"
-#include "mocks/loggers.h"
namespace rc = datadog::remote_config;
0 commit comments