diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e023603f..c5dd1d30 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -47,6 +47,8 @@ Other important options include: - `-DDD_HTTP_USE_SYSTEM_LIBCURL=ON` will link the SDK dynamically against the version of libcurl installed on your system; use `OFF` to download libcurl, build it from source, and link it into the `dd-sdk-cpp` binary - `-DDD_DEVELOPMENT_ALLOW_AUTO_INSTALL=ON` will permit the CMake configuration process to download **clang-format** and **clang-tidy** if not already present on your system - `-DDD_ENABLE_CLANG_FORMAT=OFF` and `-DDD_ENABLE_CLANG_TIDY=OFF` will omit those tools from the build +- `-DDD_ENABLE_COVERAGE=OFF` will disable `llvm-cov` instrumentation in environments where it's unsupported or undesirable +- `-DDD_ENABLE_SANITIZERS=` will disable sanitizers (useful for testing crash behavior etc.); default is `ASan,UBSan`; `TSan` and/or `MSan` can also be used as alternatives For a complete list of configuration options, see [`CMakeLists.txt`](./CMakeLists.txt). @@ -79,15 +81,26 @@ ctest --test-dir build - [`src/datadog/c/`][src-c] implements the C API. - [`src/datadog/cpp/`][src-cpp] implements the C++ API. - [`src/datadog/impl/`][src-impl] implements the core business logic of the library, split into: - - [`core/`][impl-core]: Implements the primary business logic of the SDK, including: + - [`core/`][impl-core] implements the primary business logic of the SDK, including: + - [`util/`][core-util]: Internal utility code for commonly-used functionality like asserts, diagnostic logging, etc. + - [`attribute/`][core-attribute]: Copy-on-Write implementation and other utilities used in conjunction with API-layer `datadog::Attribute` type + - [`json/`][core-json]: Minimal JSON serialization routines for encoding event data and attribute values + - [`events/`][core-events]: Utilities used to build JSON-serializable struct types for event payloads + - [`feature_types/`][core-feature-types]: Feature-specific data types used across module boundaries, including event payload types and shared context types + - [`storage/`][core-storage]: Code used to access the filesystem, prepare the SDK's `.datadog/` storage directory, and write and migrate event data + - [`platform/`][core-platform]: Implementations of platform-specific functionality like system info, HTTP client, and access to the system clock - [`core.hpp`][core-hpp]: Internal core of the SDK, which handles initialization, feature registration, and which runs the storage and upload threads. + - [`context.hpp`][context-hpp]: Common types like `CoreContext`, which provides all features with a snapshot of the SDK's essential state. - [`feature.hpp`][feature-hpp]: Interfaces used to implement specific features, allowing a feature implementation to register itself with the core, define how it generates events for storage and processes them for upload, and implement its user-facing API. - - [`storage_thread.hpp`][storage-thread-hpp]: Business logic of the storage thread, which asynchronously writes event payloads to disk, batched into TLV-formatted binary files, as those events are generated by feature implementations. - - [`upload_thread.hpp`][upload-thread-hpp]: Business logic of the upload thread, which periodically reads batches of events from storage, passes them to the appropriate feature implementation for processing, then sends them to intake over HTTP. - - [`feature_types/`][impl-feature-types]: Feature-specific data types that permit feature-to-feature interop and are thus defined as part of the core. - - [`features/`][impl-features]: Individual, independent modules for specific features: - - [`logging/`][impl-logging]: Allows users to create loggers; generates log message events in response to log calls. - - [`platform/`][impl-platform]: Platform abstraction layer, i.e. modular subsystems for platform-specific functionality like filesystem access and HTTP client. + - [`feature_scope.hpp`][feature-scope-hpp]: Definition of `FeatureScope`, the interface that gives each feature to access to Core functionality required to access and update context, generate events, etc. + - [`context_thread.hpp`][context-thread-hpp]: The context thread, where work initiated by API calls is enqueued to be processed in the background (so as not to block the calling thread), ultimately modifying `CoreContext` and/or sending events to the storage thread. + - [`storage_thread.hpp`][storage-thread-hpp]: The storage thread, which asynchronously writes event payloads to disk, batched into TLV-formatted binary files, as those events are generated by feature implementations. + - [`upload_thread.hpp`][upload-thread-hpp]: The upload thread, which periodically reads batches of events from storage, passes them to the appropriate feature implementation for processing, then sends them to intake over HTTP. + - [`messaging_thread.hpp`][messaging-thread-hpp]: The messaging thread, where messages are routed and handled, allowing features to respond to state changes that have occurred in the Core or in other features. + - [`logging/`][impl-logging] allows an application to create loggers which will send messages to Datadog. + - [`rum/`][impl-rum] allows an application to keep track of application state and user interactions via Views, Actions, Resources, etc., sending RUM events to Datadog. + - [`crash_reporting/`][impl-crash-reporting] automatically detects application crashes and sends crash reports to Datadog as RUM Errors. + - Multiple crash-handling mechanisms are planned; currently only `DD_CRASH_MODE=inprocess` is supported. - [`tests/`][tests]: Unit tests for code in `src/`, along with test-only support code. - [`examples/`][examples] demonstrates usage of both C and C++ APIs. @@ -97,14 +110,24 @@ ctest --test-dir build [src-cpp]: ./src/datadog/cpp/ [src-impl]: ./src/datadog/impl/ [impl-core]: ./src/datadog/impl/core/ +[core-util]: ./src/datadog/impl/core/util/ +[core-attribute]: ./src/datadog/impl/core/attribute/ +[core-json]: ./src/datadog/impl/core/json/ +[core-events]: ./src/datadog/impl/core/events/ +[core-feature-types]: ./src/datadog/impl/core/feature_types/ +[core-storage]: ./src/datadog/impl/core/storage/ +[core-platform]: ./src/datadog/impl/core/platform/ [core-hpp]: ./src/datadog/impl/core/core.hpp +[context-hpp]: ./src/datadog/impl/core/context.hpp [feature-hpp]: ./src/datadog/impl/core/feature.hpp +[feature-scope-hpp]: ./src/datadog/impl/core/feature_scope.hpp +[context-thread-hpp]: ./src/datadog/impl/core/context_thread.hpp [storage-thread-hpp]: ./src/datadog/impl/core/storage_thread.hpp [upload-thread-hpp]: ./src/datadog/impl/core/upload_thread.hpp -[impl-feature-types]: ./src/datadog/impl/core/feature_types/ -[impl-features]: ./src/datadog/impl/features/ -[impl-logging]: ./src/datadog/impl/features/logging/ -[impl-platform]: ./src/datadog/impl/platform/ +[messaging-thread-hpp]: ./src/datadog/impl/core/messaging_thread.hpp +[impl-logging]: ./src/datadog/impl/logging/ +[impl-rum]: ./src/datadog/impl/rum/ +[impl-crash-reporting]: ./src/datadog/impl/crash_reporting/ [tests]: ./tests/ [examples]: ./examples/ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fc2d039d..43dfa42c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,63 +22,64 @@ add_library(dd_native ${DD_LIBRARY_TYPE} datadog/cpp/rum.cpp datadog/cpp/uuid.cpp datadog/cpp/version.cpp - datadog/impl/attribute/cow.cpp - datadog/impl/attribute/merge.cpp + datadog/impl/core/ + datadog/impl/core/attribute/cow.cpp + datadog/impl/core/attribute/merge.cpp + datadog/impl/core/json/primitives/bool.cpp + datadog/impl/core/json/primitives/float.cpp + datadog/impl/core/json/primitives/integer.cpp + datadog/impl/core/json/primitives/null.cpp + datadog/impl/core/json/primitives/string.cpp + datadog/impl/core/json/primitives/timestamp.cpp + datadog/impl/core/json/primitives/uuid.cpp + datadog/impl/core/json/attribute.cpp + datadog/impl/core/json/diagnostic_attribute.cpp + datadog/impl/core/util/diagnostics.cpp + datadog/impl/core/util/error_message.cpp + datadog/impl/core/util/validation.cpp datadog/impl/core/context_thread.cpp datadog/impl/core/context.cpp - datadog/impl/core/message_bus.cpp - datadog/impl/core/messaging_thread.cpp datadog/impl/core/core.cpp datadog/impl/core/feature_read.cpp datadog/impl/core/feature_scope.cpp datadog/impl/core/feature.cpp - datadog/impl/core/storage_write.cpp + datadog/impl/core/message_bus.cpp + datadog/impl/core/messaging_thread.cpp datadog/impl/core/storage_queue.cpp datadog/impl/core/storage_thread.cpp + datadog/impl/core/storage_write.cpp datadog/impl/core/tlv.cpp datadog/impl/core/upload_scheduler.cpp datadog/impl/core/upload_thread.cpp datadog/impl/core/writer.cpp - datadog/impl/features/logging/logger.cpp - datadog/impl/features/logging/logging.cpp - datadog/impl/features/crash_reporting/crash_reporting.cpp - datadog/impl/features/rum/containers/resource_map.cpp - datadog/impl/features/rum/containers/view_array.cpp - datadog/impl/features/rum/scopes/action.cpp - datadog/impl/features/rum/scopes/application.cpp - datadog/impl/features/rum/scopes/resource.cpp - datadog/impl/features/rum/scopes/session.cpp - datadog/impl/features/rum/scopes/view.cpp - datadog/impl/features/rum/context.cpp - datadog/impl/features/rum/rum.cpp - datadog/impl/features/rum/scope.cpp - datadog/impl/json/primitives/bool.cpp - datadog/impl/json/primitives/float.cpp - datadog/impl/json/primitives/integer.cpp - datadog/impl/json/primitives/null.cpp - datadog/impl/json/primitives/string.cpp - datadog/impl/json/primitives/timestamp.cpp - datadog/impl/json/primitives/uuid.cpp - datadog/impl/json/attribute.cpp - datadog/impl/json/diagnostic_attribute.cpp - datadog/impl/diagnostics.cpp - datadog/impl/error_message.cpp - datadog/impl/validation.cpp + datadog/impl/crash_reporting/crash_reporting.cpp + datadog/impl/logging/logger.cpp + datadog/impl/logging/logging.cpp + datadog/impl/rum/containers/resource_map.cpp + datadog/impl/rum/containers/view_array.cpp + datadog/impl/rum/context.cpp + datadog/impl/rum/rum.cpp + datadog/impl/rum/scope.cpp + datadog/impl/rum/scopes/action.cpp + datadog/impl/rum/scopes/application.cpp + datadog/impl/rum/scopes/resource.cpp + datadog/impl/rum/scopes/session.cpp + datadog/impl/rum/scopes/view.cpp ) -# impl/storage, with IFilesystem implementation determined per-platform +# core/storage, with IFilesystem implementation determined per-platform target_sources(dd_native PRIVATE - datadog/impl/storage/artifact.cpp - datadog/impl/storage/feature_event.cpp - datadog/impl/storage/filesystem_wrapper.cpp - datadog/impl/storage/path.cpp - datadog/impl/storage/sdk.cpp - datadog/impl/storage/util.cpp + datadog/impl/core/storage/artifact.cpp + datadog/impl/core/storage/feature_event.cpp + datadog/impl/core/storage/filesystem_wrapper.cpp + datadog/impl/core/storage/path.cpp + datadog/impl/core/storage/sdk.cpp + datadog/impl/core/storage/util.cpp ) if(WIN32) - target_sources(dd_native PRIVATE datadog/impl/storage/filesystem_windows.cpp) + target_sources(dd_native PRIVATE datadog/impl/core/storage/filesystem_windows.cpp) else() - target_sources(dd_native PRIVATE datadog/impl/storage/filesystem_posix.cpp) + target_sources(dd_native PRIVATE datadog/impl/core/storage/filesystem_posix.cpp) endif() # Inject version number from CMake project config @@ -154,7 +155,7 @@ endif() # Platform-specific support for system clock functionality option(DD_CLOCK_USE_DEFAULT "Use default clock implementation. If disabled, you must supply an implementation of platform/clock.hpp in a file specified as DD_CLOCK_SRC" ON) if(DD_CLOCK_USE_DEFAULT) - target_sources(dd_native PRIVATE datadog/impl/platform/clock_std.cpp) + target_sources(dd_native PRIVATE datadog/impl/core/platform/clock_std.cpp) else() set(DD_CLOCK_SRC "" CACHE STRING "Path to custom implementation of platform/clock.hpp") if(DD_CLOCK_SRC) @@ -174,7 +175,7 @@ if(DD_HTTP_USE_DEFAULT) target_link_libraries(dd_native PRIVATE CURL::libcurl) get_target_property(CURL_INCLUDE_DIRS CURL::libcurl INTERFACE_INCLUDE_DIRECTORIES) target_include_directories(dd_native SYSTEM PRIVATE ${CURL_INCLUDE_DIRS}) - target_sources(dd_native PRIVATE datadog/impl/platform/http_curl.cpp) + target_sources(dd_native PRIVATE datadog/impl/core/platform/http_curl.cpp) else() set(DD_HTTP_SRC "" CACHE STRING "Path to custom implementation of platform/http.hpp") if(DD_HTTP_SRC) @@ -186,12 +187,12 @@ endif() option(DD_SYSTEMINFO_USE_DEFAULT "Use default system info implementation. If disabled, you must supply an implementation of platform/system_info.hpp in a file specified as DD_SYSTEMINFO_SRC" ON) if(DD_SYSTEMINFO_USE_DEFAULT) if(WIN32) - target_sources(dd_native PRIVATE datadog/impl/platform/system_info_windows.cpp) + target_sources(dd_native PRIVATE datadog/impl/core/platform/system_info_windows.cpp) elseif(APPLE) - target_sources(dd_native PRIVATE datadog/impl/platform/system_info_macos.cpp) + target_sources(dd_native PRIVATE datadog/impl/core/platform/system_info_macos.cpp) target_link_libraries(dd_native PRIVATE "-framework CoreFoundation") elseif(UNIX) - target_sources(dd_native PRIVATE datadog/impl/platform/system_info_linux.cpp) + target_sources(dd_native PRIVATE datadog/impl/core/platform/system_info_linux.cpp) endif() else() set(DD_SYSTEMINFO_SRC "" CACHE STRING "Path to custom implementation of platform/system_info.hpp") @@ -202,14 +203,14 @@ endif() # Crash handler implementation selection, based on DD_CRASH_MODE if(DD_CRASH_MODE STREQUAL "noop") - target_sources(dd_native PRIVATE datadog/impl/platform/crash_handler_noop.cpp) + target_sources(dd_native PRIVATE datadog/impl/core/platform/crash_handler_noop.cpp) elseif(DD_CRASH_MODE STREQUAL "inprocess") # Select platform-specific in-process crash handler implementation if(WIN32) - target_sources(dd_native PRIVATE datadog/impl/platform/crash_handler_inprocess_windows.cpp) + target_sources(dd_native PRIVATE datadog/impl/core/platform/crash_handler_inprocess_windows.cpp) elseif(UNIX) # Unified POSIX implementation for Linux and macOS - target_sources(dd_native PRIVATE datadog/impl/platform/crash_handler_inprocess_posix.cpp) + target_sources(dd_native PRIVATE datadog/impl/core/platform/crash_handler_inprocess_posix.cpp) target_compile_options(dd_native PRIVATE -fno-omit-frame-pointer) else() message(FATAL_ERROR "In-process crash handler not supported on this platform") @@ -217,9 +218,9 @@ elseif(DD_CRASH_MODE STREQUAL "inprocess") # In-process implementation needs to write crash report and context files target_sources(dd_native PRIVATE - datadog/impl/platform/crash_context_write.cpp - datadog/impl/platform/crash_report_write.cpp - datadog/impl/platform/crash_handler_buildid_cache.cpp + datadog/impl/core/platform/crash_context_write.cpp + datadog/impl/core/platform/crash_report_write.cpp + datadog/impl/core/platform/crash_handler_buildid_cache.cpp ) elseif(DD_CRASH_MODE STREQUAL "crashpad") # If building with crashpad support, integrate crashpad as a dependency: this @@ -228,7 +229,7 @@ elseif(DD_CRASH_MODE STREQUAL "crashpad") # binary-compatible builds, this script must run after compile/link options for # dd_native are fully configured. include(${DD_SDK_ROOT_DIR}/cmake/crashpad.cmake) - target_sources(dd_native PRIVATE datadog/impl/platform/crash_handler_crashpad.cpp) + target_sources(dd_native PRIVATE datadog/impl/core/platform/crash_handler_crashpad.cpp) else() message(FATAL_ERROR "Invalid DD_CRASH_MODE: ${DD_CRASH_MODE}. Must be 'noop', 'inprocess', or 'crashpad'") endif() diff --git a/src/datadog/c/attribute.cpp b/src/datadog/c/attribute.cpp index 1d2956d7..be4b1d1b 100644 --- a/src/datadog/c/attribute.cpp +++ b/src/datadog/c/attribute.cpp @@ -9,9 +9,9 @@ #include #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/attribute/cow.hpp" -#include "datadog/impl/attribute/types.hpp" +#include "datadog/impl/core/attribute/cow.hpp" +#include "datadog/impl/core/attribute/types.hpp" +#include "datadog/impl/core/util/assert.hpp" // Defensively clamp the maximum array/object capacity to a reasonable upper limit at // the API boundary, so that e.g. a call to `dd_attribute_array(-1)` (which would diff --git a/src/datadog/c/core.cpp b/src/datadog/c/core.cpp index a0420ecb..5a7380f2 100644 --- a/src/datadog/c/core.cpp +++ b/src/datadog/c/core.cpp @@ -11,8 +11,8 @@ #include "datadog/c/core_glue.hpp" #include "datadog/impl/core/core.hpp" +#include "datadog/impl/core/platform/http.hpp" #include "datadog/impl/core/types.hpp" -#include "datadog/impl/platform/http.hpp" // NOLINTBEGIN(cppcoreguidelines-owning-memory) diff --git a/src/datadog/c/core_glue.hpp b/src/datadog/c/core_glue.hpp index a4443875..bd12109e 100644 --- a/src/datadog/c/core_glue.hpp +++ b/src/datadog/c/core_glue.hpp @@ -9,7 +9,7 @@ #include #include "datadog/impl/core/core.hpp" -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" struct dd_core { std::unique_ptr impl; diff --git a/src/datadog/c/crash_reporting.cpp b/src/datadog/c/crash_reporting.cpp index 9f072a8c..bdfdcaf6 100644 --- a/src/datadog/c/crash_reporting.cpp +++ b/src/datadog/c/crash_reporting.cpp @@ -15,7 +15,7 @@ #include "datadog/c/core_glue.hpp" #include "datadog/c/crash_reporting_glue.hpp" #include "datadog/impl/core/core.hpp" -#include "datadog/impl/features/crash_reporting/crash_reporting.hpp" +#include "datadog/impl/crash_reporting/crash_reporting.hpp" static const uint32_t CRASH_REPORTING_CONFIG_VERSION = 1; diff --git a/src/datadog/c/crash_reporting_glue.hpp b/src/datadog/c/crash_reporting_glue.hpp index e7dea448..03368d39 100644 --- a/src/datadog/c/crash_reporting_glue.hpp +++ b/src/datadog/c/crash_reporting_glue.hpp @@ -11,7 +11,7 @@ #include "datadog/crash_reporting.h" #include "datadog/c/core_glue.hpp" -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { class CrashReporting; diff --git a/src/datadog/c/logging.cpp b/src/datadog/c/logging.cpp index 8b1a91fe..1b8a8c50 100644 --- a/src/datadog/c/logging.cpp +++ b/src/datadog/c/logging.cpp @@ -14,12 +14,12 @@ #include "datadog/c/core_glue.hpp" #include "datadog/c/logging_glue.hpp" -#include "datadog/impl/attribute/types.hpp" +#include "datadog/impl/core/attribute/types.hpp" #include "datadog/impl/core/core.hpp" -#include "datadog/impl/features/logging/logger.hpp" -#include "datadog/impl/features/logging/logging.hpp" -#include "datadog/impl/features/logging/types.hpp" -#include "datadog/impl/platform/clock.hpp" +#include "datadog/impl/core/platform/clock.hpp" +#include "datadog/impl/logging/logger.hpp" +#include "datadog/impl/logging/logging.hpp" +#include "datadog/impl/logging/types.hpp" static const uint32_t LOGGER_CONFIG_VERSION = 1; diff --git a/src/datadog/c/logging_glue.hpp b/src/datadog/c/logging_glue.hpp index 7a5c50e5..c9c29d11 100644 --- a/src/datadog/c/logging_glue.hpp +++ b/src/datadog/c/logging_glue.hpp @@ -11,7 +11,7 @@ #include "datadog/logging.h" #include "datadog/logging.hpp" -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { class Logger; diff --git a/src/datadog/c/rum.cpp b/src/datadog/c/rum.cpp index 847c3841..c5d21f25 100644 --- a/src/datadog/c/rum.cpp +++ b/src/datadog/c/rum.cpp @@ -14,11 +14,11 @@ #include "datadog/c/core_glue.hpp" #include "datadog/c/rum_glue.hpp" -#include "datadog/impl/attribute/types.hpp" +#include "datadog/impl/core/attribute/types.hpp" #include "datadog/impl/core/core.hpp" -#include "datadog/impl/features/rum/rum.hpp" -#include "datadog/impl/features/rum/types.hpp" -#include "datadog/impl/validation.hpp" +#include "datadog/impl/core/util/validation.hpp" +#include "datadog/impl/rum/rum.hpp" +#include "datadog/impl/rum/types.hpp" static const uint32_t RUM_CONFIG_VERSION = 1; diff --git a/src/datadog/c/rum_glue.hpp b/src/datadog/c/rum_glue.hpp index 8cc97512..ac91f237 100644 --- a/src/datadog/c/rum_glue.hpp +++ b/src/datadog/c/rum_glue.hpp @@ -11,7 +11,7 @@ #include "datadog/rum.h" #include "datadog/c/core_glue.hpp" -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { class Rum; diff --git a/src/datadog/c/timestamp.cpp b/src/datadog/c/timestamp.cpp index 4b636072..f4b71238 100644 --- a/src/datadog/c/timestamp.cpp +++ b/src/datadog/c/timestamp.cpp @@ -8,7 +8,7 @@ #include -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" extern "C" { diff --git a/src/datadog/c/uuid.cpp b/src/datadog/c/uuid.cpp index 6fbc9981..929072b3 100644 --- a/src/datadog/c/uuid.cpp +++ b/src/datadog/c/uuid.cpp @@ -10,7 +10,7 @@ #include "datadog/uuid.hpp" -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" extern "C" { diff --git a/src/datadog/cpp/attribute.cpp b/src/datadog/cpp/attribute.cpp index 0c82d31b..35319eaa 100644 --- a/src/datadog/cpp/attribute.cpp +++ b/src/datadog/cpp/attribute.cpp @@ -9,8 +9,8 @@ #include #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/attribute/cow.hpp" +#include "datadog/impl/core/attribute/cow.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog { diff --git a/src/datadog/cpp/core.cpp b/src/datadog/cpp/core.cpp index 66782b12..dcb5360f 100644 --- a/src/datadog/cpp/core.cpp +++ b/src/datadog/cpp/core.cpp @@ -10,7 +10,7 @@ #include #include "datadog/impl/core/core.hpp" -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog { diff --git a/src/datadog/cpp/crash_reporting.cpp b/src/datadog/cpp/crash_reporting.cpp index 52886d88..8a1b2403 100644 --- a/src/datadog/cpp/crash_reporting.cpp +++ b/src/datadog/cpp/crash_reporting.cpp @@ -10,7 +10,7 @@ #include "datadog/impl/core/core.hpp" #include "datadog/impl/core/feature.hpp" -#include "datadog/impl/features/crash_reporting/crash_reporting.hpp" +#include "datadog/impl/crash_reporting/crash_reporting.hpp" namespace datadog { diff --git a/src/datadog/cpp/logging.cpp b/src/datadog/cpp/logging.cpp index 72c237f9..84768c9a 100644 --- a/src/datadog/cpp/logging.cpp +++ b/src/datadog/cpp/logging.cpp @@ -10,8 +10,8 @@ #include "datadog/impl/core/core.hpp" #include "datadog/impl/core/feature.hpp" -#include "datadog/impl/features/logging/logger.hpp" -#include "datadog/impl/features/logging/logging.hpp" +#include "datadog/impl/logging/logger.hpp" +#include "datadog/impl/logging/logging.hpp" namespace datadog { diff --git a/src/datadog/cpp/rum.cpp b/src/datadog/cpp/rum.cpp index 6ce2428e..b916055a 100644 --- a/src/datadog/cpp/rum.cpp +++ b/src/datadog/cpp/rum.cpp @@ -12,9 +12,9 @@ #include "datadog/impl/core/core.hpp" #include "datadog/impl/core/feature.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/features/rum/rum.hpp" -#include "datadog/impl/validation.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" +#include "datadog/impl/core/util/validation.hpp" +#include "datadog/impl/rum/rum.hpp" namespace datadog { diff --git a/src/datadog/cpp/uuid.cpp b/src/datadog/cpp/uuid.cpp index 72465e8f..3505dd5c 100644 --- a/src/datadog/cpp/uuid.cpp +++ b/src/datadog/cpp/uuid.cpp @@ -18,7 +18,7 @@ #include #endif -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog { diff --git a/src/datadog/impl/attribute/cow.cpp b/src/datadog/impl/core/attribute/cow.cpp similarity index 99% rename from src/datadog/impl/attribute/cow.cpp rename to src/datadog/impl/core/attribute/cow.cpp index 725e472a..5a4d471a 100644 --- a/src/datadog/impl/attribute/cow.cpp +++ b/src/datadog/impl/core/attribute/cow.cpp @@ -4,12 +4,12 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/attribute/cow.hpp" +#include "datadog/impl/core/attribute/cow.hpp" #include #include -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/attribute/cow.hpp b/src/datadog/impl/core/attribute/cow.hpp similarity index 100% rename from src/datadog/impl/attribute/cow.hpp rename to src/datadog/impl/core/attribute/cow.hpp diff --git a/src/datadog/impl/attribute/merge.cpp b/src/datadog/impl/core/attribute/merge.cpp similarity index 92% rename from src/datadog/impl/attribute/merge.cpp rename to src/datadog/impl/core/attribute/merge.cpp index 16c6859f..497439c9 100644 --- a/src/datadog/impl/attribute/merge.cpp +++ b/src/datadog/impl/core/attribute/merge.cpp @@ -4,10 +4,10 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/attribute/merge.hpp" +#include "datadog/impl/core/attribute/merge.hpp" -#include "datadog/impl/assert.hpp" -#include "datadog/impl/attribute/cow.hpp" +#include "datadog/impl/core/attribute/cow.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/attribute/merge.hpp b/src/datadog/impl/core/attribute/merge.hpp similarity index 100% rename from src/datadog/impl/attribute/merge.hpp rename to src/datadog/impl/core/attribute/merge.hpp diff --git a/src/datadog/impl/attribute/typed_attribute.hpp b/src/datadog/impl/core/attribute/typed_attribute.hpp similarity index 100% rename from src/datadog/impl/attribute/typed_attribute.hpp rename to src/datadog/impl/core/attribute/typed_attribute.hpp diff --git a/src/datadog/impl/attribute/types.hpp b/src/datadog/impl/core/attribute/types.hpp similarity index 97% rename from src/datadog/impl/attribute/types.hpp rename to src/datadog/impl/core/attribute/types.hpp index fdce8895..2f1e5879 100644 --- a/src/datadog/impl/attribute/types.hpp +++ b/src/datadog/impl/core/attribute/types.hpp @@ -7,8 +7,8 @@ #include "datadog/attribute.h" #include "datadog/attribute.hpp" -#include "datadog/impl/assert.hpp" -#include "datadog/impl/attribute/cow.hpp" +#include "datadog/impl/core/attribute/cow.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/context.cpp b/src/datadog/impl/core/context.cpp index 3e230042..a2083a4e 100644 --- a/src/datadog/impl/core/context.cpp +++ b/src/datadog/impl/core/context.cpp @@ -11,8 +11,8 @@ #include "datadog/uuid.hpp" -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/message_bus.hpp" +#include "datadog/impl/core/util/assert.hpp" #include "datadog/impl/core/version.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/context_thread.hpp b/src/datadog/impl/core/context_thread.hpp index 525f97c7..3c902e0f 100644 --- a/src/datadog/impl/core/context_thread.hpp +++ b/src/datadog/impl/core/context_thread.hpp @@ -10,7 +10,7 @@ #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/queue.hpp" -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/core.cpp b/src/datadog/impl/core/core.cpp index 0d16fc93..bf60dd7f 100644 --- a/src/datadog/impl/core/core.cpp +++ b/src/datadog/impl/core/core.cpp @@ -10,15 +10,15 @@ #include #include -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/context_thread.hpp" #include "datadog/impl/core/messaging_thread.hpp" +#include "datadog/impl/core/platform/clock.hpp" +#include "datadog/impl/core/platform/http.hpp" +#include "datadog/impl/core/platform/system_info.hpp" #include "datadog/impl/core/storage_thread.hpp" #include "datadog/impl/core/types.hpp" +#include "datadog/impl/core/util/assert.hpp" #include "datadog/impl/core/version.hpp" -#include "datadog/impl/platform/clock.hpp" -#include "datadog/impl/platform/http.hpp" -#include "datadog/impl/platform/system_info.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/core.hpp b/src/datadog/impl/core/core.hpp index 0cfa8dde..69d9220c 100644 --- a/src/datadog/impl/core/core.hpp +++ b/src/datadog/impl/core/core.hpp @@ -21,16 +21,16 @@ #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/feature.hpp" #include "datadog/impl/core/message_bus.hpp" +#include "datadog/impl/core/platform/system_info.hpp" #include "datadog/impl/core/queue.hpp" +#include "datadog/impl/core/storage/filesystem.hpp" +#include "datadog/impl/core/storage/sdk.hpp" #include "datadog/impl/core/storage_queue.hpp" #include "datadog/impl/core/storage_write.hpp" #include "datadog/impl/core/types.hpp" #include "datadog/impl/core/upload_scheduler.hpp" #include "datadog/impl/core/upload_thread.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/system_info.hpp" -#include "datadog/impl/storage/filesystem.hpp" -#include "datadog/impl/storage/sdk.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" // Forward declarations namespace datadog::platform { diff --git a/src/datadog/impl/events/enum.hpp b/src/datadog/impl/core/events/enum.hpp similarity index 98% rename from src/datadog/impl/events/enum.hpp rename to src/datadog/impl/core/events/enum.hpp index f5ae939f..ba05bd7b 100644 --- a/src/datadog/impl/events/enum.hpp +++ b/src/datadog/impl/core/events/enum.hpp @@ -13,8 +13,8 @@ #include #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/core/util/json.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/events/omissible.hpp b/src/datadog/impl/core/events/omissible.hpp similarity index 97% rename from src/datadog/impl/events/omissible.hpp rename to src/datadog/impl/core/events/omissible.hpp index d147bb84..e050925d 100644 --- a/src/datadog/impl/events/omissible.hpp +++ b/src/datadog/impl/core/events/omissible.hpp @@ -6,8 +6,8 @@ #pragma once -#include "datadog/impl/assert.hpp" -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/core/util/json.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/events/struct.hpp b/src/datadog/impl/core/events/struct.hpp similarity index 99% rename from src/datadog/impl/events/struct.hpp rename to src/datadog/impl/core/events/struct.hpp index 5f81a9b2..28025267 100644 --- a/src/datadog/impl/events/struct.hpp +++ b/src/datadog/impl/core/events/struct.hpp @@ -15,8 +15,8 @@ #include #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/core/util/json.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/events/timestamp.hpp b/src/datadog/impl/core/events/timestamp.hpp similarity index 96% rename from src/datadog/impl/events/timestamp.hpp rename to src/datadog/impl/core/events/timestamp.hpp index 7cd0812e..6e31e77c 100644 --- a/src/datadog/impl/events/timestamp.hpp +++ b/src/datadog/impl/core/events/timestamp.hpp @@ -9,8 +9,8 @@ #include #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/core/util/json.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/feature.cpp b/src/datadog/impl/core/feature.cpp index 955cbb8a..d0c4693a 100644 --- a/src/datadog/impl/core/feature.cpp +++ b/src/datadog/impl/core/feature.cpp @@ -6,7 +6,7 @@ #include "datadog/impl/core/feature.hpp" -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/feature.hpp b/src/datadog/impl/core/feature.hpp index 60ff6c43..7416a915 100644 --- a/src/datadog/impl/core/feature.hpp +++ b/src/datadog/impl/core/feature.hpp @@ -14,14 +14,14 @@ #include "nonstd/expected.hpp" -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/block.hpp" #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/feature_id.hpp" #include "datadog/impl/core/feature_message.hpp" #include "datadog/impl/core/feature_scope.hpp" +#include "datadog/impl/core/platform/http.hpp" #include "datadog/impl/core/tlv.hpp" -#include "datadog/impl/platform/http.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/feature_read.cpp b/src/datadog/impl/core/feature_read.cpp index f3bcf6a8..0da1ae6e 100644 --- a/src/datadog/impl/core/feature_read.cpp +++ b/src/datadog/impl/core/feature_read.cpp @@ -6,7 +6,7 @@ #include "datadog/impl/core/feature_read.hpp" -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/feature_read.hpp b/src/datadog/impl/core/feature_read.hpp index f3ae0adc..ca45c121 100644 --- a/src/datadog/impl/core/feature_read.hpp +++ b/src/datadog/impl/core/feature_read.hpp @@ -8,11 +8,11 @@ #include -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/block.hpp" +#include "datadog/impl/core/storage/filesystem_wrapper.hpp" #include "datadog/impl/core/tlv.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/storage/filesystem_wrapper.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/feature_scope.cpp b/src/datadog/impl/core/feature_scope.cpp index ef286a97..71eea3c4 100644 --- a/src/datadog/impl/core/feature_scope.cpp +++ b/src/datadog/impl/core/feature_scope.cpp @@ -6,7 +6,7 @@ #include "datadog/impl/core/feature_scope.hpp" -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/feature_scope.hpp b/src/datadog/impl/core/feature_scope.hpp index b24fa146..e4631905 100644 --- a/src/datadog/impl/core/feature_scope.hpp +++ b/src/datadog/impl/core/feature_scope.hpp @@ -12,7 +12,7 @@ #include "datadog/impl/core/block.hpp" #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/queue.hpp" -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/feature_types/logging.hpp b/src/datadog/impl/core/feature_types/logging.hpp index a557008b..794dd8af 100644 --- a/src/datadog/impl/core/feature_types/logging.hpp +++ b/src/datadog/impl/core/feature_types/logging.hpp @@ -9,11 +9,11 @@ #include "datadog/attribute.hpp" #include "datadog/logging.hpp" +#include "datadog/impl/core/events/enum.hpp" +#include "datadog/impl/core/events/omissible.hpp" +#include "datadog/impl/core/events/struct.hpp" +#include "datadog/impl/core/events/timestamp.hpp" #include "datadog/impl/core/feature_types/rum.hpp" -#include "datadog/impl/events/enum.hpp" -#include "datadog/impl/events/omissible.hpp" -#include "datadog/impl/events/struct.hpp" -#include "datadog/impl/events/timestamp.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/feature_types/rum.hpp b/src/datadog/impl/core/feature_types/rum.hpp index a145da1e..81e372db 100644 --- a/src/datadog/impl/core/feature_types/rum.hpp +++ b/src/datadog/impl/core/feature_types/rum.hpp @@ -13,10 +13,10 @@ #include "datadog/rum.hpp" #include "datadog/uuid.hpp" -#include "datadog/impl/events/enum.hpp" -#include "datadog/impl/events/omissible.hpp" -#include "datadog/impl/events/struct.hpp" -#include "datadog/impl/events/timestamp.hpp" +#include "datadog/impl/core/events/enum.hpp" +#include "datadog/impl/core/events/omissible.hpp" +#include "datadog/impl/core/events/struct.hpp" +#include "datadog/impl/core/events/timestamp.hpp" /* ===================== INSTRUCTIONS FOR VALIDATING THIS FILE ======================== diff --git a/src/datadog/impl/json/attribute.cpp b/src/datadog/impl/core/json/attribute.cpp similarity index 97% rename from src/datadog/impl/json/attribute.cpp rename to src/datadog/impl/core/json/attribute.cpp index 46210171..574f8440 100644 --- a/src/datadog/impl/json/attribute.cpp +++ b/src/datadog/impl/core/json/attribute.cpp @@ -4,13 +4,13 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/json/attribute.hpp" +#include "datadog/impl/core/json/attribute.hpp" #include #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/core/util/json.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/json/attribute.hpp b/src/datadog/impl/core/json/attribute.hpp similarity index 96% rename from src/datadog/impl/json/attribute.hpp rename to src/datadog/impl/core/json/attribute.hpp index ee607c10..331f4509 100644 --- a/src/datadog/impl/json/attribute.hpp +++ b/src/datadog/impl/core/json/attribute.hpp @@ -10,8 +10,8 @@ #include "datadog/attribute.hpp" -#include "datadog/impl/assert.hpp" -#include "datadog/impl/json/primitives/string.hpp" +#include "datadog/impl/core/json/primitives/string.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/json/diagnostic_attribute.cpp b/src/datadog/impl/core/json/diagnostic_attribute.cpp similarity index 94% rename from src/datadog/impl/json/diagnostic_attribute.cpp rename to src/datadog/impl/core/json/diagnostic_attribute.cpp index 89fc2ac0..3f00ecfa 100644 --- a/src/datadog/impl/json/diagnostic_attribute.cpp +++ b/src/datadog/impl/core/json/diagnostic_attribute.cpp @@ -4,13 +4,13 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/json/diagnostic_attribute.hpp" +#include "datadog/impl/core/json/diagnostic_attribute.hpp" #include #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/core/util/json.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/json/diagnostic_attribute.hpp b/src/datadog/impl/core/json/diagnostic_attribute.hpp similarity index 92% rename from src/datadog/impl/json/diagnostic_attribute.hpp rename to src/datadog/impl/core/json/diagnostic_attribute.hpp index 9099e3cc..9db7b3ba 100644 --- a/src/datadog/impl/json/diagnostic_attribute.hpp +++ b/src/datadog/impl/core/json/diagnostic_attribute.hpp @@ -8,7 +8,7 @@ #include -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/json/optional.hpp b/src/datadog/impl/core/json/optional.hpp similarity index 96% rename from src/datadog/impl/json/optional.hpp rename to src/datadog/impl/core/json/optional.hpp index 180bfe07..82f1859c 100644 --- a/src/datadog/impl/json/optional.hpp +++ b/src/datadog/impl/core/json/optional.hpp @@ -9,7 +9,7 @@ #include #include -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/json/primitives/bool.cpp b/src/datadog/impl/core/json/primitives/bool.cpp similarity index 89% rename from src/datadog/impl/json/primitives/bool.cpp rename to src/datadog/impl/core/json/primitives/bool.cpp index a81a95e8..9dcbe85d 100644 --- a/src/datadog/impl/json/primitives/bool.cpp +++ b/src/datadog/impl/core/json/primitives/bool.cpp @@ -4,11 +4,11 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/json/primitives/bool.hpp" +#include "datadog/impl/core/json/primitives/bool.hpp" #include -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/json/primitives/bool.hpp b/src/datadog/impl/core/json/primitives/bool.hpp similarity index 100% rename from src/datadog/impl/json/primitives/bool.hpp rename to src/datadog/impl/core/json/primitives/bool.hpp diff --git a/src/datadog/impl/json/primitives/float.cpp b/src/datadog/impl/core/json/primitives/float.cpp similarity index 95% rename from src/datadog/impl/json/primitives/float.cpp rename to src/datadog/impl/core/json/primitives/float.cpp index 3a747584..c043f0e8 100644 --- a/src/datadog/impl/json/primitives/float.cpp +++ b/src/datadog/impl/core/json/primitives/float.cpp @@ -4,13 +4,13 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/json/primitives/float.hpp" +#include "datadog/impl/core/json/primitives/float.hpp" #include #include #include -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/json/primitives/float.hpp b/src/datadog/impl/core/json/primitives/float.hpp similarity index 100% rename from src/datadog/impl/json/primitives/float.hpp rename to src/datadog/impl/core/json/primitives/float.hpp diff --git a/src/datadog/impl/json/primitives/integer.cpp b/src/datadog/impl/core/json/primitives/integer.cpp similarity index 98% rename from src/datadog/impl/json/primitives/integer.cpp rename to src/datadog/impl/core/json/primitives/integer.cpp index 3b1fe32f..685e973b 100644 --- a/src/datadog/impl/json/primitives/integer.cpp +++ b/src/datadog/impl/core/json/primitives/integer.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/json/primitives/integer.hpp" +#include "datadog/impl/core/json/primitives/integer.hpp" #include @@ -12,7 +12,7 @@ #include #endif -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/json/primitives/integer.hpp b/src/datadog/impl/core/json/primitives/integer.hpp similarity index 100% rename from src/datadog/impl/json/primitives/integer.hpp rename to src/datadog/impl/core/json/primitives/integer.hpp diff --git a/src/datadog/impl/json/primitives/monostate.hpp b/src/datadog/impl/core/json/primitives/monostate.hpp similarity index 100% rename from src/datadog/impl/json/primitives/monostate.hpp rename to src/datadog/impl/core/json/primitives/monostate.hpp diff --git a/src/datadog/impl/json/primitives/null.cpp b/src/datadog/impl/core/json/primitives/null.cpp similarity index 85% rename from src/datadog/impl/json/primitives/null.cpp rename to src/datadog/impl/core/json/primitives/null.cpp index 4b5608fb..e7050abf 100644 --- a/src/datadog/impl/json/primitives/null.cpp +++ b/src/datadog/impl/core/json/primitives/null.cpp @@ -4,12 +4,12 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/json/primitives/null.hpp" +#include "datadog/impl/core/json/primitives/null.hpp" #include #include -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/json/primitives/null.hpp b/src/datadog/impl/core/json/primitives/null.hpp similarity index 100% rename from src/datadog/impl/json/primitives/null.hpp rename to src/datadog/impl/core/json/primitives/null.hpp diff --git a/src/datadog/impl/json/primitives/string.cpp b/src/datadog/impl/core/json/primitives/string.cpp similarity index 97% rename from src/datadog/impl/json/primitives/string.cpp rename to src/datadog/impl/core/json/primitives/string.cpp index e61e8aad..17248187 100644 --- a/src/datadog/impl/json/primitives/string.cpp +++ b/src/datadog/impl/core/json/primitives/string.cpp @@ -4,11 +4,11 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/json/primitives/string.hpp" +#include "datadog/impl/core/json/primitives/string.hpp" #include -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/json/primitives/string.hpp b/src/datadog/impl/core/json/primitives/string.hpp similarity index 100% rename from src/datadog/impl/json/primitives/string.hpp rename to src/datadog/impl/core/json/primitives/string.hpp diff --git a/src/datadog/impl/json/primitives/timestamp.cpp b/src/datadog/impl/core/json/primitives/timestamp.cpp similarity index 98% rename from src/datadog/impl/json/primitives/timestamp.cpp rename to src/datadog/impl/core/json/primitives/timestamp.cpp index 90a8dbdf..557d2a69 100644 --- a/src/datadog/impl/json/primitives/timestamp.cpp +++ b/src/datadog/impl/core/json/primitives/timestamp.cpp @@ -4,14 +4,14 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/json/primitives/timestamp.hpp" +#include "datadog/impl/core/json/primitives/timestamp.hpp" #include #include #include "date/date.h" -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/json/primitives/timestamp.hpp b/src/datadog/impl/core/json/primitives/timestamp.hpp similarity index 100% rename from src/datadog/impl/json/primitives/timestamp.hpp rename to src/datadog/impl/core/json/primitives/timestamp.hpp diff --git a/src/datadog/impl/json/primitives/uuid.cpp b/src/datadog/impl/core/json/primitives/uuid.cpp similarity index 95% rename from src/datadog/impl/json/primitives/uuid.cpp rename to src/datadog/impl/core/json/primitives/uuid.cpp index 7e9e8996..d6a2680c 100644 --- a/src/datadog/impl/json/primitives/uuid.cpp +++ b/src/datadog/impl/core/json/primitives/uuid.cpp @@ -4,11 +4,11 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/json/primitives/uuid.hpp" +#include "datadog/impl/core/json/primitives/uuid.hpp" #include -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/json/primitives/uuid.hpp b/src/datadog/impl/core/json/primitives/uuid.hpp similarity index 100% rename from src/datadog/impl/json/primitives/uuid.hpp rename to src/datadog/impl/core/json/primitives/uuid.hpp diff --git a/src/datadog/impl/core/message_bus.hpp b/src/datadog/impl/core/message_bus.hpp index 49c49c83..79a27225 100644 --- a/src/datadog/impl/core/message_bus.hpp +++ b/src/datadog/impl/core/message_bus.hpp @@ -11,7 +11,7 @@ #include "datadog/impl/core/feature_message.hpp" #include "datadog/impl/core/queue.hpp" -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/messaging_thread.hpp b/src/datadog/impl/core/messaging_thread.hpp index d8a60e6c..768ce7cb 100644 --- a/src/datadog/impl/core/messaging_thread.hpp +++ b/src/datadog/impl/core/messaging_thread.hpp @@ -7,7 +7,7 @@ #pragma once #include "datadog/impl/core/message_bus.hpp" -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/platform/clock.hpp b/src/datadog/impl/core/platform/clock.hpp similarity index 100% rename from src/datadog/impl/platform/clock.hpp rename to src/datadog/impl/core/platform/clock.hpp diff --git a/src/datadog/impl/platform/clock_std.cpp b/src/datadog/impl/core/platform/clock_std.cpp similarity index 92% rename from src/datadog/impl/platform/clock_std.cpp rename to src/datadog/impl/core/platform/clock_std.cpp index dea099b3..f0378c4f 100644 --- a/src/datadog/impl/platform/clock_std.cpp +++ b/src/datadog/impl/core/platform/clock_std.cpp @@ -6,7 +6,7 @@ #include -#include "datadog/impl/platform/clock.hpp" +#include "datadog/impl/core/platform/clock.hpp" namespace datadog::platform { diff --git a/src/datadog/impl/platform/crash_context.hpp b/src/datadog/impl/core/platform/crash_context.hpp similarity index 100% rename from src/datadog/impl/platform/crash_context.hpp rename to src/datadog/impl/core/platform/crash_context.hpp diff --git a/src/datadog/impl/platform/crash_context_write.cpp b/src/datadog/impl/core/platform/crash_context_write.cpp similarity index 96% rename from src/datadog/impl/platform/crash_context_write.cpp rename to src/datadog/impl/core/platform/crash_context_write.cpp index 30821f95..5328574d 100644 --- a/src/datadog/impl/platform/crash_context_write.cpp +++ b/src/datadog/impl/core/platform/crash_context_write.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/platform/crash_context_write.hpp" +#include "datadog/impl/core/platform/crash_context_write.hpp" #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN @@ -21,7 +21,7 @@ #include #include "datadog/impl/core/feature_types/rum.hpp" -#include "datadog/impl/platform/crash_context.hpp" +#include "datadog/impl/core/platform/crash_context.hpp" namespace datadog::platform { diff --git a/src/datadog/impl/platform/crash_context_write.hpp b/src/datadog/impl/core/platform/crash_context_write.hpp similarity index 100% rename from src/datadog/impl/platform/crash_context_write.hpp rename to src/datadog/impl/core/platform/crash_context_write.hpp diff --git a/src/datadog/impl/platform/crash_handler.hpp b/src/datadog/impl/core/platform/crash_handler.hpp similarity index 100% rename from src/datadog/impl/platform/crash_handler.hpp rename to src/datadog/impl/core/platform/crash_handler.hpp diff --git a/src/datadog/impl/platform/crash_handler_buildid_cache.cpp b/src/datadog/impl/core/platform/crash_handler_buildid_cache.cpp similarity index 100% rename from src/datadog/impl/platform/crash_handler_buildid_cache.cpp rename to src/datadog/impl/core/platform/crash_handler_buildid_cache.cpp diff --git a/src/datadog/impl/platform/crash_handler_buildid_cache.hpp b/src/datadog/impl/core/platform/crash_handler_buildid_cache.hpp similarity index 100% rename from src/datadog/impl/platform/crash_handler_buildid_cache.hpp rename to src/datadog/impl/core/platform/crash_handler_buildid_cache.hpp diff --git a/src/datadog/impl/platform/crash_handler_crashpad.cpp b/src/datadog/impl/core/platform/crash_handler_crashpad.cpp similarity index 99% rename from src/datadog/impl/platform/crash_handler_crashpad.cpp rename to src/datadog/impl/core/platform/crash_handler_crashpad.cpp index 03b404b6..57dd9305 100644 --- a/src/datadog/impl/platform/crash_handler_crashpad.cpp +++ b/src/datadog/impl/core/platform/crash_handler_crashpad.cpp @@ -15,8 +15,8 @@ #include "client/settings.h" #include "datadog/impl/core/feature_types/rum.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/crash_handler.hpp" +#include "datadog/impl/core/platform/crash_handler.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN diff --git a/src/datadog/impl/platform/crash_handler_inprocess_posix.cpp b/src/datadog/impl/core/platform/crash_handler_inprocess_posix.cpp similarity index 99% rename from src/datadog/impl/platform/crash_handler_inprocess_posix.cpp rename to src/datadog/impl/core/platform/crash_handler_inprocess_posix.cpp index 02ea158e..c7f471aa 100644 --- a/src/datadog/impl/platform/crash_handler_inprocess_posix.cpp +++ b/src/datadog/impl/core/platform/crash_handler_inprocess_posix.cpp @@ -38,13 +38,13 @@ static_assert( #include #endif -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/feature_types/rum.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/crash_context_write.hpp" -#include "datadog/impl/platform/crash_handler.hpp" -#include "datadog/impl/platform/crash_handler_buildid_cache.hpp" -#include "datadog/impl/platform/crash_report_write.hpp" +#include "datadog/impl/core/platform/crash_context_write.hpp" +#include "datadog/impl/core/platform/crash_handler.hpp" +#include "datadog/impl/core/platform/crash_handler_buildid_cache.hpp" +#include "datadog/impl/core/platform/crash_report_write.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::platform { diff --git a/src/datadog/impl/platform/crash_handler_inprocess_windows.cpp b/src/datadog/impl/core/platform/crash_handler_inprocess_windows.cpp similarity index 97% rename from src/datadog/impl/platform/crash_handler_inprocess_windows.cpp rename to src/datadog/impl/core/platform/crash_handler_inprocess_windows.cpp index 3ee4cb4a..ba24a7ff 100644 --- a/src/datadog/impl/platform/crash_handler_inprocess_windows.cpp +++ b/src/datadog/impl/core/platform/crash_handler_inprocess_windows.cpp @@ -20,13 +20,13 @@ #include #include -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/feature_types/rum.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/crash_context_write.hpp" -#include "datadog/impl/platform/crash_handler.hpp" -#include "datadog/impl/platform/crash_handler_buildid_cache.hpp" -#include "datadog/impl/platform/crash_report_write.hpp" +#include "datadog/impl/core/platform/crash_context_write.hpp" +#include "datadog/impl/core/platform/crash_handler.hpp" +#include "datadog/impl/core/platform/crash_handler_buildid_cache.hpp" +#include "datadog/impl/core/platform/crash_report_write.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::platform { diff --git a/src/datadog/impl/platform/crash_handler_noop.cpp b/src/datadog/impl/core/platform/crash_handler_noop.cpp similarity index 95% rename from src/datadog/impl/platform/crash_handler_noop.cpp rename to src/datadog/impl/core/platform/crash_handler_noop.cpp index 71098312..fc677643 100644 --- a/src/datadog/impl/platform/crash_handler_noop.cpp +++ b/src/datadog/impl/core/platform/crash_handler_noop.cpp @@ -4,8 +4,8 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/crash_handler.hpp" +#include "datadog/impl/core/platform/crash_handler.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::platform { diff --git a/src/datadog/impl/platform/crash_report.hpp b/src/datadog/impl/core/platform/crash_report.hpp similarity index 100% rename from src/datadog/impl/platform/crash_report.hpp rename to src/datadog/impl/core/platform/crash_report.hpp diff --git a/src/datadog/impl/platform/crash_report_write.cpp b/src/datadog/impl/core/platform/crash_report_write.cpp similarity index 98% rename from src/datadog/impl/platform/crash_report_write.cpp rename to src/datadog/impl/core/platform/crash_report_write.cpp index 01ef999e..a3119c56 100644 --- a/src/datadog/impl/platform/crash_report_write.cpp +++ b/src/datadog/impl/core/platform/crash_report_write.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/platform/crash_report_write.hpp" +#include "datadog/impl/core/platform/crash_report_write.hpp" #ifndef _WIN32 #include diff --git a/src/datadog/impl/platform/crash_report_write.hpp b/src/datadog/impl/core/platform/crash_report_write.hpp similarity index 96% rename from src/datadog/impl/platform/crash_report_write.hpp rename to src/datadog/impl/core/platform/crash_report_write.hpp index 0d119d95..93e3ab0b 100644 --- a/src/datadog/impl/platform/crash_report_write.hpp +++ b/src/datadog/impl/core/platform/crash_report_write.hpp @@ -11,7 +11,7 @@ #include #endif -#include "datadog/impl/platform/crash_report.hpp" +#include "datadog/impl/core/platform/crash_report.hpp" namespace datadog::platform { diff --git a/src/datadog/impl/platform/http.hpp b/src/datadog/impl/core/platform/http.hpp similarity index 98% rename from src/datadog/impl/platform/http.hpp rename to src/datadog/impl/core/platform/http.hpp index b138ef0a..04ee0442 100644 --- a/src/datadog/impl/platform/http.hpp +++ b/src/datadog/impl/core/platform/http.hpp @@ -22,7 +22,7 @@ #include "nonstd/expected.hpp" -#include "datadog/impl/error_message.hpp" +#include "datadog/impl/core/util/error_message.hpp" namespace datadog::platform { diff --git a/src/datadog/impl/platform/http_curl.cpp b/src/datadog/impl/core/platform/http_curl.cpp similarity index 99% rename from src/datadog/impl/platform/http_curl.cpp rename to src/datadog/impl/core/platform/http_curl.cpp index 0e49a537..acff2660 100644 --- a/src/datadog/impl/platform/http_curl.cpp +++ b/src/datadog/impl/core/platform/http_curl.cpp @@ -7,8 +7,8 @@ /** * Default HTTP client implementation using libcurl. */ -#include "datadog/impl/assert.hpp" -#include "datadog/impl/platform/http.hpp" +#include "datadog/impl/core/platform/http.hpp" +#include "datadog/impl/core/util/assert.hpp" #include "curl/curl.h" diff --git a/src/datadog/impl/platform/system_info.hpp b/src/datadog/impl/core/platform/system_info.hpp similarity index 100% rename from src/datadog/impl/platform/system_info.hpp rename to src/datadog/impl/core/platform/system_info.hpp diff --git a/src/datadog/impl/platform/system_info_linux.cpp b/src/datadog/impl/core/platform/system_info_linux.cpp similarity index 98% rename from src/datadog/impl/platform/system_info_linux.cpp rename to src/datadog/impl/core/platform/system_info_linux.cpp index 4af8ec51..7508bab4 100644 --- a/src/datadog/impl/platform/system_info_linux.cpp +++ b/src/datadog/impl/core/platform/system_info_linux.cpp @@ -12,8 +12,8 @@ #include #include -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::platform { diff --git a/src/datadog/impl/platform/system_info_macos.cpp b/src/datadog/impl/core/platform/system_info_macos.cpp similarity index 98% rename from src/datadog/impl/platform/system_info_macos.cpp rename to src/datadog/impl/core/platform/system_info_macos.cpp index 797f5de6..553793ad 100644 --- a/src/datadog/impl/platform/system_info_macos.cpp +++ b/src/datadog/impl/core/platform/system_info_macos.cpp @@ -11,8 +11,8 @@ #include -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::platform { diff --git a/src/datadog/impl/platform/system_info_windows.cpp b/src/datadog/impl/core/platform/system_info_windows.cpp similarity index 98% rename from src/datadog/impl/platform/system_info_windows.cpp rename to src/datadog/impl/core/platform/system_info_windows.cpp index 32dfad6d..b3f63ed7 100644 --- a/src/datadog/impl/platform/system_info_windows.cpp +++ b/src/datadog/impl/core/platform/system_info_windows.cpp @@ -13,10 +13,10 @@ #include #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/system_info.hpp" -#include "datadog/impl/platform/windows_timezone_mapping.hpp" +#include "datadog/impl/core/platform/system_info.hpp" +#include "datadog/impl/core/platform/windows_timezone_mapping.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" #pragma comment(lib, "wbemuuid.lib") diff --git a/src/datadog/impl/platform/windows_timezone_mapping.hpp b/src/datadog/impl/core/platform/windows_timezone_mapping.hpp similarity index 100% rename from src/datadog/impl/platform/windows_timezone_mapping.hpp rename to src/datadog/impl/core/platform/windows_timezone_mapping.hpp diff --git a/src/datadog/impl/core/queue.hpp b/src/datadog/impl/core/queue.hpp index 89f52868..9f755bb3 100644 --- a/src/datadog/impl/core/queue.hpp +++ b/src/datadog/impl/core/queue.hpp @@ -12,7 +12,7 @@ #include #include -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/storage/artifact.cpp b/src/datadog/impl/core/storage/artifact.cpp similarity index 90% rename from src/datadog/impl/storage/artifact.cpp rename to src/datadog/impl/core/storage/artifact.cpp index c7360ae1..ef6e116f 100644 --- a/src/datadog/impl/storage/artifact.cpp +++ b/src/datadog/impl/core/storage/artifact.cpp @@ -4,11 +4,11 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/storage/artifact.hpp" +#include "datadog/impl/core/storage/artifact.hpp" -#include "datadog/impl/assert.hpp" -#include "datadog/impl/storage/filesystem_wrapper.hpp" -#include "datadog/impl/storage/util.hpp" +#include "datadog/impl/core/storage/filesystem_wrapper.hpp" +#include "datadog/impl/core/storage/util.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/storage/artifact.hpp b/src/datadog/impl/core/storage/artifact.hpp similarity index 91% rename from src/datadog/impl/storage/artifact.hpp rename to src/datadog/impl/core/storage/artifact.hpp index 57ac7cd9..8c04047b 100644 --- a/src/datadog/impl/storage/artifact.hpp +++ b/src/datadog/impl/core/storage/artifact.hpp @@ -8,9 +8,9 @@ #include -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/storage/filesystem.hpp" -#include "datadog/impl/storage/path.hpp" +#include "datadog/impl/core/storage/filesystem.hpp" +#include "datadog/impl/core/storage/path.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/storage/feature_event.cpp b/src/datadog/impl/core/storage/feature_event.cpp similarity index 98% rename from src/datadog/impl/storage/feature_event.cpp rename to src/datadog/impl/core/storage/feature_event.cpp index 43742142..e5b19cb1 100644 --- a/src/datadog/impl/storage/feature_event.cpp +++ b/src/datadog/impl/core/storage/feature_event.cpp @@ -4,16 +4,16 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/storage/feature_event.hpp" +#include "datadog/impl/core/storage/feature_event.hpp" #include #include #include #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/storage/filesystem_wrapper.hpp" -#include "datadog/impl/storage/util.hpp" +#include "datadog/impl/core/storage/filesystem_wrapper.hpp" +#include "datadog/impl/core/storage/util.hpp" +#include "datadog/impl/core/util/assert.hpp" // NOLINTBEGIN(cppcoreguidelines-macro-usage) // NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables) diff --git a/src/datadog/impl/storage/feature_event.hpp b/src/datadog/impl/core/storage/feature_event.hpp similarity index 95% rename from src/datadog/impl/storage/feature_event.hpp rename to src/datadog/impl/core/storage/feature_event.hpp index 7058f686..357af656 100644 --- a/src/datadog/impl/storage/feature_event.hpp +++ b/src/datadog/impl/core/storage/feature_event.hpp @@ -8,9 +8,9 @@ #include -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/storage/filesystem.hpp" -#include "datadog/impl/storage/path.hpp" +#include "datadog/impl/core/storage/filesystem.hpp" +#include "datadog/impl/core/storage/path.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/storage/filesystem.hpp b/src/datadog/impl/core/storage/filesystem.hpp similarity index 99% rename from src/datadog/impl/storage/filesystem.hpp rename to src/datadog/impl/core/storage/filesystem.hpp index 89d60d55..70c44b17 100644 --- a/src/datadog/impl/storage/filesystem.hpp +++ b/src/datadog/impl/core/storage/filesystem.hpp @@ -17,7 +17,7 @@ #include #include -#include "datadog/impl/storage/path.hpp" +#include "datadog/impl/core/storage/path.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/storage/filesystem_posix.cpp b/src/datadog/impl/core/storage/filesystem_posix.cpp similarity index 99% rename from src/datadog/impl/storage/filesystem_posix.cpp rename to src/datadog/impl/core/storage/filesystem_posix.cpp index bc200169..975565e7 100644 --- a/src/datadog/impl/storage/filesystem_posix.cpp +++ b/src/datadog/impl/core/storage/filesystem_posix.cpp @@ -14,7 +14,7 @@ #include #include -#include "datadog/impl/storage/filesystem.hpp" +#include "datadog/impl/core/storage/filesystem.hpp" // NOLINTBEGIN(concurrency-mt-unsafe) // NOLINTBEGIN(cppcoreguidelines-pro-bounds-array-to-pointer-decay) diff --git a/src/datadog/impl/storage/filesystem_windows.cpp b/src/datadog/impl/core/storage/filesystem_windows.cpp similarity index 99% rename from src/datadog/impl/storage/filesystem_windows.cpp rename to src/datadog/impl/core/storage/filesystem_windows.cpp index 2eef6940..afadf727 100644 --- a/src/datadog/impl/storage/filesystem_windows.cpp +++ b/src/datadog/impl/core/storage/filesystem_windows.cpp @@ -10,7 +10,7 @@ #include #include -#include "datadog/impl/storage/filesystem.hpp" +#include "datadog/impl/core/storage/filesystem.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/storage/filesystem_wrapper.cpp b/src/datadog/impl/core/storage/filesystem_wrapper.cpp similarity index 97% rename from src/datadog/impl/storage/filesystem_wrapper.cpp rename to src/datadog/impl/core/storage/filesystem_wrapper.cpp index fda09872..2297f857 100644 --- a/src/datadog/impl/storage/filesystem_wrapper.cpp +++ b/src/datadog/impl/core/storage/filesystem_wrapper.cpp @@ -4,11 +4,11 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/storage/filesystem_wrapper.hpp" +#include "datadog/impl/core/storage/filesystem_wrapper.hpp" #include -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/storage/filesystem_wrapper.hpp b/src/datadog/impl/core/storage/filesystem_wrapper.hpp similarity index 96% rename from src/datadog/impl/storage/filesystem_wrapper.hpp rename to src/datadog/impl/core/storage/filesystem_wrapper.hpp index 9ace6ec5..a744cdd0 100644 --- a/src/datadog/impl/storage/filesystem_wrapper.hpp +++ b/src/datadog/impl/core/storage/filesystem_wrapper.hpp @@ -6,8 +6,8 @@ #pragma once -#include "datadog/impl/storage/filesystem.hpp" -#include "datadog/impl/storage/path.hpp" +#include "datadog/impl/core/storage/filesystem.hpp" +#include "datadog/impl/core/storage/path.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/storage/path.cpp b/src/datadog/impl/core/storage/path.cpp similarity index 99% rename from src/datadog/impl/storage/path.cpp rename to src/datadog/impl/core/storage/path.cpp index 00ceacbf..ede0c321 100644 --- a/src/datadog/impl/storage/path.cpp +++ b/src/datadog/impl/core/storage/path.cpp @@ -4,11 +4,11 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/storage/path.hpp" +#include "datadog/impl/core/storage/path.hpp" #include -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN diff --git a/src/datadog/impl/storage/path.hpp b/src/datadog/impl/core/storage/path.hpp similarity index 100% rename from src/datadog/impl/storage/path.hpp rename to src/datadog/impl/core/storage/path.hpp diff --git a/src/datadog/impl/storage/sdk.cpp b/src/datadog/impl/core/storage/sdk.cpp similarity index 99% rename from src/datadog/impl/storage/sdk.cpp rename to src/datadog/impl/core/storage/sdk.cpp index bc7cbb9e..fc1f1d47 100644 --- a/src/datadog/impl/storage/sdk.cpp +++ b/src/datadog/impl/core/storage/sdk.cpp @@ -4,14 +4,14 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/storage/sdk.hpp" +#include "datadog/impl/core/storage/sdk.hpp" #include #include #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/storage/util.hpp" +#include "datadog/impl/core/storage/util.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/storage/sdk.hpp b/src/datadog/impl/core/storage/sdk.hpp similarity index 97% rename from src/datadog/impl/storage/sdk.hpp rename to src/datadog/impl/core/storage/sdk.hpp index 8737dda8..99500326 100644 --- a/src/datadog/impl/storage/sdk.hpp +++ b/src/datadog/impl/core/storage/sdk.hpp @@ -12,12 +12,12 @@ #include #include -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/storage/artifact.hpp" -#include "datadog/impl/storage/feature_event.hpp" -#include "datadog/impl/storage/filesystem.hpp" -#include "datadog/impl/storage/filesystem_wrapper.hpp" -#include "datadog/impl/storage/path.hpp" +#include "datadog/impl/core/storage/artifact.hpp" +#include "datadog/impl/core/storage/feature_event.hpp" +#include "datadog/impl/core/storage/filesystem.hpp" +#include "datadog/impl/core/storage/filesystem_wrapper.hpp" +#include "datadog/impl/core/storage/path.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/storage/util.cpp b/src/datadog/impl/core/storage/util.cpp similarity index 96% rename from src/datadog/impl/storage/util.cpp rename to src/datadog/impl/core/storage/util.cpp index f0dcfca5..783050d6 100644 --- a/src/datadog/impl/storage/util.cpp +++ b/src/datadog/impl/core/storage/util.cpp @@ -4,10 +4,10 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/storage/util.hpp" +#include "datadog/impl/core/storage/util.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/storage/path.hpp" +#include "datadog/impl/core/storage/path.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/storage/util.hpp b/src/datadog/impl/core/storage/util.hpp similarity index 95% rename from src/datadog/impl/storage/util.hpp rename to src/datadog/impl/core/storage/util.hpp index cb5609e7..67cdc040 100644 --- a/src/datadog/impl/storage/util.hpp +++ b/src/datadog/impl/core/storage/util.hpp @@ -8,8 +8,8 @@ #include -#include "datadog/impl/storage/filesystem.hpp" -#include "datadog/impl/storage/filesystem_wrapper.hpp" +#include "datadog/impl/core/storage/filesystem.hpp" +#include "datadog/impl/core/storage/filesystem_wrapper.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/storage_thread.cpp b/src/datadog/impl/core/storage_thread.cpp index efd99798..227ed95c 100644 --- a/src/datadog/impl/core/storage_thread.cpp +++ b/src/datadog/impl/core/storage_thread.cpp @@ -14,7 +14,6 @@ #include #include -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/block.hpp" #include "datadog/impl/core/core.hpp" #include "datadog/impl/core/feature.hpp" @@ -22,6 +21,7 @@ #include "datadog/impl/core/storage_write.hpp" #include "datadog/impl/core/tlv.hpp" #include "datadog/impl/core/types.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/storage_thread.hpp b/src/datadog/impl/core/storage_thread.hpp index 6d548039..839e41f6 100644 --- a/src/datadog/impl/core/storage_thread.hpp +++ b/src/datadog/impl/core/storage_thread.hpp @@ -9,7 +9,7 @@ #include #include "datadog/impl/core/storage_queue.hpp" -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/storage_write.cpp b/src/datadog/impl/core/storage_write.cpp index 7fc2235f..693802ab 100644 --- a/src/datadog/impl/core/storage_write.cpp +++ b/src/datadog/impl/core/storage_write.cpp @@ -16,13 +16,13 @@ #include #include -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/core.hpp" +#include "datadog/impl/core/storage/filesystem_wrapper.hpp" +#include "datadog/impl/core/storage/util.hpp" #include "datadog/impl/core/storage_queue.hpp" #include "datadog/impl/core/tlv.hpp" #include "datadog/impl/core/types.hpp" -#include "datadog/impl/storage/filesystem_wrapper.hpp" -#include "datadog/impl/storage/util.hpp" +#include "datadog/impl/core/util/assert.hpp" // Global version number applied to all event data stored persistently; may be bumped in // the event of breaking changes in order to abandon previously-written events on disk. diff --git a/src/datadog/impl/core/storage_write.hpp b/src/datadog/impl/core/storage_write.hpp index b7c1aacf..5bbf2648 100644 --- a/src/datadog/impl/core/storage_write.hpp +++ b/src/datadog/impl/core/storage_write.hpp @@ -14,13 +14,13 @@ #include "datadog/core.hpp" -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/block.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/clock.hpp" -#include "datadog/impl/storage/feature_event.hpp" -#include "datadog/impl/storage/filesystem.hpp" -#include "datadog/impl/storage/path.hpp" +#include "datadog/impl/core/platform/clock.hpp" +#include "datadog/impl/core/storage/feature_event.hpp" +#include "datadog/impl/core/storage/filesystem.hpp" +#include "datadog/impl/core/storage/path.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/tlv.cpp b/src/datadog/impl/core/tlv.cpp index 4aefc287..625e7076 100644 --- a/src/datadog/impl/core/tlv.cpp +++ b/src/datadog/impl/core/tlv.cpp @@ -9,8 +9,8 @@ #include #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/storage/util.hpp" +#include "datadog/impl/core/storage/util.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/tlv.hpp b/src/datadog/impl/core/tlv.hpp index a0c2a606..2ad6763b 100644 --- a/src/datadog/impl/core/tlv.hpp +++ b/src/datadog/impl/core/tlv.hpp @@ -10,8 +10,8 @@ #include #include "datadog/impl/core/block.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/storage/filesystem_wrapper.hpp" +#include "datadog/impl/core/storage/filesystem_wrapper.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/types.hpp b/src/datadog/impl/core/types.hpp index c7a80a4c..2c6026c0 100644 --- a/src/datadog/impl/core/types.hpp +++ b/src/datadog/impl/core/types.hpp @@ -11,7 +11,7 @@ #include "datadog/core.h" #include "datadog/core.hpp" -#include "datadog/impl/platform/clock.hpp" +#include "datadog/impl/core/platform/clock.hpp" namespace datadog { diff --git a/src/datadog/impl/core/upload_scheduler.hpp b/src/datadog/impl/core/upload_scheduler.hpp index 535a28e7..654a97fe 100644 --- a/src/datadog/impl/core/upload_scheduler.hpp +++ b/src/datadog/impl/core/upload_scheduler.hpp @@ -14,9 +14,9 @@ #include #include "datadog/impl/core/feature.hpp" +#include "datadog/impl/core/platform/clock.hpp" +#include "datadog/impl/core/platform/http.hpp" #include "datadog/impl/core/types.hpp" -#include "datadog/impl/platform/clock.hpp" -#include "datadog/impl/platform/http.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/upload_thread.cpp b/src/datadog/impl/core/upload_thread.cpp index 69bd8a42..9aa029b2 100644 --- a/src/datadog/impl/core/upload_thread.cpp +++ b/src/datadog/impl/core/upload_thread.cpp @@ -15,13 +15,13 @@ #include #include -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/block.hpp" #include "datadog/impl/core/core.hpp" #include "datadog/impl/core/feature_read.hpp" +#include "datadog/impl/core/storage/filesystem_wrapper.hpp" +#include "datadog/impl/core/storage/util.hpp" #include "datadog/impl/core/upload_scheduler.hpp" -#include "datadog/impl/storage/filesystem_wrapper.hpp" -#include "datadog/impl/storage/util.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/upload_thread.hpp b/src/datadog/impl/core/upload_thread.hpp index cc325155..0e1d0248 100644 --- a/src/datadog/impl/core/upload_thread.hpp +++ b/src/datadog/impl/core/upload_thread.hpp @@ -14,10 +14,10 @@ #include #include "datadog/impl/core/feature.hpp" +#include "datadog/impl/core/platform/clock.hpp" +#include "datadog/impl/core/platform/http.hpp" #include "datadog/impl/core/types.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/clock.hpp" -#include "datadog/impl/platform/http.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/assert.hpp b/src/datadog/impl/core/util/assert.hpp similarity index 100% rename from src/datadog/impl/assert.hpp rename to src/datadog/impl/core/util/assert.hpp diff --git a/src/datadog/impl/diagnostics.cpp b/src/datadog/impl/core/util/diagnostics.cpp similarity index 92% rename from src/datadog/impl/diagnostics.cpp rename to src/datadog/impl/core/util/diagnostics.cpp index 5a3a9f12..a172d6c2 100644 --- a/src/datadog/impl/diagnostics.cpp +++ b/src/datadog/impl/core/util/diagnostics.cpp @@ -4,10 +4,10 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" -#include "datadog/impl/assert.hpp" -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/core/util/json.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/diagnostics.hpp b/src/datadog/impl/core/util/diagnostics.hpp similarity index 100% rename from src/datadog/impl/diagnostics.hpp rename to src/datadog/impl/core/util/diagnostics.hpp diff --git a/src/datadog/impl/error_message.cpp b/src/datadog/impl/core/util/error_message.cpp similarity index 95% rename from src/datadog/impl/error_message.cpp rename to src/datadog/impl/core/util/error_message.cpp index 773efb5e..b334ad05 100644 --- a/src/datadog/impl/error_message.cpp +++ b/src/datadog/impl/core/util/error_message.cpp @@ -4,14 +4,14 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/error_message.hpp" +#include "datadog/impl/core/util/error_message.hpp" #include #include #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/core/util/json.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/error_message.hpp b/src/datadog/impl/core/util/error_message.hpp similarity index 97% rename from src/datadog/impl/error_message.hpp rename to src/datadog/impl/core/util/error_message.hpp index 0ce0e3c1..a9521b62 100644 --- a/src/datadog/impl/error_message.hpp +++ b/src/datadog/impl/core/util/error_message.hpp @@ -14,7 +14,7 @@ #include "datadog/attribute.hpp" -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/json.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/json.hpp b/src/datadog/impl/core/util/json.hpp similarity index 83% rename from src/datadog/impl/json.hpp rename to src/datadog/impl/core/util/json.hpp index e443b82a..006a3cdb 100644 --- a/src/datadog/impl/json.hpp +++ b/src/datadog/impl/core/util/json.hpp @@ -12,21 +12,21 @@ #include "datadog/attribute.hpp" -#include "datadog/impl/assert.hpp" -#include "datadog/impl/attribute/merge.hpp" +#include "datadog/impl/core/attribute/merge.hpp" +#include "datadog/impl/core/util/assert.hpp" // clang-format off -#include "datadog/impl/json/primitives/monostate.hpp" -#include "datadog/impl/json/primitives/bool.hpp" -#include "datadog/impl/json/primitives/float.hpp" -#include "datadog/impl/json/primitives/integer.hpp" -#include "datadog/impl/json/primitives/null.hpp" -#include "datadog/impl/json/primitives/string.hpp" -#include "datadog/impl/json/primitives/timestamp.hpp" -#include "datadog/impl/json/primitives/uuid.hpp" -#include "datadog/impl/json/attribute.hpp" -#include "datadog/impl/json/diagnostic_attribute.hpp" -#include "datadog/impl/json/optional.hpp" +#include "datadog/impl/core/json/primitives/monostate.hpp" +#include "datadog/impl/core/json/primitives/bool.hpp" +#include "datadog/impl/core/json/primitives/float.hpp" +#include "datadog/impl/core/json/primitives/integer.hpp" +#include "datadog/impl/core/json/primitives/null.hpp" +#include "datadog/impl/core/json/primitives/string.hpp" +#include "datadog/impl/core/json/primitives/timestamp.hpp" +#include "datadog/impl/core/json/primitives/uuid.hpp" +#include "datadog/impl/core/json/attribute.hpp" +#include "datadog/impl/core/json/diagnostic_attribute.hpp" +#include "datadog/impl/core/json/optional.hpp" // clang-format on namespace datadog::impl { diff --git a/src/datadog/impl/validation.cpp b/src/datadog/impl/core/util/validation.cpp similarity index 91% rename from src/datadog/impl/validation.cpp rename to src/datadog/impl/core/util/validation.cpp index 3430e4a3..e55b1762 100644 --- a/src/datadog/impl/validation.cpp +++ b/src/datadog/impl/core/util/validation.cpp @@ -6,7 +6,7 @@ #include -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/validation.hpp b/src/datadog/impl/core/util/validation.hpp similarity index 100% rename from src/datadog/impl/validation.hpp rename to src/datadog/impl/core/util/validation.hpp diff --git a/src/datadog/impl/core/writer.cpp b/src/datadog/impl/core/writer.cpp index 52c52676..3078865d 100644 --- a/src/datadog/impl/core/writer.cpp +++ b/src/datadog/impl/core/writer.cpp @@ -8,9 +8,9 @@ #include -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/feature_read.hpp" #include "datadog/impl/core/tlv.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/core/writer.hpp b/src/datadog/impl/core/writer.hpp index b7b03703..5cc18562 100644 --- a/src/datadog/impl/core/writer.hpp +++ b/src/datadog/impl/core/writer.hpp @@ -12,7 +12,7 @@ #include "datadog/impl/core/block.hpp" #include "datadog/impl/core/feature.hpp" #include "datadog/impl/core/feature_read.hpp" -#include "datadog/impl/platform/http.hpp" +#include "datadog/impl/core/platform/http.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/crash_reporting/crash_reporting.cpp b/src/datadog/impl/crash_reporting/crash_reporting.cpp similarity index 95% rename from src/datadog/impl/features/crash_reporting/crash_reporting.cpp rename to src/datadog/impl/crash_reporting/crash_reporting.cpp index a98262c0..b45c4b4b 100644 --- a/src/datadog/impl/features/crash_reporting/crash_reporting.cpp +++ b/src/datadog/impl/crash_reporting/crash_reporting.cpp @@ -4,12 +4,12 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/crash_reporting/crash_reporting.hpp" +#include "datadog/impl/crash_reporting/crash_reporting.hpp" #include -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/feature_message.hpp" +#include "datadog/impl/core/util/assert.hpp" #include "datadog/impl/core/writer.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/crash_reporting/crash_reporting.hpp b/src/datadog/impl/crash_reporting/crash_reporting.hpp similarity index 95% rename from src/datadog/impl/features/crash_reporting/crash_reporting.hpp rename to src/datadog/impl/crash_reporting/crash_reporting.hpp index 510f2aa9..2a5b3fd7 100644 --- a/src/datadog/impl/features/crash_reporting/crash_reporting.hpp +++ b/src/datadog/impl/crash_reporting/crash_reporting.hpp @@ -13,8 +13,8 @@ #include "datadog/impl/core/feature.hpp" #include "datadog/impl/core/feature_types/rum.hpp" -#include "datadog/impl/platform/clock.hpp" -#include "datadog/impl/platform/crash_handler.hpp" +#include "datadog/impl/core/platform/clock.hpp" +#include "datadog/impl/core/platform/crash_handler.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/logging/logger.cpp b/src/datadog/impl/logging/logger.cpp similarity index 97% rename from src/datadog/impl/features/logging/logger.cpp rename to src/datadog/impl/logging/logger.cpp index 24c49d71..797a1308 100644 --- a/src/datadog/impl/features/logging/logger.cpp +++ b/src/datadog/impl/logging/logger.cpp @@ -4,11 +4,11 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/logging/logger.hpp" +#include "datadog/impl/logging/logger.hpp" #include "datadog/attribute.hpp" -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" #include "datadog/impl/core/version.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/logging/logger.hpp b/src/datadog/impl/logging/logger.hpp similarity index 96% rename from src/datadog/impl/features/logging/logger.hpp rename to src/datadog/impl/logging/logger.hpp index 6f661ddd..51af3e69 100644 --- a/src/datadog/impl/features/logging/logger.hpp +++ b/src/datadog/impl/logging/logger.hpp @@ -15,10 +15,10 @@ #include "datadog/attribute.hpp" -#include "datadog/impl/attribute/typed_attribute.hpp" +#include "datadog/impl/core/attribute/typed_attribute.hpp" #include "datadog/impl/core/feature.hpp" #include "datadog/impl/core/feature_types/logging.hpp" -#include "datadog/impl/features/logging/types.hpp" +#include "datadog/impl/logging/types.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/logging/logging.cpp b/src/datadog/impl/logging/logging.cpp similarity index 97% rename from src/datadog/impl/features/logging/logging.cpp rename to src/datadog/impl/logging/logging.cpp index 8e6e8cda..90ec941c 100644 --- a/src/datadog/impl/features/logging/logging.cpp +++ b/src/datadog/impl/logging/logging.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/logging/logging.hpp" +#include "datadog/impl/logging/logging.hpp" #include #include @@ -13,14 +13,14 @@ #include "date/date.h" -#include "datadog/impl/attribute/merge.hpp" +#include "datadog/impl/core/attribute/merge.hpp" #include "datadog/impl/core/block.hpp" #include "datadog/impl/core/core.hpp" #include "datadog/impl/core/feature_types/logging.hpp" +#include "datadog/impl/core/util/json.hpp" #include "datadog/impl/core/version.hpp" #include "datadog/impl/core/writer.hpp" -#include "datadog/impl/features/logging/logger.hpp" -#include "datadog/impl/json.hpp" +#include "datadog/impl/logging/logger.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/logging/logging.hpp b/src/datadog/impl/logging/logging.hpp similarity index 95% rename from src/datadog/impl/features/logging/logging.hpp rename to src/datadog/impl/logging/logging.hpp index 93995c95..096aa37d 100644 --- a/src/datadog/impl/features/logging/logging.hpp +++ b/src/datadog/impl/logging/logging.hpp @@ -11,10 +11,10 @@ #include #include -#include "datadog/impl/attribute/typed_attribute.hpp" +#include "datadog/impl/core/attribute/typed_attribute.hpp" #include "datadog/impl/core/feature.hpp" -#include "datadog/impl/features/logging/types.hpp" -#include "datadog/impl/platform/clock.hpp" +#include "datadog/impl/core/platform/clock.hpp" +#include "datadog/impl/logging/types.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/logging/types.hpp b/src/datadog/impl/logging/types.hpp similarity index 100% rename from src/datadog/impl/features/logging/types.hpp rename to src/datadog/impl/logging/types.hpp diff --git a/src/datadog/impl/features/rum/command.hpp b/src/datadog/impl/rum/command.hpp similarity index 99% rename from src/datadog/impl/features/rum/command.hpp rename to src/datadog/impl/rum/command.hpp index b9fde9b7..b1afdd99 100644 --- a/src/datadog/impl/features/rum/command.hpp +++ b/src/datadog/impl/rum/command.hpp @@ -14,9 +14,9 @@ #include "datadog/rum.hpp" -#include "datadog/impl/attribute/typed_attribute.hpp" -#include "datadog/impl/features/rum/resource_types.hpp" -#include "datadog/impl/platform/clock.hpp" +#include "datadog/impl/core/attribute/typed_attribute.hpp" +#include "datadog/impl/core/platform/clock.hpp" +#include "datadog/impl/rum/resource_types.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/containers/resource_map.cpp b/src/datadog/impl/rum/containers/resource_map.cpp similarity index 97% rename from src/datadog/impl/features/rum/containers/resource_map.cpp rename to src/datadog/impl/rum/containers/resource_map.cpp index 6b40cc4b..41af3582 100644 --- a/src/datadog/impl/features/rum/containers/resource_map.cpp +++ b/src/datadog/impl/rum/containers/resource_map.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/containers/resource_map.hpp" +#include "datadog/impl/rum/containers/resource_map.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/containers/resource_map.hpp b/src/datadog/impl/rum/containers/resource_map.hpp similarity index 94% rename from src/datadog/impl/features/rum/containers/resource_map.hpp rename to src/datadog/impl/rum/containers/resource_map.hpp index 836f2454..c060a998 100644 --- a/src/datadog/impl/features/rum/containers/resource_map.hpp +++ b/src/datadog/impl/rum/containers/resource_map.hpp @@ -9,9 +9,9 @@ #include #include -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/features/rum/command.hpp" -#include "datadog/impl/features/rum/scopes/resource.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" +#include "datadog/impl/rum/command.hpp" +#include "datadog/impl/rum/scopes/resource.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/containers/view_array.cpp b/src/datadog/impl/rum/containers/view_array.cpp similarity index 97% rename from src/datadog/impl/features/rum/containers/view_array.cpp rename to src/datadog/impl/rum/containers/view_array.cpp index fca863da..ed58d195 100644 --- a/src/datadog/impl/features/rum/containers/view_array.cpp +++ b/src/datadog/impl/rum/containers/view_array.cpp @@ -4,12 +4,12 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/containers/view_array.hpp" +#include "datadog/impl/rum/containers/view_array.hpp" #include #include -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/containers/view_array.hpp b/src/datadog/impl/rum/containers/view_array.hpp similarity index 95% rename from src/datadog/impl/features/rum/containers/view_array.hpp rename to src/datadog/impl/rum/containers/view_array.hpp index f7c4530c..70aea8c6 100644 --- a/src/datadog/impl/features/rum/containers/view_array.hpp +++ b/src/datadog/impl/rum/containers/view_array.hpp @@ -9,9 +9,9 @@ #include #include -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/features/rum/command.hpp" -#include "datadog/impl/features/rum/scopes/view.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" +#include "datadog/impl/rum/command.hpp" +#include "datadog/impl/rum/scopes/view.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/context.cpp b/src/datadog/impl/rum/context.cpp similarity index 97% rename from src/datadog/impl/features/rum/context.cpp rename to src/datadog/impl/rum/context.cpp index b6976bc7..99b32399 100644 --- a/src/datadog/impl/features/rum/context.cpp +++ b/src/datadog/impl/rum/context.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/context.hpp" +#include "datadog/impl/rum/context.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/context.hpp b/src/datadog/impl/rum/context.hpp similarity index 100% rename from src/datadog/impl/features/rum/context.hpp rename to src/datadog/impl/rum/context.hpp diff --git a/src/datadog/impl/features/rum/resource_types.hpp b/src/datadog/impl/rum/resource_types.hpp similarity index 100% rename from src/datadog/impl/features/rum/resource_types.hpp rename to src/datadog/impl/rum/resource_types.hpp diff --git a/src/datadog/impl/features/rum/rum.cpp b/src/datadog/impl/rum/rum.cpp similarity index 99% rename from src/datadog/impl/features/rum/rum.cpp rename to src/datadog/impl/rum/rum.cpp index 2e1ec7bb..0d4d7f6e 100644 --- a/src/datadog/impl/features/rum/rum.cpp +++ b/src/datadog/impl/rum/rum.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/rum.hpp" +#include "datadog/impl/rum/rum.hpp" #include #include diff --git a/src/datadog/impl/features/rum/rum.hpp b/src/datadog/impl/rum/rum.hpp similarity index 93% rename from src/datadog/impl/features/rum/rum.hpp rename to src/datadog/impl/rum/rum.hpp index 872f12f6..0f2f0a1f 100644 --- a/src/datadog/impl/features/rum/rum.hpp +++ b/src/datadog/impl/rum/rum.hpp @@ -14,14 +14,14 @@ #include "datadog/attribute.hpp" #include "datadog/rum.hpp" -#include "datadog/impl/attribute/typed_attribute.hpp" +#include "datadog/impl/core/attribute/typed_attribute.hpp" #include "datadog/impl/core/feature.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/features/rum/command.hpp" -#include "datadog/impl/features/rum/context.hpp" -#include "datadog/impl/features/rum/resource_types.hpp" -#include "datadog/impl/features/rum/scopes/application.hpp" -#include "datadog/impl/platform/clock.hpp" +#include "datadog/impl/core/platform/clock.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" +#include "datadog/impl/rum/command.hpp" +#include "datadog/impl/rum/context.hpp" +#include "datadog/impl/rum/resource_types.hpp" +#include "datadog/impl/rum/scopes/application.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/scope.cpp b/src/datadog/impl/rum/scope.cpp similarity index 94% rename from src/datadog/impl/features/rum/scope.cpp rename to src/datadog/impl/rum/scope.cpp index 207cbf70..08eb764e 100644 --- a/src/datadog/impl/features/rum/scope.cpp +++ b/src/datadog/impl/rum/scope.cpp @@ -4,13 +4,13 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/scope.hpp" +#include "datadog/impl/rum/scope.hpp" #include #include "datadog/rum.hpp" -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/scope.hpp b/src/datadog/impl/rum/scope.hpp similarity index 95% rename from src/datadog/impl/features/rum/scope.hpp rename to src/datadog/impl/rum/scope.hpp index bf01f3c4..b7399ea6 100644 --- a/src/datadog/impl/features/rum/scope.hpp +++ b/src/datadog/impl/rum/scope.hpp @@ -14,11 +14,11 @@ #include #include -#include "datadog/impl/attribute/typed_attribute.hpp" +#include "datadog/impl/core/attribute/typed_attribute.hpp" #include "datadog/impl/core/feature_scope.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/features/rum/command.hpp" -#include "datadog/impl/platform/clock.hpp" +#include "datadog/impl/core/platform/clock.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" +#include "datadog/impl/rum/command.hpp" namespace datadog { struct RumConfig; diff --git a/src/datadog/impl/features/rum/scopes/action.cpp b/src/datadog/impl/rum/scopes/action.cpp similarity index 96% rename from src/datadog/impl/features/rum/scopes/action.cpp rename to src/datadog/impl/rum/scopes/action.cpp index b8d6bc67..c68d4997 100644 --- a/src/datadog/impl/features/rum/scopes/action.cpp +++ b/src/datadog/impl/rum/scopes/action.cpp @@ -4,13 +4,13 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/scopes/action.hpp" +#include "datadog/impl/rum/scopes/action.hpp" -#include "datadog/impl/attribute/merge.hpp" -#include "datadog/impl/features/rum/context.hpp" -#include "datadog/impl/features/rum/scopes/event_enrichment.hpp" -#include "datadog/impl/features/rum/scopes/session.hpp" -#include "datadog/impl/features/rum/scopes/view.hpp" +#include "datadog/impl/core/attribute/merge.hpp" +#include "datadog/impl/rum/context.hpp" +#include "datadog/impl/rum/scopes/event_enrichment.hpp" +#include "datadog/impl/rum/scopes/session.hpp" +#include "datadog/impl/rum/scopes/view.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/scopes/action.hpp b/src/datadog/impl/rum/scopes/action.hpp similarity index 98% rename from src/datadog/impl/features/rum/scopes/action.hpp rename to src/datadog/impl/rum/scopes/action.hpp index 91812b59..2e1447fa 100644 --- a/src/datadog/impl/features/rum/scopes/action.hpp +++ b/src/datadog/impl/rum/scopes/action.hpp @@ -8,7 +8,7 @@ #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/feature_scope.hpp" -#include "datadog/impl/features/rum/scope.hpp" +#include "datadog/impl/rum/scope.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/scopes/application.cpp b/src/datadog/impl/rum/scopes/application.cpp similarity index 98% rename from src/datadog/impl/features/rum/scopes/application.cpp rename to src/datadog/impl/rum/scopes/application.cpp index 0e03bac9..2b107e3e 100644 --- a/src/datadog/impl/features/rum/scopes/application.cpp +++ b/src/datadog/impl/rum/scopes/application.cpp @@ -4,16 +4,16 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/scopes/application.hpp" +#include "datadog/impl/rum/scopes/application.hpp" #include #include "datadog/rum.hpp" #include "datadog/uuid.hpp" -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/context.hpp" -#include "datadog/impl/features/rum/context.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/rum/context.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/scopes/application.hpp b/src/datadog/impl/rum/scopes/application.hpp similarity index 98% rename from src/datadog/impl/features/rum/scopes/application.hpp rename to src/datadog/impl/rum/scopes/application.hpp index 11b55514..d018dff5 100644 --- a/src/datadog/impl/features/rum/scopes/application.hpp +++ b/src/datadog/impl/rum/scopes/application.hpp @@ -12,8 +12,8 @@ #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/feature_scope.hpp" -#include "datadog/impl/features/rum/scope.hpp" -#include "datadog/impl/features/rum/scopes/session.hpp" +#include "datadog/impl/rum/scope.hpp" +#include "datadog/impl/rum/scopes/session.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/scopes/event_enrichment.hpp b/src/datadog/impl/rum/scopes/event_enrichment.hpp similarity index 98% rename from src/datadog/impl/features/rum/scopes/event_enrichment.hpp rename to src/datadog/impl/rum/scopes/event_enrichment.hpp index 81c8980f..137772eb 100644 --- a/src/datadog/impl/features/rum/scopes/event_enrichment.hpp +++ b/src/datadog/impl/rum/scopes/event_enrichment.hpp @@ -9,7 +9,7 @@ #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/feature_scope.hpp" #include "datadog/impl/core/feature_types/rum.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/scopes/resource.cpp b/src/datadog/impl/rum/scopes/resource.cpp similarity index 96% rename from src/datadog/impl/features/rum/scopes/resource.cpp rename to src/datadog/impl/rum/scopes/resource.cpp index 4952f9e6..e94377b9 100644 --- a/src/datadog/impl/features/rum/scopes/resource.cpp +++ b/src/datadog/impl/rum/scopes/resource.cpp @@ -4,14 +4,14 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/scopes/resource.hpp" - -#include "datadog/impl/assert.hpp" -#include "datadog/impl/attribute/merge.hpp" -#include "datadog/impl/features/rum/context.hpp" -#include "datadog/impl/features/rum/scopes/event_enrichment.hpp" -#include "datadog/impl/features/rum/scopes/session.hpp" -#include "datadog/impl/features/rum/scopes/view.hpp" +#include "datadog/impl/rum/scopes/resource.hpp" + +#include "datadog/impl/core/attribute/merge.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/rum/context.hpp" +#include "datadog/impl/rum/scopes/event_enrichment.hpp" +#include "datadog/impl/rum/scopes/session.hpp" +#include "datadog/impl/rum/scopes/view.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/scopes/resource.hpp b/src/datadog/impl/rum/scopes/resource.hpp similarity index 98% rename from src/datadog/impl/features/rum/scopes/resource.hpp rename to src/datadog/impl/rum/scopes/resource.hpp index fda57bc4..070157c7 100644 --- a/src/datadog/impl/features/rum/scopes/resource.hpp +++ b/src/datadog/impl/rum/scopes/resource.hpp @@ -10,7 +10,7 @@ #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/feature_scope.hpp" -#include "datadog/impl/features/rum/scope.hpp" +#include "datadog/impl/rum/scope.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/scopes/session.cpp b/src/datadog/impl/rum/scopes/session.cpp similarity index 98% rename from src/datadog/impl/features/rum/scopes/session.cpp rename to src/datadog/impl/rum/scopes/session.cpp index f49a5c24..62ee1332 100644 --- a/src/datadog/impl/features/rum/scopes/session.cpp +++ b/src/datadog/impl/rum/scopes/session.cpp @@ -4,15 +4,15 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/scopes/session.hpp" +#include "datadog/impl/rum/scopes/session.hpp" #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/attribute/merge.hpp" -#include "datadog/impl/features/rum/context.hpp" -#include "datadog/impl/features/rum/scopes/application.hpp" -#include "datadog/impl/features/rum/scopes/event_enrichment.hpp" +#include "datadog/impl/core/attribute/merge.hpp" +#include "datadog/impl/core/util/assert.hpp" +#include "datadog/impl/rum/context.hpp" +#include "datadog/impl/rum/scopes/application.hpp" +#include "datadog/impl/rum/scopes/event_enrichment.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/scopes/session.hpp b/src/datadog/impl/rum/scopes/session.hpp similarity index 97% rename from src/datadog/impl/features/rum/scopes/session.hpp rename to src/datadog/impl/rum/scopes/session.hpp index c06ec243..ec8011b2 100644 --- a/src/datadog/impl/features/rum/scopes/session.hpp +++ b/src/datadog/impl/rum/scopes/session.hpp @@ -17,10 +17,10 @@ #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/feature_scope.hpp" #include "datadog/impl/core/feature_types/rum.hpp" -#include "datadog/impl/features/rum/containers/view_array.hpp" -#include "datadog/impl/features/rum/scope.hpp" -#include "datadog/impl/features/rum/scopes/view.hpp" -#include "datadog/impl/platform/clock.hpp" +#include "datadog/impl/core/platform/clock.hpp" +#include "datadog/impl/rum/containers/view_array.hpp" +#include "datadog/impl/rum/scope.hpp" +#include "datadog/impl/rum/scopes/view.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/scopes/view.cpp b/src/datadog/impl/rum/scopes/view.cpp similarity index 99% rename from src/datadog/impl/features/rum/scopes/view.cpp rename to src/datadog/impl/rum/scopes/view.cpp index 0ee036c3..a54d0d1e 100644 --- a/src/datadog/impl/features/rum/scopes/view.cpp +++ b/src/datadog/impl/rum/scopes/view.cpp @@ -4,15 +4,15 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/scopes/view.hpp" +#include "datadog/impl/rum/scopes/view.hpp" #include "datadog/timestamp.hpp" #include "datadog/impl/core/feature_scope.hpp" #include "datadog/impl/core/feature_types/rum.hpp" -#include "datadog/impl/features/rum/context.hpp" -#include "datadog/impl/features/rum/scopes/event_enrichment.hpp" -#include "datadog/impl/features/rum/scopes/session.hpp" +#include "datadog/impl/rum/context.hpp" +#include "datadog/impl/rum/scopes/event_enrichment.hpp" +#include "datadog/impl/rum/scopes/session.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/scopes/view.hpp b/src/datadog/impl/rum/scopes/view.hpp similarity index 97% rename from src/datadog/impl/features/rum/scopes/view.hpp rename to src/datadog/impl/rum/scopes/view.hpp index de319dc9..124907fe 100644 --- a/src/datadog/impl/features/rum/scopes/view.hpp +++ b/src/datadog/impl/rum/scopes/view.hpp @@ -11,13 +11,13 @@ #include "datadog/uuid.hpp" -#include "datadog/impl/attribute/typed_attribute.hpp" +#include "datadog/impl/core/attribute/typed_attribute.hpp" #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/feature_scope.hpp" -#include "datadog/impl/features/rum/containers/resource_map.hpp" -#include "datadog/impl/features/rum/scope.hpp" -#include "datadog/impl/features/rum/scopes/action.hpp" -#include "datadog/impl/platform/clock.hpp" +#include "datadog/impl/core/platform/clock.hpp" +#include "datadog/impl/rum/containers/resource_map.hpp" +#include "datadog/impl/rum/scope.hpp" +#include "datadog/impl/rum/scopes/action.hpp" namespace datadog::impl { diff --git a/src/datadog/impl/features/rum/types.hpp b/src/datadog/impl/rum/types.hpp similarity index 100% rename from src/datadog/impl/features/rum/types.hpp rename to src/datadog/impl/rum/types.hpp diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1920da1e..d13360ee 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -20,11 +20,36 @@ add_executable(dd_native_tests cpp/timestamp_cpp_api_test.cpp cpp/uuid_cpp_api_test.cpp cpp/version_cpp_api_test.cpp - impl/attribute/cow_test.cpp - impl/attribute/memory_test.cpp - impl/attribute/merge_test.cpp - impl/attribute/refcount_test.cpp + impl/core/attribute/cow_test.cpp + impl/core/attribute/memory_test.cpp + impl/core/attribute/merge_test.cpp + impl/core/attribute/refcount_test.cpp + impl/core/events/enum_test.cpp + impl/core/events/omissible_test.cpp + impl/core/events/struct_test.cpp + impl/core/events/timestamp_test.cpp impl/core/feature_types/rum_test.cpp + impl/core/json/primitives/bool_test.cpp + impl/core/json/primitives/float_test.cpp + impl/core/json/primitives/integer_test.cpp + impl/core/json/primitives/null_test.cpp + impl/core/json/primitives/string_test.cpp + impl/core/json/primitives/timestamp_test.cpp + impl/core/json/primitives/uuid_test.cpp + impl/core/json/attribute_test.cpp + impl/core/json/optional_test.cpp + impl/core/platform/clock_test.cpp + impl/core/platform/http_test.cpp + impl/core/platform/system_info_test.cpp + impl/core/storage/artifact_test.cpp + impl/core/storage/feature_event_test.cpp + impl/core/storage/filesystem_test.cpp + impl/core/storage/path_test.cpp + impl/core/storage/sdk_test.cpp + impl/core/util/diagnostics_test.cpp + impl/core/util/error_message_test.cpp + impl/core/util/json_test.cpp + impl/core/util/validation_test.cpp impl/core/block_test.cpp impl/core/context_test.cpp impl/core/context_thread_test.cpp @@ -44,43 +69,18 @@ add_executable(dd_native_tests impl/core/upload_scheduler_test.cpp impl/core/upload_thread_test.cpp impl/core/writer_test.cpp - impl/events/enum_test.cpp - impl/events/omissible_test.cpp - impl/events/struct_test.cpp - impl/events/timestamp_test.cpp - impl/features/logging/logger_test.cpp - impl/features/rum/containers/resource_map_test.cpp - impl/features/rum/containers/view_array_test.cpp - impl/features/rum/scopes/action_test.cpp - impl/features/rum/scopes/application_test.cpp - impl/features/rum/scopes/resource_test.cpp - impl/features/rum/scopes/session_test.cpp - impl/features/rum/scopes/view_test.cpp - impl/features/rum/command_test.cpp - impl/features/rum/context_test.cpp - impl/features/rum/rum_test.cpp - impl/features/rum/scope_test.cpp - impl/json/primitives/bool_test.cpp - impl/json/primitives/float_test.cpp - impl/json/primitives/integer_test.cpp - impl/json/primitives/null_test.cpp - impl/json/primitives/string_test.cpp - impl/json/primitives/timestamp_test.cpp - impl/json/primitives/uuid_test.cpp - impl/json/attribute_test.cpp - impl/json/optional_test.cpp - impl/platform/clock_test.cpp - impl/platform/http_test.cpp - impl/platform/system_info_test.cpp - impl/storage/artifact_test.cpp - impl/storage/feature_event_test.cpp - impl/storage/filesystem_test.cpp - impl/storage/path_test.cpp - impl/storage/sdk_test.cpp - impl/diagnostics_test.cpp - impl/error_message_test.cpp - impl/json_test.cpp - impl/validation_test.cpp + impl/logging/logger_test.cpp + impl/rum/containers/resource_map_test.cpp + impl/rum/containers/view_array_test.cpp + impl/rum/scopes/action_test.cpp + impl/rum/scopes/application_test.cpp + impl/rum/scopes/resource_test.cpp + impl/rum/scopes/session_test.cpp + impl/rum/scopes/view_test.cpp + impl/rum/command_test.cpp + impl/rum/context_test.cpp + impl/rum/rum_test.cpp + impl/rum/scope_test.cpp mock/filesystem.cpp mock/http_client_mock_test.cpp support/allocation_tracker.cpp @@ -90,7 +90,7 @@ add_executable(dd_native_tests # Add Windows-specific tests if(WIN32) target_sources(dd_native_tests PRIVATE - impl/platform/windows_timezone_mapping_test.cpp + impl/core/platform/windows_timezone_mapping_test.cpp ) endif() diff --git a/tests/c/attribute_c_api_test.cpp b/tests/c/attribute_c_api_test.cpp index 8db2b15f..a6a527b5 100644 --- a/tests/c/attribute_c_api_test.cpp +++ b/tests/c/attribute_c_api_test.cpp @@ -14,8 +14,8 @@ #include "datadog/attribute.h" -#include "datadog/impl/attribute/types.hpp" -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/attribute/types.hpp" +#include "datadog/impl/core/util/json.hpp" static const uint8_t bytes_ccb7[16] = { 204, 183, 144, 132, 188, 43, 69, 73, 187, 199, 242, 126, 21, 63, 212, 182 diff --git a/tests/c/core_c_api_test.cpp b/tests/c/core_c_api_test.cpp index a98738a8..1ec93b05 100644 --- a/tests/c/core_c_api_test.cpp +++ b/tests/c/core_c_api_test.cpp @@ -13,8 +13,8 @@ #include "datadog/core.h" #include "datadog/logging.h" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" #include "support/catch.hpp" #include "support/core.hpp" diff --git a/tests/c/logging_c_api_test.cpp b/tests/c/logging_c_api_test.cpp index 17f36863..2f88d332 100644 --- a/tests/c/logging_c_api_test.cpp +++ b/tests/c/logging_c_api_test.cpp @@ -15,8 +15,8 @@ #include "datadog/logging.h" #include "datadog/impl/core/version.hpp" -#include "datadog/impl/features/logging/logger.hpp" -#include "datadog/impl/features/logging/logging.hpp" +#include "datadog/impl/logging/logger.hpp" +#include "datadog/impl/logging/logging.hpp" #include "support/core.hpp" #include "support/json_validation.hpp" diff --git a/tests/cpp/attribute_cpp_api_test.cpp b/tests/cpp/attribute_cpp_api_test.cpp index 7420c494..6a854853 100644 --- a/tests/cpp/attribute_cpp_api_test.cpp +++ b/tests/cpp/attribute_cpp_api_test.cpp @@ -11,7 +11,7 @@ #include "datadog/attribute.hpp" #include "datadog/uuid.hpp" -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/json.hpp" #include "support/catch.hpp" diff --git a/tests/cpp/core_cpp_api_test.cpp b/tests/cpp/core_cpp_api_test.cpp index 339d93c2..687f30a6 100644 --- a/tests/cpp/core_cpp_api_test.cpp +++ b/tests/cpp/core_cpp_api_test.cpp @@ -9,8 +9,8 @@ #include "datadog/core.hpp" #include "datadog/logging.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" #include "support/catch.hpp" #include "support/core.hpp" diff --git a/tests/cpp/logging_cpp_api_test.cpp b/tests/cpp/logging_cpp_api_test.cpp index cc8974d9..6eb2107d 100644 --- a/tests/cpp/logging_cpp_api_test.cpp +++ b/tests/cpp/logging_cpp_api_test.cpp @@ -12,7 +12,7 @@ #include "datadog/logging.hpp" #include "datadog/impl/core/version.hpp" -#include "datadog/impl/features/logging/logging.hpp" +#include "datadog/impl/logging/logging.hpp" #include "support/core.hpp" #include "support/diagnostics.hpp" diff --git a/tests/impl/attribute/cow_test.cpp b/tests/impl/core/attribute/cow_test.cpp similarity index 99% rename from tests/impl/attribute/cow_test.cpp rename to tests/impl/core/attribute/cow_test.cpp index e911816b..fd32d739 100644 --- a/tests/impl/attribute/cow_test.cpp +++ b/tests/impl/core/attribute/cow_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/attribute/cow.hpp" +#include "datadog/impl/core/attribute/cow.hpp" #include #include diff --git a/tests/impl/attribute/memory_test.cpp b/tests/impl/core/attribute/memory_test.cpp similarity index 99% rename from tests/impl/attribute/memory_test.cpp rename to tests/impl/core/attribute/memory_test.cpp index 021c99d3..e727d38c 100644 --- a/tests/impl/attribute/memory_test.cpp +++ b/tests/impl/core/attribute/memory_test.cpp @@ -12,9 +12,9 @@ #include "datadog/attribute.hpp" -#include "datadog/impl/attribute/cow.hpp" +#include "datadog/impl/core/attribute/cow.hpp" -#include "impl/attribute/reference.hpp" +#include "impl/core/attribute/reference.hpp" #include "support/allocation_tracker.hpp" #include "support/attribute_debug.hpp" #include "support/memory_checks.hpp" diff --git a/tests/impl/attribute/merge_test.cpp b/tests/impl/core/attribute/merge_test.cpp similarity index 99% rename from tests/impl/attribute/merge_test.cpp rename to tests/impl/core/attribute/merge_test.cpp index 59265cc0..d3b6bf9b 100644 --- a/tests/impl/attribute/merge_test.cpp +++ b/tests/impl/core/attribute/merge_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/attribute/merge.hpp" +#include "datadog/impl/core/attribute/merge.hpp" #include #include diff --git a/tests/impl/attribute/refcount_test.cpp b/tests/impl/core/attribute/refcount_test.cpp similarity index 99% rename from tests/impl/attribute/refcount_test.cpp rename to tests/impl/core/attribute/refcount_test.cpp index af84df3d..584a678f 100644 --- a/tests/impl/attribute/refcount_test.cpp +++ b/tests/impl/core/attribute/refcount_test.cpp @@ -10,7 +10,7 @@ #include "datadog/attribute.hpp" -#include "impl/attribute/reference.hpp" +#include "impl/core/attribute/reference.hpp" #include "support/attribute_debug.hpp" using namespace datadog; diff --git a/tests/impl/attribute/reference.hpp b/tests/impl/core/attribute/reference.hpp similarity index 100% rename from tests/impl/attribute/reference.hpp rename to tests/impl/core/attribute/reference.hpp diff --git a/tests/impl/core/context_test.cpp b/tests/impl/core/context_test.cpp index 7a4865bf..53172211 100644 --- a/tests/impl/core/context_test.cpp +++ b/tests/impl/core/context_test.cpp @@ -11,8 +11,8 @@ #include "datadog/uuid.hpp" +#include "datadog/impl/core/platform/system_info.hpp" #include "datadog/impl/core/version.hpp" -#include "datadog/impl/platform/system_info.hpp" using namespace datadog::impl; using namespace datadog; diff --git a/tests/impl/events/enum_test.cpp b/tests/impl/core/events/enum_test.cpp similarity index 96% rename from tests/impl/events/enum_test.cpp rename to tests/impl/core/events/enum_test.cpp index 328916e5..b363d3ba 100644 --- a/tests/impl/events/enum_test.cpp +++ b/tests/impl/core/events/enum_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/events/enum.hpp" +#include "datadog/impl/core/events/enum.hpp" #include #include diff --git a/tests/impl/events/omissible_test.cpp b/tests/impl/core/events/omissible_test.cpp similarity index 97% rename from tests/impl/events/omissible_test.cpp rename to tests/impl/core/events/omissible_test.cpp index 34e95dcd..00c3e8e5 100644 --- a/tests/impl/events/omissible_test.cpp +++ b/tests/impl/core/events/omissible_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/events/omissible.hpp" +#include "datadog/impl/core/events/omissible.hpp" #include #include @@ -14,8 +14,8 @@ #include "datadog/timestamp.hpp" #include "datadog/uuid.hpp" -#include "datadog/impl/events/struct.hpp" -#include "datadog/impl/events/timestamp.hpp" +#include "datadog/impl/core/events/struct.hpp" +#include "datadog/impl/core/events/timestamp.hpp" #include "support/json_serialization.hpp" diff --git a/tests/impl/events/struct_test.cpp b/tests/impl/core/events/struct_test.cpp similarity index 99% rename from tests/impl/events/struct_test.cpp rename to tests/impl/core/events/struct_test.cpp index c8e2e37a..d5ac72f2 100644 --- a/tests/impl/events/struct_test.cpp +++ b/tests/impl/core/events/struct_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/events/struct.hpp" +#include "datadog/impl/core/events/struct.hpp" #include #include diff --git a/tests/impl/events/timestamp_test.cpp b/tests/impl/core/events/timestamp_test.cpp similarity index 94% rename from tests/impl/events/timestamp_test.cpp rename to tests/impl/core/events/timestamp_test.cpp index a5e8e3fc..f2c9efe5 100644 --- a/tests/impl/events/timestamp_test.cpp +++ b/tests/impl/core/events/timestamp_test.cpp @@ -4,11 +4,11 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/events/timestamp.hpp" +#include "datadog/impl/core/events/timestamp.hpp" #include -#include "datadog/impl/events/enum.hpp" +#include "datadog/impl/core/events/enum.hpp" #include "support/catch.hpp" #include "support/json_serialization.hpp" diff --git a/tests/impl/core/feature_scope_test.cpp b/tests/impl/core/feature_scope_test.cpp index 179db6b1..e971e3d4 100644 --- a/tests/impl/core/feature_scope_test.cpp +++ b/tests/impl/core/feature_scope_test.cpp @@ -17,7 +17,7 @@ #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/context_thread.hpp" #include "datadog/impl/core/feature_types/rum.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" #include "support/catch.hpp" #include "support/context.hpp" diff --git a/tests/impl/json/attribute_test.cpp b/tests/impl/core/json/attribute_test.cpp similarity index 99% rename from tests/impl/json/attribute_test.cpp rename to tests/impl/core/json/attribute_test.cpp index 208552fd..281224cc 100644 --- a/tests/impl/json/attribute_test.cpp +++ b/tests/impl/core/json/attribute_test.cpp @@ -15,7 +15,7 @@ #include "datadog/uuid.hpp" -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/json.hpp" using namespace datadog; using namespace datadog::impl; diff --git a/tests/impl/json/optional_test.cpp b/tests/impl/core/json/optional_test.cpp similarity index 100% rename from tests/impl/json/optional_test.cpp rename to tests/impl/core/json/optional_test.cpp diff --git a/tests/impl/json/primitives/bool_test.cpp b/tests/impl/core/json/primitives/bool_test.cpp similarity index 100% rename from tests/impl/json/primitives/bool_test.cpp rename to tests/impl/core/json/primitives/bool_test.cpp diff --git a/tests/impl/json/primitives/float_test.cpp b/tests/impl/core/json/primitives/float_test.cpp similarity index 100% rename from tests/impl/json/primitives/float_test.cpp rename to tests/impl/core/json/primitives/float_test.cpp diff --git a/tests/impl/json/primitives/integer_test.cpp b/tests/impl/core/json/primitives/integer_test.cpp similarity index 100% rename from tests/impl/json/primitives/integer_test.cpp rename to tests/impl/core/json/primitives/integer_test.cpp diff --git a/tests/impl/json/primitives/null_test.cpp b/tests/impl/core/json/primitives/null_test.cpp similarity index 100% rename from tests/impl/json/primitives/null_test.cpp rename to tests/impl/core/json/primitives/null_test.cpp diff --git a/tests/impl/json/primitives/string_test.cpp b/tests/impl/core/json/primitives/string_test.cpp similarity index 100% rename from tests/impl/json/primitives/string_test.cpp rename to tests/impl/core/json/primitives/string_test.cpp diff --git a/tests/impl/json/primitives/timestamp_test.cpp b/tests/impl/core/json/primitives/timestamp_test.cpp similarity index 100% rename from tests/impl/json/primitives/timestamp_test.cpp rename to tests/impl/core/json/primitives/timestamp_test.cpp diff --git a/tests/impl/json/primitives/uuid_test.cpp b/tests/impl/core/json/primitives/uuid_test.cpp similarity index 100% rename from tests/impl/json/primitives/uuid_test.cpp rename to tests/impl/core/json/primitives/uuid_test.cpp diff --git a/tests/impl/platform/clock_test.cpp b/tests/impl/core/platform/clock_test.cpp similarity index 97% rename from tests/impl/platform/clock_test.cpp rename to tests/impl/core/platform/clock_test.cpp index 449d04a1..232375d7 100644 --- a/tests/impl/platform/clock_test.cpp +++ b/tests/impl/core/platform/clock_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/platform/clock.hpp" +#include "datadog/impl/core/platform/clock.hpp" #include #include diff --git a/tests/impl/platform/http_test.cpp b/tests/impl/core/platform/http_test.cpp similarity index 99% rename from tests/impl/platform/http_test.cpp rename to tests/impl/core/platform/http_test.cpp index 1d66d87d..cce2a0e3 100644 --- a/tests/impl/platform/http_test.cpp +++ b/tests/impl/core/platform/http_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/platform/http.hpp" +#include "datadog/impl/core/platform/http.hpp" #include #include diff --git a/tests/impl/platform/system_info_test.cpp b/tests/impl/core/platform/system_info_test.cpp similarity index 98% rename from tests/impl/platform/system_info_test.cpp rename to tests/impl/core/platform/system_info_test.cpp index 3bff9489..74b41039 100644 --- a/tests/impl/platform/system_info_test.cpp +++ b/tests/impl/core/platform/system_info_test.cpp @@ -4,14 +4,14 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" #include #include #include #include -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" using namespace datadog; diff --git a/tests/impl/platform/windows_timezone_mapping_test.cpp b/tests/impl/core/platform/windows_timezone_mapping_test.cpp similarity index 94% rename from tests/impl/platform/windows_timezone_mapping_test.cpp rename to tests/impl/core/platform/windows_timezone_mapping_test.cpp index ad8b7029..472f0ef1 100644 --- a/tests/impl/platform/windows_timezone_mapping_test.cpp +++ b/tests/impl/core/platform/windows_timezone_mapping_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/platform/windows_timezone_mapping.hpp" +#include "datadog/impl/core/platform/windows_timezone_mapping.hpp" #include diff --git a/tests/impl/storage/artifact_test.cpp b/tests/impl/core/storage/artifact_test.cpp similarity index 94% rename from tests/impl/storage/artifact_test.cpp rename to tests/impl/core/storage/artifact_test.cpp index 1f57325e..bd1e2968 100644 --- a/tests/impl/storage/artifact_test.cpp +++ b/tests/impl/core/storage/artifact_test.cpp @@ -4,9 +4,9 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/storage/artifact.hpp" +#include "datadog/impl/core/storage/artifact.hpp" -#include "datadog/impl/storage/sdk.hpp" +#include "datadog/impl/core/storage/sdk.hpp" #include "mock/filesystem.hpp" #include "support/catch.hpp" diff --git a/tests/impl/storage/feature_event_test.cpp b/tests/impl/core/storage/feature_event_test.cpp similarity index 99% rename from tests/impl/storage/feature_event_test.cpp rename to tests/impl/core/storage/feature_event_test.cpp index 33237127..6adca576 100644 --- a/tests/impl/storage/feature_event_test.cpp +++ b/tests/impl/core/storage/feature_event_test.cpp @@ -4,9 +4,9 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/storage/feature_event.hpp" +#include "datadog/impl/core/storage/feature_event.hpp" -#include "datadog/impl/storage/sdk.hpp" +#include "datadog/impl/core/storage/sdk.hpp" #include "mock/filesystem.hpp" #include "support/catch.hpp" diff --git a/tests/impl/storage/filesystem_test.cpp b/tests/impl/core/storage/filesystem_test.cpp similarity index 99% rename from tests/impl/storage/filesystem_test.cpp rename to tests/impl/core/storage/filesystem_test.cpp index e4a91d56..75219644 100644 --- a/tests/impl/storage/filesystem_test.cpp +++ b/tests/impl/core/storage/filesystem_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/storage/filesystem.hpp" +#include "datadog/impl/core/storage/filesystem.hpp" #include #include diff --git a/tests/impl/storage/path_test.cpp b/tests/impl/core/storage/path_test.cpp similarity index 99% rename from tests/impl/storage/path_test.cpp rename to tests/impl/core/storage/path_test.cpp index 44d56e74..9fa9152b 100644 --- a/tests/impl/storage/path_test.cpp +++ b/tests/impl/core/storage/path_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/storage/path.hpp" +#include "datadog/impl/core/storage/path.hpp" #include diff --git a/tests/impl/storage/sdk_test.cpp b/tests/impl/core/storage/sdk_test.cpp similarity index 99% rename from tests/impl/storage/sdk_test.cpp rename to tests/impl/core/storage/sdk_test.cpp index 316d0ad4..e4794764 100644 --- a/tests/impl/storage/sdk_test.cpp +++ b/tests/impl/core/storage/sdk_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/storage/sdk.hpp" +#include "datadog/impl/core/storage/sdk.hpp" #include #include diff --git a/tests/impl/core/storage_thread_test.cpp b/tests/impl/core/storage_thread_test.cpp index b337dc9b..f5fde4e6 100644 --- a/tests/impl/core/storage_thread_test.cpp +++ b/tests/impl/core/storage_thread_test.cpp @@ -11,7 +11,7 @@ #include #include "datadog/impl/core/core.hpp" -#include "datadog/impl/storage/sdk.hpp" +#include "datadog/impl/core/storage/sdk.hpp" #include "mock/clock.hpp" #include "mock/feature.hpp" diff --git a/tests/impl/core/storage_write_test.cpp b/tests/impl/core/storage_write_test.cpp index 28e3446e..302a0ca3 100644 --- a/tests/impl/core/storage_write_test.cpp +++ b/tests/impl/core/storage_write_test.cpp @@ -12,8 +12,8 @@ #include #include -#include "datadog/impl/storage/feature_event.hpp" -#include "datadog/impl/storage/sdk.hpp" +#include "datadog/impl/core/storage/feature_event.hpp" +#include "datadog/impl/core/storage/sdk.hpp" #include "mock/clock.hpp" #include "mock/filesystem.hpp" diff --git a/tests/impl/core/upload_thread_test.cpp b/tests/impl/core/upload_thread_test.cpp index 44704595..ab6020d9 100644 --- a/tests/impl/core/upload_thread_test.cpp +++ b/tests/impl/core/upload_thread_test.cpp @@ -16,7 +16,7 @@ #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/core.hpp" -#include "datadog/impl/storage/sdk.hpp" +#include "datadog/impl/core/storage/sdk.hpp" #include "mock/clock.hpp" #include "mock/feature.hpp" diff --git a/tests/impl/diagnostics_test.cpp b/tests/impl/core/util/diagnostics_test.cpp similarity index 99% rename from tests/impl/diagnostics_test.cpp rename to tests/impl/core/util/diagnostics_test.cpp index a2a0c922..3718f27c 100644 --- a/tests/impl/diagnostics_test.cpp +++ b/tests/impl/core/util/diagnostics_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" #include #include diff --git a/tests/impl/error_message_test.cpp b/tests/impl/core/util/error_message_test.cpp similarity index 97% rename from tests/impl/error_message_test.cpp rename to tests/impl/core/util/error_message_test.cpp index 5f211c6c..8c7f3fde 100644 --- a/tests/impl/error_message_test.cpp +++ b/tests/impl/core/util/error_message_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/error_message.hpp" +#include "datadog/impl/core/util/error_message.hpp" #include "support/catch.hpp" diff --git a/tests/impl/json_test.cpp b/tests/impl/core/util/json_test.cpp similarity index 94% rename from tests/impl/json_test.cpp rename to tests/impl/core/util/json_test.cpp index 266ed015..87f2607f 100644 --- a/tests/impl/json_test.cpp +++ b/tests/impl/core/util/json_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/json.hpp" #include #include @@ -13,7 +13,7 @@ #include "datadog/uuid.hpp" -#include "datadog/impl/events/struct.hpp" +#include "datadog/impl/core/events/struct.hpp" namespace datadog::impl { struct JsonTestEvent { diff --git a/tests/impl/validation_test.cpp b/tests/impl/core/util/validation_test.cpp similarity index 96% rename from tests/impl/validation_test.cpp rename to tests/impl/core/util/validation_test.cpp index 44fbd458..647e0ea0 100644 --- a/tests/impl/validation_test.cpp +++ b/tests/impl/core/util/validation_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/validation.hpp" +#include "datadog/impl/core/util/validation.hpp" #include "support/catch.hpp" diff --git a/tests/impl/core/writer_test.cpp b/tests/impl/core/writer_test.cpp index 53a5b15d..e3f30023 100644 --- a/tests/impl/core/writer_test.cpp +++ b/tests/impl/core/writer_test.cpp @@ -10,8 +10,8 @@ #include #include "datadog/impl/core/feature_read.hpp" +#include "datadog/impl/core/platform/http.hpp" #include "datadog/impl/core/tlv.hpp" -#include "datadog/impl/platform/http.hpp" #include "mock/filesystem.hpp" #include "mock/tlv.hpp" diff --git a/tests/impl/features/logging/logger_test.cpp b/tests/impl/logging/logger_test.cpp similarity index 98% rename from tests/impl/features/logging/logger_test.cpp rename to tests/impl/logging/logger_test.cpp index f4126f8e..809936b4 100644 --- a/tests/impl/features/logging/logger_test.cpp +++ b/tests/impl/logging/logger_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/logging/logger.hpp" +#include "datadog/impl/logging/logger.hpp" #include #include @@ -15,8 +15,8 @@ #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/feature_scope.hpp" #include "datadog/impl/core/feature_types/rum.hpp" -#include "datadog/impl/features/logging/logging.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" +#include "datadog/impl/logging/logging.hpp" #include "mock/clock.hpp" #include "support/context.hpp" diff --git a/tests/impl/features/rum/command_test.cpp b/tests/impl/rum/command_test.cpp similarity index 98% rename from tests/impl/features/rum/command_test.cpp rename to tests/impl/rum/command_test.cpp index b4a779dc..6f75448d 100644 --- a/tests/impl/features/rum/command_test.cpp +++ b/tests/impl/rum/command_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/command.hpp" +#include "datadog/impl/rum/command.hpp" #include diff --git a/tests/impl/features/rum/containers/resource_map_test.cpp b/tests/impl/rum/containers/resource_map_test.cpp similarity index 94% rename from tests/impl/features/rum/containers/resource_map_test.cpp rename to tests/impl/rum/containers/resource_map_test.cpp index 472d38d3..18d16283 100644 --- a/tests/impl/features/rum/containers/resource_map_test.cpp +++ b/tests/impl/rum/containers/resource_map_test.cpp @@ -4,16 +4,16 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/containers/resource_map.hpp" +#include "datadog/impl/rum/containers/resource_map.hpp" #include "datadog/rum.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/features/rum/command.hpp" -#include "datadog/impl/features/rum/scopes/application.hpp" -#include "datadog/impl/features/rum/scopes/resource.hpp" -#include "datadog/impl/features/rum/scopes/session.hpp" -#include "datadog/impl/features/rum/scopes/view.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" +#include "datadog/impl/rum/command.hpp" +#include "datadog/impl/rum/scopes/application.hpp" +#include "datadog/impl/rum/scopes/resource.hpp" +#include "datadog/impl/rum/scopes/session.hpp" +#include "datadog/impl/rum/scopes/view.hpp" #include "mock/clock.hpp" #include "mock/system_info.hpp" diff --git a/tests/impl/features/rum/containers/view_array_test.cpp b/tests/impl/rum/containers/view_array_test.cpp similarity index 96% rename from tests/impl/features/rum/containers/view_array_test.cpp rename to tests/impl/rum/containers/view_array_test.cpp index 313897a1..dc39eda8 100644 --- a/tests/impl/features/rum/containers/view_array_test.cpp +++ b/tests/impl/rum/containers/view_array_test.cpp @@ -4,15 +4,15 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/containers/view_array.hpp" +#include "datadog/impl/rum/containers/view_array.hpp" #include "datadog/rum.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/features/rum/command.hpp" -#include "datadog/impl/features/rum/scopes/application.hpp" -#include "datadog/impl/features/rum/scopes/session.hpp" -#include "datadog/impl/features/rum/scopes/view.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" +#include "datadog/impl/rum/command.hpp" +#include "datadog/impl/rum/scopes/application.hpp" +#include "datadog/impl/rum/scopes/session.hpp" +#include "datadog/impl/rum/scopes/view.hpp" #include "mock/clock.hpp" #include "mock/system_info.hpp" diff --git a/tests/impl/features/rum/context_test.cpp b/tests/impl/rum/context_test.cpp similarity index 99% rename from tests/impl/features/rum/context_test.cpp rename to tests/impl/rum/context_test.cpp index ab38986c..7d01b9b3 100644 --- a/tests/impl/features/rum/context_test.cpp +++ b/tests/impl/rum/context_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/context.hpp" +#include "datadog/impl/rum/context.hpp" #include diff --git a/tests/impl/features/rum/rum_test.cpp b/tests/impl/rum/rum_test.cpp similarity index 99% rename from tests/impl/features/rum/rum_test.cpp rename to tests/impl/rum/rum_test.cpp index eaeecdd8..89874eb3 100644 --- a/tests/impl/features/rum/rum_test.cpp +++ b/tests/impl/rum/rum_test.cpp @@ -11,8 +11,8 @@ #include "datadog/core.hpp" -#include "datadog/impl/features/rum/rum.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" +#include "datadog/impl/rum/rum.hpp" #include "mock/clock.hpp" #include "support/context.hpp" diff --git a/tests/impl/features/rum/scope_test.cpp b/tests/impl/rum/scope_test.cpp similarity index 98% rename from tests/impl/features/rum/scope_test.cpp rename to tests/impl/rum/scope_test.cpp index 8377d88c..35d7fa0f 100644 --- a/tests/impl/features/rum/scope_test.cpp +++ b/tests/impl/rum/scope_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/scope.hpp" +#include "datadog/impl/rum/scope.hpp" #include #include diff --git a/tests/impl/features/rum/scopes/action_test.cpp b/tests/impl/rum/scopes/action_test.cpp similarity index 97% rename from tests/impl/features/rum/scopes/action_test.cpp rename to tests/impl/rum/scopes/action_test.cpp index d93f38e5..74b25728 100644 --- a/tests/impl/features/rum/scopes/action_test.cpp +++ b/tests/impl/rum/scopes/action_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/scopes/action.hpp" +#include "datadog/impl/rum/scopes/action.hpp" #include #include @@ -15,11 +15,11 @@ #include "datadog/uuid.hpp" #include "datadog/impl/core/feature_scope.hpp" -#include "datadog/impl/features/rum/context.hpp" -#include "datadog/impl/features/rum/scopes/application.hpp" -#include "datadog/impl/features/rum/scopes/session.hpp" -#include "datadog/impl/features/rum/scopes/view.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" +#include "datadog/impl/rum/context.hpp" +#include "datadog/impl/rum/scopes/application.hpp" +#include "datadog/impl/rum/scopes/session.hpp" +#include "datadog/impl/rum/scopes/view.hpp" #include "mock/clock.hpp" #include "support/rum_event_capture.hpp" diff --git a/tests/impl/features/rum/scopes/application_test.cpp b/tests/impl/rum/scopes/application_test.cpp similarity index 99% rename from tests/impl/features/rum/scopes/application_test.cpp rename to tests/impl/rum/scopes/application_test.cpp index 2b3fb21b..4e255105 100644 --- a/tests/impl/features/rum/scopes/application_test.cpp +++ b/tests/impl/rum/scopes/application_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/scopes/application.hpp" +#include "datadog/impl/rum/scopes/application.hpp" #include #include @@ -13,7 +13,7 @@ #include "datadog/rum.hpp" -#include "datadog/impl/features/rum/context.hpp" +#include "datadog/impl/rum/context.hpp" #include "mock/clock.hpp" #include "mock/system_info.hpp" diff --git a/tests/impl/features/rum/scopes/resource_test.cpp b/tests/impl/rum/scopes/resource_test.cpp similarity index 94% rename from tests/impl/features/rum/scopes/resource_test.cpp rename to tests/impl/rum/scopes/resource_test.cpp index 58f028db..f3ac5308 100644 --- a/tests/impl/features/rum/scopes/resource_test.cpp +++ b/tests/impl/rum/scopes/resource_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/scopes/resource.hpp" +#include "datadog/impl/rum/scopes/resource.hpp" #include #include @@ -15,11 +15,11 @@ #include "datadog/uuid.hpp" #include "datadog/impl/core/feature_scope.hpp" -#include "datadog/impl/features/rum/context.hpp" -#include "datadog/impl/features/rum/scopes/application.hpp" -#include "datadog/impl/features/rum/scopes/session.hpp" -#include "datadog/impl/features/rum/scopes/view.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" +#include "datadog/impl/rum/context.hpp" +#include "datadog/impl/rum/scopes/application.hpp" +#include "datadog/impl/rum/scopes/session.hpp" +#include "datadog/impl/rum/scopes/view.hpp" #include "mock/clock.hpp" #include "support/rum_event_capture.hpp" diff --git a/tests/impl/features/rum/scopes/session_test.cpp b/tests/impl/rum/scopes/session_test.cpp similarity index 99% rename from tests/impl/features/rum/scopes/session_test.cpp rename to tests/impl/rum/scopes/session_test.cpp index 05cc626e..dcf54b4c 100644 --- a/tests/impl/features/rum/scopes/session_test.cpp +++ b/tests/impl/rum/scopes/session_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/scopes/session.hpp" +#include "datadog/impl/rum/scopes/session.hpp" #include #include @@ -15,10 +15,10 @@ #include "datadog/uuid.hpp" #include "datadog/impl/core/feature_scope.hpp" -#include "datadog/impl/features/rum/context.hpp" -#include "datadog/impl/features/rum/scopes/application.hpp" -#include "datadog/impl/features/rum/scopes/view.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" +#include "datadog/impl/rum/context.hpp" +#include "datadog/impl/rum/scopes/application.hpp" +#include "datadog/impl/rum/scopes/view.hpp" #include "mock/clock.hpp" #include "mock/system_info.hpp" diff --git a/tests/impl/features/rum/scopes/view_test.cpp b/tests/impl/rum/scopes/view_test.cpp similarity index 98% rename from tests/impl/features/rum/scopes/view_test.cpp rename to tests/impl/rum/scopes/view_test.cpp index d6c5a4a8..56cedb94 100644 --- a/tests/impl/features/rum/scopes/view_test.cpp +++ b/tests/impl/rum/scopes/view_test.cpp @@ -4,7 +4,7 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025-Present Datadog, Inc. -#include "datadog/impl/features/rum/scopes/view.hpp" +#include "datadog/impl/rum/scopes/view.hpp" #include #include @@ -15,10 +15,10 @@ #include "datadog/uuid.hpp" #include "datadog/impl/core/feature_scope.hpp" -#include "datadog/impl/features/rum/context.hpp" -#include "datadog/impl/features/rum/scopes/application.hpp" -#include "datadog/impl/features/rum/scopes/session.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" +#include "datadog/impl/rum/context.hpp" +#include "datadog/impl/rum/scopes/application.hpp" +#include "datadog/impl/rum/scopes/session.hpp" #include "mock/clock.hpp" #include "support/rum_event_capture.hpp" diff --git a/tests/mock/clock.hpp b/tests/mock/clock.hpp index b38dda8e..ba3f331d 100644 --- a/tests/mock/clock.hpp +++ b/tests/mock/clock.hpp @@ -12,7 +12,7 @@ #include #include -#include "datadog/impl/platform/clock.hpp" +#include "datadog/impl/core/platform/clock.hpp" using namespace datadog; diff --git a/tests/mock/filesystem.hpp b/tests/mock/filesystem.hpp index 566d1c6d..5ecdb421 100644 --- a/tests/mock/filesystem.hpp +++ b/tests/mock/filesystem.hpp @@ -15,9 +15,9 @@ #include #include -#include "datadog/impl/assert.hpp" -#include "datadog/impl/storage/filesystem.hpp" -#include "datadog/impl/storage/filesystem_wrapper.hpp" +#include "datadog/impl/core/storage/filesystem.hpp" +#include "datadog/impl/core/storage/filesystem_wrapper.hpp" +#include "datadog/impl/core/util/assert.hpp" using namespace datadog; diff --git a/tests/mock/http_client.hpp b/tests/mock/http_client.hpp index d2fc4114..5bd6f538 100644 --- a/tests/mock/http_client.hpp +++ b/tests/mock/http_client.hpp @@ -9,7 +9,7 @@ #include #include -#include "datadog/impl/platform/http.hpp" +#include "datadog/impl/core/platform/http.hpp" using namespace datadog; diff --git a/tests/mock/http_client_mock_test.cpp b/tests/mock/http_client_mock_test.cpp index d21856db..967bfd7e 100644 --- a/tests/mock/http_client_mock_test.cpp +++ b/tests/mock/http_client_mock_test.cpp @@ -8,7 +8,7 @@ #include #include -#include "datadog/impl/platform/http.hpp" +#include "datadog/impl/core/platform/http.hpp" #include "mock/http_client.hpp" diff --git a/tests/mock/system_info.hpp b/tests/mock/system_info.hpp index 02ea9eb8..8d4462da 100644 --- a/tests/mock/system_info.hpp +++ b/tests/mock/system_info.hpp @@ -6,7 +6,7 @@ #pragma once -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" using namespace datadog; diff --git a/tests/support/allocation_tracker.cpp b/tests/support/allocation_tracker.cpp index 1f536c4d..80cfa213 100644 --- a/tests/support/allocation_tracker.cpp +++ b/tests/support/allocation_tracker.cpp @@ -15,7 +15,7 @@ #include #include -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" #if WITH_DATADOG_ALLOCATION_TRACKING diff --git a/tests/support/attribute_debug.cpp b/tests/support/attribute_debug.cpp index 24dc9d12..8a421b08 100644 --- a/tests/support/attribute_debug.cpp +++ b/tests/support/attribute_debug.cpp @@ -9,7 +9,7 @@ #include #include -#include "datadog/impl/attribute/cow.hpp" +#include "datadog/impl/core/attribute/cow.hpp" namespace datadog::impl { diff --git a/tests/support/context.hpp b/tests/support/context.hpp index c064a6f9..d6fe5eec 100644 --- a/tests/support/context.hpp +++ b/tests/support/context.hpp @@ -7,7 +7,7 @@ #pragma once #include "datadog/impl/core/context.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" static const datadog::platform::OsInfo MOCK_OS_INFO{ "mock-os", "2.3.4", "mock-build-number", "2" diff --git a/tests/support/diagnostics.hpp b/tests/support/diagnostics.hpp index 5911a6e2..9addcd08 100644 --- a/tests/support/diagnostics.hpp +++ b/tests/support/diagnostics.hpp @@ -14,7 +14,7 @@ #include "datadog/core.h" #include "datadog/core.hpp" -#include "datadog/impl/diagnostics.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" #include "support/catch.hpp" diff --git a/tests/support/feature.hpp b/tests/support/feature.hpp index 29282def..f991ad24 100644 --- a/tests/support/feature.hpp +++ b/tests/support/feature.hpp @@ -9,10 +9,10 @@ #include #include -#include "datadog/impl/assert.hpp" #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/feature.hpp" #include "datadog/impl/core/feature_scope.hpp" +#include "datadog/impl/core/util/assert.hpp" using namespace datadog; using namespace datadog::impl; diff --git a/tests/support/filesystem.hpp b/tests/support/filesystem.hpp index b86e91d2..ec81b61a 100644 --- a/tests/support/filesystem.hpp +++ b/tests/support/filesystem.hpp @@ -21,7 +21,7 @@ #include #include -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/json.hpp" #include "support/catch.hpp" diff --git a/tests/support/json_serialization.hpp b/tests/support/json_serialization.hpp index 251f8ec3..8d61cb6e 100644 --- a/tests/support/json_serialization.hpp +++ b/tests/support/json_serialization.hpp @@ -11,7 +11,7 @@ #include #include -#include "datadog/impl/json.hpp" +#include "datadog/impl/core/util/json.hpp" /** * Given a value of any JSON-serializable type T, serializes it with `EncodeJson` and diff --git a/tests/support/rum_event_capture.hpp b/tests/support/rum_event_capture.hpp index 9cd9390e..a02d981b 100644 --- a/tests/support/rum_event_capture.hpp +++ b/tests/support/rum_event_capture.hpp @@ -16,8 +16,8 @@ #include "datadog/impl/core/context.hpp" #include "datadog/impl/core/feature_scope.hpp" -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" #include "support/context.hpp" #include "support/diagnostics.hpp" diff --git a/tests/support/tempdir.hpp b/tests/support/tempdir.hpp index 50c6d85b..77fead6d 100644 --- a/tests/support/tempdir.hpp +++ b/tests/support/tempdir.hpp @@ -22,7 +22,7 @@ #include #endif -#include "datadog/impl/assert.hpp" +#include "datadog/impl/core/util/assert.hpp" /** * Returns the path to a suitable system-wide temp file directory. diff --git a/tools/generate-windows-timezone-mapping/main.py b/tools/generate-windows-timezone-mapping/main.py index 96336e73..190054ce 100755 --- a/tools/generate-windows-timezone-mapping/main.py +++ b/tools/generate-windows-timezone-mapping/main.py @@ -14,7 +14,7 @@ python3 generate-windows-timezone-mapping.py Output: - src/datadog/impl/platform/windows_timezone_mapping.hpp + src/datadog/impl/core/platform/windows_timezone_mapping.hpp """ import sys import subprocess @@ -24,7 +24,7 @@ from typing import List, Tuple CLDR_URL = "https://raw.githubusercontent.com/unicode-org/cldr/refs/heads/main/common/supplemental/windowsZones.xml" -OUTPUT_FILE = "src/datadog/impl/platform/windows_timezone_mapping.hpp" +OUTPUT_FILE = "src/datadog/impl/core/platform/windows_timezone_mapping.hpp" def fetch_windows_zones_xml() -> str: diff --git a/tools/print-system-info/main.cpp b/tools/print-system-info/main.cpp index cf0c1977..ab50422e 100644 --- a/tools/print-system-info/main.cpp +++ b/tools/print-system-info/main.cpp @@ -6,8 +6,8 @@ #include -#include "datadog/impl/diagnostics.hpp" -#include "datadog/impl/platform/system_info.hpp" +#include "datadog/impl/core/platform/system_info.hpp" +#include "datadog/impl/core/util/diagnostics.hpp" /** * This program is a simple utility that prints the values resolved by the SystemInfo