Skip to content

Commit 21d2f00

Browse files
cataphractcataphract
authored
Merge pull request #3530 from DataDog/glopes/sidecar-ffi-tel-metrics
Submit worker count. Do not route metrics thru ext
2 parents f4ca488 + a9545e1 commit 21d2f00

46 files changed

Lines changed: 903 additions & 500 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitlab/generate-appsec.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@
145145
after_script:
146146
- mkdir -p "${CI_PROJECT_DIR}/artifacts"
147147
- find appsec/tests/integration/build/test-results -name "*.xml" -exec cp --parents '{}' "${CI_PROJECT_DIR}/artifacts/" \;
148+
- cp -r appsec/tests/integration/build/test-logs "${CI_PROJECT_DIR}/artifacts/" 2>/dev/null || true
148149
- .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:appsec"
149150
artifacts:
150151
reports:
@@ -359,7 +360,7 @@
359360

360361
"check libxml2 version":
361362
stage: test
362-
image: registry.ddbuild.io/images/mirror/python:3.12-slim
363+
image: registry.ddbuild.io/images/mirror/python:3.12-slim-bullseye
363364
tags: [ "arch:amd64" ]
364365
needs: []
365366
allow_failure: true

‎Cargo.lock‎

Lines changed: 25 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎appsec/.clang-tidy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
# readability-function-cognitive-complexity temporarily disabled until clang-tidy is fixed
33
# right now emalloc causes it to misbehave
4-
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-*'
4+
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-*'
55
WarningsAsErrors: '*'
66
HeaderFilterRegex: ''
77
CheckOptions:

‎appsec/cmake/helper.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ target_compile_options(helper_objects PRIVATE -ftls-model=global-dynamic)
2929
target_link_libraries(helper_objects PUBLIC libddwaf_objects pthread spdlog
3030
cpp-base64 msgpack_c rapidjson_appsec boost_system zlibstatic)
3131

32+
target_compile_options(helper_objects PRIVATE -Wno-gnu-anonymous-struct -Wno-nested-anon-types)
33+
3234
add_library(ddappsec-helper SHARED
3335
src/helper/main.cpp
3436
$<TARGET_OBJECTS:helper_objects>

‎appsec/src/extension/commands/client_init.c‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,6 @@ static void _process_meta_and_metrics(
208208

209209
mpack_node_t metrics = mpack_node_array_at(root, 4);
210210
dd_command_process_metrics(metrics, span);
211-
212-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers)
213-
if (mpack_node_array_length(root) >= 6) {
214-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers)
215-
mpack_node_t tel_metrics = mpack_node_array_at(root, 5);
216-
dd_command_process_telemetry_metrics(tel_metrics);
217-
}
218211
}
219212

220213
static dd_result _check_helper_version(mpack_node_t root)

‎appsec/src/extension/commands/request_shutdown.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ static const char *nullable _header_content_type_zend_array(
2828
static const dd_command_spec _spec = {
2929
.name = "request_shutdown",
3030
.name_len = sizeof("request_shutdown") - 1,
31-
.num_args = 3, // a map, api sec sampling key, and sidecar queue id
31+
.num_args =
32+
4, // a map, api sec sampling key, sidecar queue id, and input_truncated
3233
.outgoing_cb = _request_pack,
3334
.incoming_cb = dd_command_proc_resp_verd_span_data,
3435
.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)
101102
// 3.
102103
mpack_write(w, dd_trace_get_sidecar_queue_id());
103104

105+
// 4.
106+
mpack_write_bool(w, dd_msgpack_helpers_is_data_truncated());
107+
104108
return dd_success;
105109
}
106110

0 commit comments

Comments
 (0)