Skip to content

Commit fcf99ae

Browse files
Fix IP options injection and parsing. (#933)
* WIP * Reuse func
1 parent 0555dc4 commit fcf99ae

File tree

7 files changed

+395
-248
lines changed

7 files changed

+395
-248
lines changed

.github/workflows/workflow_integration_tests_vm.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,15 @@ jobs:
3535
- name: build matrix
3636
id: build-matrix
3737
env:
38-
# 5 partitions, one for each of:
38+
# 6 partitions, one for each of:
3939
# 1. TestMultiProcess
4040
# 2. TestMultiProcessAppCP
4141
# 3. TestMultiProcessAppCPNoIP
4242
# 4. TestMultiProcessAppCPTCPOnly
4343
# 5. TestMultiProcessAppCPHeadersAndTCP
44+
# 6. TestMultiProcessAppCPIPOnly
4445

45-
PARTITIONS: 5
46+
PARTITIONS: 6
4647
TEST_TAGS: integration
4748
run: |
4849
echo -n "matrix=" >> $GITHUB_OUTPUT

bpf/common/trace_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ static __always_inline u8 find_trace_for_server_request(connection_info_t *conn,
347347
tp_info_pid_t *existing_tp = bpf_map_lookup_elem(&incoming_trace_map, conn);
348348
if (existing_tp) {
349349
found_tp = 1;
350-
bpf_dbg_printk("Found incoming (TCP) tp for server request");
350+
bpf_dbg_printk("Found incoming (TCP/IP) tp for server request");
351351
__builtin_memcpy(tp->trace_id, existing_tp->tp.trace_id, sizeof(tp->trace_id));
352352
__builtin_memcpy(tp->parent_id, existing_tp->tp.span_id, sizeof(tp->parent_id));
353353
bpf_map_delete_elem(&incoming_trace_map, conn);

bpf/tctracer/tc_ip.h

Lines changed: 0 additions & 190 deletions
This file was deleted.

0 commit comments

Comments
 (0)