Skip to content

Commit d229b0c

Browse files
committed
fix version string; new release
1 parent 714a5c1 commit d229b0c

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

src/datadog/tracer.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ Expected<ExtractedData> extract_data(ExtractionPolicy& extract,
208208
return extracted_data;
209209
}
210210

211-
void log_startup_message(Logger& logger, std::string_view tracer_version,
211+
void log_startup_message(Logger& logger, std::string_view tracer_version_string,
212212
const Collector& collector,
213213
const SpanDefaults& defaults,
214214
const TraceSampler& trace_sampler,
@@ -219,7 +219,7 @@ void log_startup_message(Logger& logger, std::string_view tracer_version,
219219
std::size_t tags_header_max_size) {
220220
// clang-format off
221221
auto config = nlohmann::json::object({
222-
{"version", tracer_version},
222+
{"version", tracer_version_string},
223223
{"defaults", to_json(defaults)},
224224
{"collector", collector.config_json()},
225225
{"trace_sampler", trace_sampler.config_json()},
@@ -270,9 +270,10 @@ Tracer::Tracer(const FinalizedTracerConfig& config,
270270
}
271271

272272
if (config.log_on_startup) {
273-
log_startup_message(*logger_, tracer_version, *collector_, *defaults_,
274-
*trace_sampler_, *span_sampler_, injection_styles_,
275-
extraction_styles_, hostname_, tags_header_max_size_);
273+
log_startup_message(*logger_, tracer_version_string, *collector_,
274+
*defaults_, *trace_sampler_, *span_sampler_,
275+
injection_styles_, extraction_styles_, hostname_,
276+
tags_header_max_size_);
276277
}
277278
}
278279

src/datadog/version.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
namespace datadog {
44
namespace tracing {
55

6-
const std::string_view tracer_version = "0.0.0";
6+
const char* const tracer_version = "v0.1.1";
7+
const char* const tracer_version_string = "[dd-trace-cpp version v0.1.1]";
78

89
} // namespace tracing
910
} // namespace datadog

src/datadog/version.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
#pragma once
22

33
// This component provides the release version of this library.
4-
// `tracer_version` is sent to the Datadog Agent with each trace, and is printed
5-
// to the log whenever `Tracer` is initialized.
64

75
#include <string_view>
86

97
namespace datadog {
108
namespace tracing {
119

12-
extern const std::string_view tracer_version;
10+
// The release version at or before this code revision, e.g. "v0.1.1".
11+
extern const char *const tracer_version;
12+
13+
// A string literal that contains `tracer_version` but also is easier to `grep`
14+
// from the output of the `strings` command line utility, e.g. "[dd-trace-cpp
15+
// version v0.1.1]".
16+
extern const char *const tracer_version_string;
1317

1418
} // namespace tracing
1519
} // namespace datadog

0 commit comments

Comments
 (0)