Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions src/datadog/tracer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,27 @@ void Tracer::store_config() {

auto defaults = config_manager_->span_defaults();

std::string container_id = "";
if (auto maybe_container_id = container::get_id()) {
container_id = maybe_container_id->value;
}

std::string buffer;
buffer.reserve(1024);

// clang-format off
msgpack::pack_map(
buffer,
"schema_version", [&](auto& buffer) { msgpack::pack_integer(buffer, std::uint64_t(1)); return Expected<void>{}; },
"schema_version", [&](auto& buffer) { msgpack::pack_integer(buffer, std::uint64_t(2)); return Expected<void>{}; },
"runtime_id", [&](auto& buffer) { return msgpack::pack_string(buffer, runtime_id_.string()); },
"tracer_version", [&](auto& buffer) { return msgpack::pack_string(buffer, signature_.library_version); },
"tracer_language", [&](auto& buffer) { return msgpack::pack_string(buffer, signature_.library_language); },
"hostname", [&](auto& buffer) { return msgpack::pack_string(buffer, hostname_.value_or("")); },
"service_name", [&](auto& buffer) { return msgpack::pack_string(buffer, defaults->service); },
"service_env", [&](auto& buffer) { return msgpack::pack_string(buffer, defaults->environment); },
"service_version", [&](auto& buffer) { return msgpack::pack_string(buffer, defaults->version); }
"service_version", [&](auto& buffer) { return msgpack::pack_string(buffer, defaults->version); },
"process_tags", [&](auto& buffer) { return msgpack::pack_string(buffer, ""); },
"container_id", [&](auto& buffer) { return msgpack::pack_string(buffer, container_id); }
);
// clang-format on

Expand Down
49 changes: 49 additions & 0 deletions test/test_tracer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
#include <datadog/tracer.h>
#include <datadog/tracer_config.h>
#include <datadog/w3c_propagation.h>
#if defined(__linux__) || defined(__unix__)
#include <dirent.h>
#include <sys/types.h>
#include <unistd.h>
#endif

#include <chrono>
#include <ctime>
Expand Down Expand Up @@ -2037,6 +2042,50 @@ TEST_TRACER("APM tracing disabled") {
}
}

#if defined(__linux__) || defined(__unix__)
TEST_TRACER("process discovery") {
auto find_memfd = []() -> std::optional<std::string> {
DIR* dir = opendir("/proc/self/fd");
if (dir == nullptr) return nullopt;

char path[PATH_MAX];
char target[PATH_MAX];

for (struct dirent* entry = readdir(dir); entry != nullptr;
entry = readdir(dir)) {
if (entry->d_type != DT_LNK) continue;

snprintf(path, sizeof(path), "/proc/self/fd/%s", entry->d_name);
auto len = readlink(path, target, sizeof(target) - 1);
if (len == -1) continue;
target[len] = '\0';

if (starts_with(target, "/memfd:datadog-tracer-info-")) {
closedir(dir);
return path;
}
}

return nullopt;
};

TracerConfig cfg;
auto finalized_config = finalize_config(cfg);
REQUIRE(finalized_config);

{
Tracer tracer{*finalized_config};

auto fd = find_memfd();
CHECK(fd);

// TODO: Read content
}

auto fd = find_memfd();
CHECK(!fd);
}
#endif
TEST_TRACER("_dd.p.ksr is NOT set when overriding the sampling decision") {
const auto collector = std::make_shared<MockCollector>();

Expand Down