Fix bug related to early cleanup

grafana · Aug 16, 2024 · 6e8358b · 6e8358b
1 parent 0cdab24
commit 6e8358b
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 6 deletions.
diff --git a/bpf/http_sock.c b/bpf/http_sock.c
@@ -439,12 +439,7 @@ static __always_inline int return_recvmsg(void *ctx, u64 id, int copied_len) {
 
     bpf_dbg_printk("=== return recvmsg id=%d args=%llx copied_len %d ===", id, args, copied_len);
 
-    if (!args) {
-        goto done;
-    }
-
-    if (copied_len <= 0) {
-        bpf_map_delete_elem(&active_recv_args, &id);
+    if (!args || (copied_len <= 0)) {
         goto done;
     }
 

diff --git a/pkg/internal/ebpf/httpfltr/bpf_arm64_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_arm64_bpfel.o
diff --git a/pkg/internal/ebpf/httpfltr/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_debug_arm64_bpfel.o
diff --git a/pkg/internal/ebpf/httpfltr/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_debug_x86_bpfel.o
diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_arm64_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_tp_arm64_bpfel.o
diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_arm64_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_arm64_bpfel.o
diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_x86_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_x86_bpfel.o
diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_x86_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_tp_x86_bpfel.o
diff --git a/pkg/internal/ebpf/httpfltr/bpf_x86_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_x86_bpfel.o
diff --git a/test/oats/kafka/docker-compose-beyla-java-kafka.yml b/test/oats/kafka/docker-compose-beyla-java-kafka.yml
@@ -54,6 +54,7 @@ services:
       BEYLA_METRICS_INTERVAL: "10ms"
       BEYLA_BPF_BATCH_TIMEOUT: "10ms"
       BEYLA_LOG_LEVEL: "DEBUG"
+      BEYLA_BPF_DEBUG: "true"
       OTEL_EXPORTER_OTLP_ENDPOINT: "http://collector:4318"
     depends_on:
       testserver:

diff --git a/test/oats/kafka/docker-compose-beyla-python-kafka.yml b/test/oats/kafka/docker-compose-beyla-python-kafka.yml
@@ -61,6 +61,7 @@ services:
       BEYLA_METRICS_INTERVAL: "10ms"
       BEYLA_BPF_BATCH_TIMEOUT: "10ms"
       BEYLA_LOG_LEVEL: "DEBUG"
+      BEYLA_BPF_DEBUG: "true"
       OTEL_EXPORTER_OTLP_ENDPOINT: "http://collector:4318"
     depends_on:
       testserver:

diff --git a/test/oats/redis/docker-compose-beyla-go-redis.yml b/test/oats/redis/docker-compose-beyla-go-redis.yml
@@ -37,6 +37,7 @@ services:
       BEYLA_METRICS_INTERVAL: "10ms"
       BEYLA_BPF_BATCH_TIMEOUT: "10ms"
       BEYLA_LOG_LEVEL: "DEBUG"
+      BEYLA_BPF_DEBUG: "true"
       OTEL_EXPORTER_OTLP_ENDPOINT: "http://collector:4318"
     depends_on:
       testserver:

diff --git a/test/oats/redis/docker-compose-beyla-redis.yml b/test/oats/redis/docker-compose-beyla-redis.yml
@@ -37,6 +37,7 @@ services:
       BEYLA_METRICS_INTERVAL: "10ms"
       BEYLA_BPF_BATCH_TIMEOUT: "10ms"
       BEYLA_LOG_LEVEL: "DEBUG"
+      BEYLA_BPF_DEBUG: "true"
       OTEL_EXPORTER_OTLP_ENDPOINT: "http://collector:4318"
     depends_on:
       testserver:

diff --git a/test/oats/sql/docker-compose-beyla-gosqlclient-statement.yml b/test/oats/sql/docker-compose-beyla-gosqlclient-statement.yml
@@ -31,6 +31,7 @@ services:
       BEYLA_METRICS_INTERVAL: "10ms"
       BEYLA_BPF_BATCH_TIMEOUT: "10ms"
       BEYLA_LOG_LEVEL: "DEBUG"
+      BEYLA_BPF_DEBUG: "true"
       OTEL_EXPORTER_OTLP_ENDPOINT: "http://collector:4318"
     depends_on:
       testserver:

diff --git a/test/oats/sql/docker-compose-beyla-gosqlclient.yml b/test/oats/sql/docker-compose-beyla-gosqlclient.yml
@@ -31,6 +31,7 @@ services:
       BEYLA_METRICS_INTERVAL: "10ms"
       BEYLA_BPF_BATCH_TIMEOUT: "10ms"
       BEYLA_LOG_LEVEL: "DEBUG"
+      BEYLA_BPF_DEBUG: "true"
       OTEL_EXPORTER_OTLP_ENDPOINT: "http://collector:4318"
     depends_on:
       testserver:

diff --git a/test/oats/sql/docker-compose-beyla-sql.yml b/test/oats/sql/docker-compose-beyla-sql.yml
@@ -42,6 +42,7 @@ services:
       BEYLA_METRICS_INTERVAL: "10ms"
       BEYLA_BPF_BATCH_TIMEOUT: "10ms"
       BEYLA_LOG_LEVEL: "DEBUG"
+      BEYLA_BPF_DEBUG: "true"
       OTEL_EXPORTER_OTLP_ENDPOINT: "http://collector:4318"
     depends_on:
       testserver: