Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions .gitlab/libdatadog-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,12 @@ stages:
if [ "${is_compile}" = "true" ]; then
safe=$(echo "${jname_lower}" | tr '/ ' '-_' | cut -c1-60)
trace_file="tmp/artifacts/traces/${safe}_${job_id}.txt"
echo "" && echo "--- trace: ${job_name} (${trigger}) ---"
trace=$(curl -sf -H "PRIVATE-TOKEN: ${GITLAB_TOKEN}" \
"${GITLAB_API}/projects/${CI_PROJECT_ID}/jobs/${job_id}/trace" \
|| echo "[trace unavailable]")
{ echo "=== ${job_name} (trigger: ${trigger}) ==="; echo "${trace}" | tail -c 15360; } \
> "${trace_file}"
echo "${trace}" | tail -c 2000
echo ""
{
echo "=== ${job_name} (trigger: ${trigger}) ==="
(curl -sf -H "PRIVATE-TOKEN: ${GITLAB_TOKEN}" "${GITLAB_API}/projects/${CI_PROJECT_ID}/jobs/${job_id}/trace" || echo "[trace unavailable]") | tail -c 15360
} > "${trace_file}"
tail -c 2000 "${trace_file}"
fi
done < <(jq -c '.[]' tmp/artifacts/all_failures.json)

Expand Down Expand Up @@ -275,7 +274,7 @@ stages:

# Feedback runs append [no-ci-feedback] so the next push doesn't trigger
# another analyze-and-create-pr, breaking the potential infinite loop.
FEEDBACK_MARKER="${LIBDATADOG_FEEDBACK_RUN:+' [no-ci-feedback]'}"
FEEDBACK_MARKER=$(if [ "${LIBDATADOG_FEEDBACK_RUN:-}" == "true" ]; then echo " [no-ci-feedback]"; fi)
COMMIT_MSG="libdatadog update to ${LIBDATADOG_SHA:0:8}${FEEDBACK_MARKER}

Automated update by CI pipeline ${CI_PIPELINE_URL}
Expand All @@ -290,7 +289,7 @@ stages:
"https://x-access-token:${GITHUB_TOKEN}@github.com/DataDog/dd-trace-php.git" \
"HEAD:${TARGET_BRANCH}"
set -x
elif [ -z "${LIBDATADOG_FEEDBACK_RUN:-}" ]; then
elif [ "${LIBDATADOG_FEEDBACK_RUN:-}" == "true" ]; then
# Original schedule run with no code changes: still push the submodule bump.
git commit --allow-empty -m "${COMMIT_MSG}" \
--author="github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
Expand Down
3 changes: 3 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions components-rs/bytes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,12 @@ pub extern "C" fn ddog_add_str_span_meta_CharSlice(

#[no_mangle]
pub extern "C" fn ddog_del_span_meta_zstr(ptr: &mut SpanBytes, key: &mut ZendString) {
ptr.meta.remove(&convert_zend_to_bytes_string(key));
ptr.meta.remove_slow(&convert_zend_to_bytes_string(key));
}

#[no_mangle]
pub extern "C" fn ddog_del_span_meta_str(ptr: &mut SpanBytes, key: *const c_char) {
ptr.meta.remove(&convert_literal_to_bytes_string(key));
ptr.meta.remove_slow(&convert_literal_to_bytes_string(key));
}

#[no_mangle]
Expand Down Expand Up @@ -290,7 +290,7 @@ pub extern "C" fn ddog_has_span_metrics_zstr(ptr: &mut SpanBytes, key: &mut Zend

#[no_mangle]
pub extern "C" fn ddog_del_span_metrics_zstr(ptr: &mut SpanBytes, key: &mut ZendString) {
ptr.metrics.remove(&convert_zend_to_bytes_string(key));
ptr.metrics.remove_slow(&convert_zend_to_bytes_string(key));
}

#[no_mangle]
Expand All @@ -316,7 +316,7 @@ pub extern "C" fn ddog_get_span_metrics_str(

#[no_mangle]
pub extern "C" fn ddog_del_span_metrics_str(ptr: &mut SpanBytes, key: *const c_char) {
ptr.metrics.remove(&convert_literal_to_bytes_string(key));
ptr.metrics.remove_slow(&convert_literal_to_bytes_string(key));
}

#[no_mangle]
Expand Down
2 changes: 1 addition & 1 deletion ext/sidecar.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ static void dd_sidecar_post_connect(ddog_SidecarTransport **transport, bool is_f
DATADOG_REMOTE_CONFIG_PRODUCTS.len,
DATADOG_REMOTE_CONFIG_CAPABILITIES.ptr,
DATADOG_REMOTE_CONFIG_CAPABILITIES.len,
get_global_DD_REMOTE_CONFIG_ENABLED(),
get_global_DD_TRACE_AGENTLESS() ? false : get_global_DD_REMOTE_CONFIG_ENABLED(),
is_fork,
process_tags,
dd_zend_string_to_CharSlice(get_global_DD_HOSTNAME()),
Expand Down
2 changes: 1 addition & 1 deletion libdatadog
Submodule libdatadog updated 58 files
+3 −0 Cargo.lock
+41 −32 bin_tests/src/modes/unix/test_017_multi_thread_collection.rs
+31 −15 bin_tests/src/modes/unix/test_020_sidecar_multi_thread_collection.rs
+1 −0 bin_tests/tests/crashtracker_bin_test.rs
+4 −0 datadog-sidecar-ffi/Cargo.toml
+15 −0 datadog-sidecar-ffi/src/lib.rs
+32 −21 datadog-sidecar-ffi/src/span.rs
+6 −5 datadog-sidecar-ffi/tests/span.rs
+32 −0 datadog-sidecar/src/service/blocking.rs
+8 −0 docs/RFCs/artifacts/crashtracker-unified-runtime-stack-schema-v1_8.json
+9 −0 examples/ffi/profiles.c
+21 −0 libdd-crashtracker-ffi/src/collector/mod.rs
+54 −20 libdd-crashtracker/src/collector/crash_handler.rs
+2 −1 libdd-crashtracker/src/collector/mod.rs
+50 −0 libdd-crashtracker/src/crash_info/builder.rs
+8 −0 libdd-crashtracker/src/crash_info/experimental.rs
+4 −4 libdd-crashtracker/src/lib.rs
+9 −0 libdd-crashtracker/src/receiver/receive_report.rs
+2 −1 libdd-data-pipeline-ffi/src/tracer.rs
+8 −6 libdd-data-pipeline/benches/trace_buffer.rs
+6 −3 libdd-data-pipeline/src/trace_buffer/mod.rs
+6 −0 libdd-data-pipeline/src/trace_exporter/mod.rs
+27 −0 libdd-profiling-ffi/src/profiles/datatypes.rs
+75 −1 libdd-profiling/src/internal/profile/mod.rs
+1 −0 libdd-remote-config/Cargo.toml
+125 −140 libdd-remote-config/src/fetch/fetcher.rs
+1 −1 libdd-remote-config/src/fetch/shared.rs
+1 −1 libdd-remote-config/src/fetch/single.rs
+13 −113 libdd-remote-config/src/path.rs
+4 −7 libdd-trace-stats/benches/span_concentrator_bench.rs
+44 −38 libdd-trace-stats/src/span_concentrator/aggregation.rs
+19 −18 libdd-trace-stats/src/span_concentrator/tests.rs
+2 −0 libdd-trace-utils/Cargo.toml
+178 −0 libdd-trace-utils/src/change_buffer/buffer.rs
+132 −0 libdd-trace-utils/src/change_buffer/mod.rs
+211 −0 libdd-trace-utils/src/change_buffer/operation.rs
+54 −0 libdd-trace-utils/src/change_buffer/span_header.rs
+115 −0 libdd-trace-utils/src/change_buffer/trace.rs
+37 −0 libdd-trace-utils/src/change_buffer/utils.rs
+3 −0 libdd-trace-utils/src/lib.rs
+22 −0 libdd-trace-utils/src/msgpack_decoder/decode/map.rs
+8 −6 libdd-trace-utils/src/msgpack_decoder/decode/meta_struct.rs
+5 −5 libdd-trace-utils/src/msgpack_decoder/decode/metrics.rs
+2 −2 libdd-trace-utils/src/msgpack_decoder/decode/span_link.rs
+37 −14 libdd-trace-utils/src/msgpack_decoder/decode/string.rs
+21 −33 libdd-trace-utils/src/msgpack_decoder/v04/mod.rs
+6 −7 libdd-trace-utils/src/msgpack_decoder/v05/mod.rs
+9 −6 libdd-trace-utils/src/msgpack_encoder/v04/span.rs
+48 −45 libdd-trace-utils/src/msgpack_encoder/v1/mod.rs
+16 −10 libdd-trace-utils/src/msgpack_encoder/v1/span_v04.rs
+34 −31 libdd-trace-utils/src/span/trace_utils.rs
+19 −7 libdd-trace-utils/src/span/v04/mod.rs
+6 −5 libdd-trace-utils/src/span/v05/mod.rs
+1 −2 libdd-trace-utils/src/span/vec_map.rs
+6 −5 libdd-trace-utils/src/test_utils/mod.rs
+5 −9 libdd-trace-utils/src/trace_utils.rs
+7 −8 libdd-trace-utils/src/tracer_payload.rs
+1 −2 libdd-trace-utils/tests/test_send_data.rs
2 changes: 1 addition & 1 deletion tests/ext/close_spans_until.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ int(2)
[ddtrace] [span] [%d] Switching to different SpanStack: %d
int(1)
int(0)
[ddtrace] [span] [%d] Encoding span: Span { service: close_spans_until.php, name: close_spans_until.php, resource: close_spans_until.php, type: cli, trace_id: %d, span_id: %d, parent_id: 0, start: %d, duration: %d, error: 0, meta: %s, metrics: %s, meta_struct: {}, span_links: [], span_events: [] }
[ddtrace] [span] [%d] Encoding span: Span { service: close_spans_until.php, name: close_spans_until.php, resource: close_spans_until.php, type: cli, trace_id: %d, span_id: %d, parent_id: 0, start: %d, duration: %d, error: 0, meta: %s, metrics: %s, meta_struct: %s, span_links: [], span_events: [] }
[ddtrace] [span] [%d] Encoding span: Span { service: close_spans_until.php, name: traced, resource: traced, type: cli, trace_id: %d, span_id: %d, parent_id: %d, start: %d, duration: %d, error: %d, meta: %s, metrics: %s, meta_struct: %s, span_links: %s, span_events: %s }
[ddtrace] [span] [%d] Encoding span: Span { service: close_spans_until.php, name: , resource: , type: cli, trace_id: %d, span_id: %d, parent_id: %d, start: %d, duration: %d, error: %d, meta: %s, metrics: %s, meta_struct: %s, span_links: %s, span_events: %s }
[ddtrace] [span] [%d] Encoding span: Span { service: close_spans_until.php, name: , resource: , type: cli, trace_id: %d, span_id: %d, parent_id: %d, start: %d, duration: %d, error: %d, meta: %s, metrics: %s, meta_struct: %s, span_links: %s, span_events: %s }
Expand Down
3 changes: 2 additions & 1 deletion tests/ext/crashtracker_segfault.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ $rr->waitForRequest(function ($request) {
"line": 1
}
]
}
},
"frame_count": %d
},
%A
"incomplete": false,
Expand Down
Loading