4 files changed, 23 insertions, 22 deletions
diff --git a/include/common.h b/include/common.h
index da3884f..12c71a0 100644
--- a/include/common.h
+++ b/include/common.h
@@ -43,8 +43,6 @@ extern unsigned int zlog_env_is_init;
     } while (0)
 
 #define DP_TRACE_NO_ROLE 0
-#define DP_TRACE_ROLE 1
-#define DP_TELEMETRY_ROLE 2
 
 extern struct mr_instance * mr_instance;
 
diff --git a/include/job_ctx.h b/include/job_ctx.h
index aed399c..57a79e8 100644
--- a/include/job_ctx.h
+++ b/include/job_ctx.h
@@ -8,7 +8,7 @@ struct dp_trace_telemetry_desc
     struct dp_trace_job_desc job_desc;
 };
 
-void job_rule_apply(struct dp_trace_job_desc desc[], unsigned int nr_desc, uint8_t role);
+void job_rule_apply(struct dp_trace_job_desc desc[], unsigned int nr_desc);
 int job_id_to_index(job_bitmap_t job_id);
 job_bitmap_t index_to_job_id(unsigned int index);
 int is_job_id_used(job_bitmap_t job_id);
diff --git a/include/monit.h b/include/monit.h
index 94abc02..d833832 100644
--- a/include/monit.h
+++ b/include/monit.h
@@ -1,6 +1,24 @@
 #pragma once
 #include "common.h"
-#include "trace_output.h"
+
+struct record_saving_stat
+{
+    uint64_t recv_success;
+    uint64_t init_old_packet_drop;
+
+    uint64_t save_failed_at_job_deleted;
+    uint64_t save_failed_at_mutex_lock;
+
+    uint64_t save_to_kafka_failed_at_decode_messagepack;
+    uint64_t save_to_kafka_failed_at_send;
+    uint64_t save_to_kafka_success;
+
+    uint64_t save_to_file_failed_at_decode_to_str;
+    uint64_t save_to_file_failed_at_pcapng_open;
+    uint64_t save_to_file_failed_at_pcapng_format;
+    uint64_t save_to_file_failed_at_write_to_disk;
+    uint64_t save_to_file_success;
+};
 
 struct monit
 {
diff --git a/include/trace_output.h b/include/trace_output.h
index b1fbc9b..bf454a2 100644
--- a/include/trace_output.h
+++ b/include/trace_output.h
@@ -1,23 +1,8 @@
 #pragma once
 #include "common.h"
-
-struct record_saving_stat
-{
-    uint64_t recv_success;
-    uint64_t save_failed_at_job_deleted;
-    uint64_t save_failed_at_mutex_lock;
-
-    uint64_t save_to_kafka_failed_at_decode_messagepack;
-    uint64_t save_to_kafka_failed_at_send;
-    uint64_t save_to_kafka_success;
-
-    uint64_t save_to_file_failed_at_decode_to_str;
-    uint64_t save_to_file_failed_at_pcapng_open;
-    uint64_t save_to_file_failed_at_pcapng_format;
-    uint64_t save_to_file_failed_at_write_to_disk;
-    uint64_t save_to_file_success;
-};
+#include "monit.h"
 
 void dp_trace_output_init();
 void * dp_trace_process_thread(void * arg);
-void dp_trace_pcapng_merger(job_bitmap_t job_id);
-\ No newline at end of file
+void dp_trace_pcapng_merger(job_bitmap_t job_id);
+void dp_trace_ring_clear();
+\ No newline at end of file