lib/modules: enable event_bytes_total unconditionally

Signed-off-by: László Várady <laszlo.varady@anno.io>

Author: MrAnno

lib/logreader.c

@@ -766,7 +766,6 @@ log_reader_new(GlobalConfig *cfg)
   self->super.super.free_fn = log_reader_free;
   self->super.wakeup = log_reader_wakeup;
   self->super.schedule_dynamic_window_realloc = _schedule_dynamic_window_realloc;
-  self->super.metrics.raw_bytes_enabled = TRUE;
   self->handshake_in_progress = TRUE;
   log_reader_init_watches(self);
   g_mutex_init(&self->pending_close_lock);

lib/logsource.c

@@ -495,11 +495,8 @@ _register_counters(LogSource *self)
 
   stats_unlock();
 
-  if (self->metrics.raw_bytes_enabled)
-    {
-      level = log_pipe_is_internal(&self->super) ? STATS_LEVEL3 : STATS_LEVEL1;
-      _register_raw_bytes_stats(self, level);
-    }
+  level = log_pipe_is_internal(&self->super) ? STATS_LEVEL3 : STATS_LEVEL1;
+  _register_raw_bytes_stats(self, level);
 }
 
 gboolean
@@ -522,8 +519,7 @@ log_source_init(LogPipe *s)
 static void
 _unregister_counters(LogSource *self)
 {
-  if (self->metrics.raw_bytes_enabled)
-    _unregister_raw_bytes_stats(self);
+  _unregister_raw_bytes_stats(self);
 
   stats_lock();
 

lib/logsource.h

@@ -89,7 +89,6 @@ struct _LogSource
     StatsClusterKey *recvd_messages_key;
     StatsCounterItem *recvd_messages;
 
-    gboolean raw_bytes_enabled;
     StatsClusterKey *recvd_bytes_key;
     StatsByteCounter recvd_bytes;
 

lib/logthrdest/logthrdestdrv.c

@@ -871,12 +871,9 @@ _register_worker_stats(LogThreadedDestWorker *self)
     stats_cluster_key_builder_add_label(kb, stats_cluster_label("id", self->owner->super.super.id ? : ""));
     _format_stats_key(self->owner, kb);
 
-    if (self->owner->metrics.raw_bytes_enabled)
-      {
-        stats_cluster_key_builder_set_name(kb, "output_event_bytes_total");
-        self->metrics.output_event_bytes_sc_key = stats_cluster_key_builder_build_single(kb);
-        stats_byte_counter_init(&self->metrics.written_bytes, self->metrics.output_event_bytes_sc_key, level, SBCP_KIB);
-      }
+    stats_cluster_key_builder_set_name(kb, "output_event_bytes_total");
+    self->metrics.output_event_bytes_sc_key = stats_cluster_key_builder_build_single(kb);
+    stats_byte_counter_init(&self->metrics.written_bytes, self->metrics.output_event_bytes_sc_key, level, SBCP_KIB);
   }
   stats_cluster_key_builder_pop(kb);
 

lib/logthrdest/logthrdestdrv.h

@@ -145,8 +145,6 @@ struct _LogThreadedDestDriver
     StatsCounterItem *written_messages;
     StatsCounterItem *output_event_retries;
 
-    gboolean raw_bytes_enabled;
-
     StatsAggregator *max_message_size;
     StatsAggregator *average_messages_size;
     StatsAggregator *max_batch_size;

lib/logthrsource/logthrsourcedrv.c

@@ -235,9 +235,6 @@ log_threaded_source_worker_init_instance(LogThreadedSourceWorker *self, LogThrea
   self->super.super.init = _worker_init;
   self->super.super.free_fn = log_threaded_source_worker_free;
   self->super.wakeup = _worker_wakeup;
-
-  self->super.metrics.raw_bytes_enabled = driver->raw_bytes_metrics_enabled;
-
   self->worker_index = worker_index;
 }
 

lib/logthrsource/logthrsourcedrv.h

@@ -78,8 +78,6 @@ struct _LogThreadedSourceDriver
   gchar *transport_name;
   gsize transport_name_len;
 
-  gboolean raw_bytes_metrics_enabled;
-
   void (*format_stats_key)(LogThreadedSourceDriver *self, StatsClusterKeyBuilder *kb);
   LogThreadedSourceWorker *(*worker_construct)(LogThreadedSourceDriver *self, gint worker_index);
 };
@@ -118,12 +116,6 @@ log_threaded_source_driver_get_parse_options(LogDriver *s)
   return &self->worker_options.parse_options;
 }
 
-static inline void
-log_threaded_source_enable_raw_bytes_metrics(LogThreadedSourceDriver *self)
-{
-  self->raw_bytes_metrics_enabled = TRUE;
-}
-
 /* Worker */
 
 void log_threaded_source_worker_init_instance(LogThreadedSourceWorker *self, LogThreadedSourceDriver *driver,

modules/grpc/common/grpc-dest.cpp

@@ -269,7 +269,6 @@ grpc_dd_new(GlobalConfig *cfg, const gchar *stats_name)
   self->super.worker.construct = _construct_worker;
   self->super.stats_source = stats_register_type(stats_name);
   self->super.format_stats_key = _format_stats_key;
-  self->super.metrics.raw_bytes_enabled = TRUE;
 
   return self;
 }

modules/grpc/otel/otel-source.cpp

@@ -175,9 +175,6 @@ LogDriver *
 otel_sd_new(GlobalConfig *cfg)
 {
   GrpcSourceDriver *self = grpc_sd_new(cfg, "opentelemetry", "otlp");
-
-  log_threaded_source_enable_raw_bytes_metrics(&self->super);
-
   self->cpp = new SourceDriver(self);
   return &self->super.super.super;
 }

modules/http/http.c

@@ -512,7 +512,6 @@ http_dd_new(GlobalConfig *cfg)
   self->super.super.super.super.free_fn = http_dd_free;
   self->super.super.super.super.generate_persist_name = _format_persist_name;
   self->super.format_stats_key = _format_stats_key;
-  self->super.metrics.raw_bytes_enabled = TRUE;
   self->super.stats_source = stats_register_type("http");
   self->super.worker.construct = http_dw_new;
 

modules/python/python-dest.c

@@ -657,8 +657,6 @@ python_dd_new(GlobalConfig *cfg)
   self->super.super.super.super.free_fn = python_dd_free;
   self->super.super.super.super.generate_persist_name = python_dd_format_persist_name;
 
-  self->super.metrics.raw_bytes_enabled = TRUE;
-
   self->super.worker.connect = python_dd_connect;
   self->super.worker.disconnect = python_dd_disconnect;
   self->super.worker.insert = python_dd_insert;

modules/python/python-fetcher.c

@@ -675,8 +675,6 @@ python_fetcher_new(GlobalConfig *cfg)
   self->super.super.worker_options.super.stats_level = STATS_LEVEL0;
   self->super.super.worker_options.super.stats_source = stats_register_type("python");
 
-  log_threaded_source_enable_raw_bytes_metrics(&self->super.super);
-
   self->super.fetch = python_fetcher_fetch;
 
   python_binding_init_instance(&self->binding);

modules/python/python-source.c

@@ -766,8 +766,6 @@ python_sd_new(GlobalConfig *cfg)
   self->super.worker_options.super.stats_source = stats_register_type("python");
   self->super.worker_construct = _construct_worker;
 
-  log_threaded_source_enable_raw_bytes_metrics(&self->super);
-
   self->post_message = _post_message_blocking;
 
   python_binding_init_instance(&self->binding);