Merge pull request #3530 from DataDog/glopes/sidecar-ffi-tel-metrics

Submit worker count. Do not route metrics thru ext

Author: cataphract

.gitlab/generate-appsec.php

@@ -145,6 +145,7 @@
   after_script:
     - mkdir -p "${CI_PROJECT_DIR}/artifacts"
     - find appsec/tests/integration/build/test-results -name "*.xml" -exec cp --parents '{}' "${CI_PROJECT_DIR}/artifacts/" \;
+    - cp -r appsec/tests/integration/build/test-logs "${CI_PROJECT_DIR}/artifacts/" 2>/dev/null || true
     - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:appsec"
   artifacts:
     reports:
@@ -359,7 +360,7 @@
 
 "check libxml2 version":
   stage: test
-  image: registry.ddbuild.io/images/mirror/python:3.12-slim
+  image: registry.ddbuild.io/images/mirror/python:3.12-slim-bullseye
   tags: [ "arch:amd64" ]
   needs: []
   allow_failure: true

Cargo.lock

@@ -1,7 +1,7 @@
 ---
 # readability-function-cognitive-complexity temporarily disabled until clang-tidy is fixed
 # right now emalloc causes it to misbehave
-Checks:          '*,-bugprone-reserved-identifier,-hicpp-signed-bitwise,-llvmlibc-restrict-system-libc-headers,-altera-unroll-loops,-hicpp-named-parameter,-cert-dcl37-c,-cert-dcl51-cpp,-read,-cppcoreguidelines-init-variables,-cppcoreguidelines-avoid-non-const-global-variables,-altera-id-dependent-backward-branch,-performance-no-int-to-ptr,-altera-struct-pack-align,-google-readability-casting,-modernize-use-trailing-return-type,-llvmlibc-implementation-in-namespace,-llvmlibc-callee-namespace,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-fuchsia-default-arguments-declarations,-fuchsia-overloaded-operator,-cppcoreguidelines-pro-type-union-access,-fuchsia-default-arguments-calls,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-google-readability-todo,-llvm-header-guard,-readability-function-cognitive-complexity,-readability-identifier-length,-modernize-macro-to-enum,-misc-include-cleaner,-bugprone-empty-catch,-cppcoreguidelines-avoid-do-while,-hicpp-no-array-decay,-llvmlibc-*'
+Checks:          '*,-bugprone-reserved-identifier,-hicpp-signed-bitwise,-llvmlibc-restrict-system-libc-headers,-altera-unroll-loops,-hicpp-named-parameter,-cert-dcl37-c,-cert-dcl51-cpp,-read,-cppcoreguidelines-init-variables,-cppcoreguidelines-avoid-non-const-global-variables,-altera-id-dependent-backward-branch,-performance-no-int-to-ptr,-altera-struct-pack-align,-google-readability-casting,-modernize-use-trailing-return-type,-llvmlibc-implementation-in-namespace,-llvmlibc-callee-namespace,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-fuchsia-default-arguments-declarations,-fuchsia-overloaded-operator,-cppcoreguidelines-pro-type-union-access,-fuchsia-default-arguments-calls,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-google-readability-todo,-llvm-header-guard,-readability-function-cognitive-complexity,-readability-identifier-length,-modernize-macro-to-enum,-misc-include-cleaner,-bugprone-empty-catch,-cppcoreguidelines-avoid-do-while,-hicpp-no-array-decay,-hicpp-avoid-c-arrays,-modernize-avoid-c-arrays,-hicpp-no-reinterpret-cast,-llvmlibc-*'
 WarningsAsErrors: '*'
 HeaderFilterRegex: ''
 CheckOptions:

appsec/.clang-tidy

@@ -29,6 +29,8 @@ target_compile_options(helper_objects PRIVATE -ftls-model=global-dynamic)
 target_link_libraries(helper_objects PUBLIC libddwaf_objects pthread spdlog
     cpp-base64 msgpack_c rapidjson_appsec boost_system zlibstatic)
 
+target_compile_options(helper_objects PRIVATE -Wno-gnu-anonymous-struct -Wno-nested-anon-types)
+
 add_library(ddappsec-helper SHARED
     src/helper/main.cpp
     $<TARGET_OBJECTS:helper_objects>

appsec/cmake/helper.cmake

@@ -208,13 +208,6 @@ static void _process_meta_and_metrics(
 
     mpack_node_t metrics = mpack_node_array_at(root, 4);
     dd_command_process_metrics(metrics, span);
-
-    // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers)
-    if (mpack_node_array_length(root) >= 6) {
-        // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers)
-        mpack_node_t tel_metrics = mpack_node_array_at(root, 5);
-        dd_command_process_telemetry_metrics(tel_metrics);
-    }
 }
 
 static dd_result _check_helper_version(mpack_node_t root)

appsec/src/extension/commands/client_init.c

@@ -28,7 +28,8 @@ static const char *nullable _header_content_type_zend_array(
 static const dd_command_spec _spec = {
     .name = "request_shutdown",
     .name_len = sizeof("request_shutdown") - 1,
-    .num_args = 3, // a map, api sec sampling key, and sidecar queue id
+    .num_args =
+        4, // a map, api sec sampling key, sidecar queue id, and input_truncated
     .outgoing_cb = _request_pack,
     .incoming_cb = dd_command_proc_resp_verd_span_data,
     .config_features_cb = dd_command_process_config_features_unexpected,
@@ -101,6 +102,9 @@ static dd_result _request_pack(mpack_writer_t *nonnull w, void *nonnull ctx)
     // 3.
     mpack_write(w, dd_trace_get_sidecar_queue_id());
 
+    // 4.
+    mpack_write_bool(w, dd_msgpack_helpers_is_data_truncated());
+
     return dd_success;
 }