Merging upstream version 1.45.3+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 141 insertions, 0 deletions

diff --git a/src/fluent-bit/lib/cmetrics/tests/data/issue_fluent_bit_5894.txt b/src/fluent-bit/lib/cmetrics/tests/data/issue_fluent_bit_5894.txt
new file mode 100644
index 000000000..482494053
--- /dev/null
+++ b/src/fluent-bit/lib/cmetrics/tests/data/issue_fluent_bit_5894.txt
@@ -0,0 +1,141 @@
+# HELP process_start_time_seconds Start time of the process since unix epoch.
+# TYPE process_start_time_seconds gauge
+process_start_time_seconds 1.660594096832E9
+# HELP hikaricp_connections_timeout_total Connection timeout total count
+# TYPE hikaricp_connections_timeout_total counter
+hikaricp_connections_timeout_total{pool="mcadb",} 0.0
+# HELP spring_kafka_listener_seconds_max Kafka Listener Timer
+# TYPE spring_kafka_listener_seconds_max gauge
+spring_kafka_listener_seconds_max{exception="ListenerExecutionFailedException",name="org.springframework.kafka.KafkaListenerEndpointContainer#0-0",result="failure",} 0.0
+spring_kafka_listener_seconds_max{exception="none",name="org.springframework.kafka.KafkaListenerEndpointContainer#0-0",result="success",} 0.0
+# HELP spring_kafka_listener_seconds Kafka Listener Timer
+# TYPE spring_kafka_listener_seconds summary
+spring_kafka_listener_seconds_count{exception="ListenerExecutionFailedException",name="org.springframework.kafka.KafkaListenerEndpointContainer#0-0",result="failure",} 0.0
+spring_kafka_listener_seconds_sum{exception="ListenerExecutionFailedException",name="org.springframework.kafka.KafkaListenerEndpointContainer#0-0",result="failure",} 0.0
+spring_kafka_listener_seconds_count{exception="none",name="org.springframework.kafka.KafkaListenerEndpointContainer#0-0",result="success",} 0.0
+spring_kafka_listener_seconds_sum{exception="none",name="org.springframework.kafka.KafkaListenerEndpointContainer#0-0",result="success",} 0.0
+# HELP process_files_max_files The maximum file descriptor count
+# TYPE process_files_max_files gauge
+process_files_max_files 1048576.0
+# HELP hikaricp_connections_pending Pending threads
+# TYPE hikaricp_connections_pending gauge
+hikaricp_connections_pending{pool="mcadb",} 0.0
+# HELP jvm_memory_committed_bytes The amount of memory in bytes that is committed for the Java virtual machine to use
+# TYPE jvm_memory_committed_bytes gauge
+jvm_memory_committed_bytes{area="nonheap",id="CodeHeap 'profiled nmethods'",} 1.605632E7
+jvm_memory_committed_bytes{area="heap",id="G1 Survivor Space",} 2.097152E7
+jvm_memory_committed_bytes{area="heap",id="G1 Old Gen",} 2.32783872E8
+jvm_memory_committed_bytes{area="nonheap",id="Metaspace",} 1.03374848E8
+jvm_memory_committed_bytes{area="nonheap",id="CodeHeap 'non-nmethods'",} 4390912.0
+jvm_memory_committed_bytes{area="heap",id="G1 Eden Space",} 3.73293056E8
+jvm_memory_committed_bytes{area="nonheap",id="Compressed Class Space",} 1.3500416E7
+jvm_memory_committed_bytes{area="nonheap",id="CodeHeap 'non-profiled nmethods'",} 4521984.0
+# HELP process_files_open_files The open file descriptor count
+# TYPE process_files_open_files gauge
+process_files_open_files 290.0
+# HELP rabbitmq_consumed_total  
+# TYPE rabbitmq_consumed_total counter
+rabbitmq_consumed_total{name="rabbit",} 0.0
+# HELP hikaricp_connections_usage_seconds Connection usage time
+# TYPE hikaricp_connections_usage_seconds summary
+hikaricp_connections_usage_seconds_count{pool="mcadb",} 0.0
+hikaricp_connections_usage_seconds_sum{pool="mcadb",} 0.0
+# HELP kafka_consumer_sync_time_max_seconds The max time taken for a group sync.
+# TYPE kafka_consumer_sync_time_max_seconds gauge
+kafka_consumer_sync_time_max_seconds{client_id="consumer-1",} NaN
+# HELP kafka_consumer_fetch_latency_avg_seconds The average time taken for a fetch request.
+# TYPE kafka_consumer_fetch_latency_avg_seconds gauge
+kafka_consumer_fetch_latency_avg_seconds{client_id="consumer-1",} NaN
+# HELP rabbitmq_channels  
+# TYPE rabbitmq_channels gauge
+rabbitmq_channels{name="rabbit",} 0.0
+# HELP kafka_consumer_sync_rate_syncs The number of group syncs per second. Group synchronization is the second and last phase of the rebalance protocol. A large value indicates group instability.
+# TYPE kafka_consumer_sync_rate_syncs gauge
+kafka_consumer_sync_rate_syncs{client_id="consumer-1",} 0.0
+# HELP jvm_classes_loaded_classes The number of classes that are currently loaded in the Java virtual machine
+# TYPE jvm_classes_loaded_classes gauge
+jvm_classes_loaded_classes 17220.0
+# HELP jdbc_connections_min  
+# TYPE jdbc_connections_min gauge
+jdbc_connections_min{name="dataSource",} 10.0
+# HELP kafka_consumer_fetch_throttle_time_avg_seconds The average throttle time. When quotas are enabled, the broker may delay fetch requests in order to throttle a consumer which has exceeded its limit. This metric indicates how throttling time has been added to fetch requests on average.
+# TYPE kafka_consumer_fetch_throttle_time_avg_seconds gauge
+kafka_consumer_fetch_throttle_time_avg_seconds{client_id="consumer-1",} NaN
+# HELP rabbitmq_failed_to_publish_total  
+# TYPE rabbitmq_failed_to_publish_total counter
+rabbitmq_failed_to_publish_total{name="rabbit",} 0.0
+
+# HELP tomcat_sessions_active_max_sessions  
+# TYPE tomcat_sessions_active_max_sessions gauge
+tomcat_sessions_active_max_sessions 0.0
+# HELP process_cpu_usage The "recent cpu usage" for the Java Virtual Machine process
+# TYPE process_cpu_usage gauge
+process_cpu_usage 7.079390305569602E-4
+# HELP jvm_buffer_total_capacity_bytes An estimate of the total capacity of the buffers in this pool
+# TYPE jvm_buffer_total_capacity_bytes gauge
+jvm_buffer_total_capacity_bytes{id="mapped",} 0.0
+jvm_buffer_total_capacity_bytes{id="direct",} 81920.0
+# HELP kafka_consumer_fetch_throttle_time_max_seconds The maximum throttle time.
+# TYPE kafka_consumer_fetch_throttle_time_max_seconds gauge
+kafka_consumer_fetch_throttle_time_max_seconds{client_id="consumer-1",} NaN
+# HELP system_load_average_1m The sum of the number of runnable entities queued to available processors and the number of runnable entities running on the available processors averaged over a period of time
+# TYPE system_load_average_1m gauge
+system_load_average_1m 0.52
+# HELP rabbitmq_acknowledged_published_total  
+# TYPE rabbitmq_acknowledged_published_total counter
+rabbitmq_acknowledged_published_total{name="rabbit",} 0.0
+# HELP kafka_consumer_join_time_avg_seconds The average time taken for a group rejoin. This value can get as high as the configured session timeout for the consumer, but should usually be lower.
+# TYPE kafka_consumer_join_time_avg_seconds gauge
+kafka_consumer_join_time_avg_seconds{client_id="consumer-1",} NaN
+# HELP jdbc_connections_max  
+# TYPE jdbc_connections_max gauge
+jdbc_connections_max{name="dataSource",} 10.0
+# HELP kafka_consumer_assigned_partitions The number of partitions currently assigned to this consumer.
+# TYPE kafka_consumer_assigned_partitions gauge
+kafka_consumer_assigned_partitions{client_id="consumer-1",} 0.0
+# HELP tomcat_sessions_rejected_sessions_total  
+# TYPE tomcat_sessions_rejected_sessions_total counter
+tomcat_sessions_rejected_sessions_total 0.0
+
+# HELP kafka_consumer_heartbeat_response_time_max_seconds The max time taken to receive a response to a heartbeat request.
+# TYPE kafka_consumer_heartbeat_response_time_max_seconds gauge
+kafka_consumer_heartbeat_response_time_max_seconds{client_id="consumer-1",} NaN
+# HELP jvm_threads_daemon_threads The current number of live daemon threads
+# TYPE jvm_threads_daemon_threads gauge
+jvm_threads_daemon_threads 20.0
+# HELP system_cpu_count The number of processors available to the Java virtual machine
+# TYPE system_cpu_count gauge
+system_cpu_count 16.0
+# HELP jvm_buffer_count_buffers An estimate of the number of buffers in the pool
+# TYPE jvm_buffer_count_buffers gauge
+jvm_buffer_count_buffers{id="mapped",} 0.0
+jvm_buffer_count_buffers{id="direct",} 10.0
+# HELP kafka_consumer_io_wait_time_avg_seconds The average length of time the I/O thread spent waiting for a socket to be ready for reads or writes.
+# TYPE kafka_consumer_io_wait_time_avg_seconds gauge
+kafka_consumer_io_wait_time_avg_seconds{client_id="consumer-1",} 0.047184790159065626
+# HELP jvm_memory_max_bytes The maximum amount of memory in bytes that can be used for memory management
+# TYPE jvm_memory_max_bytes gauge
+jvm_memory_max_bytes{area="nonheap",id="CodeHeap 'profiled nmethods'",} 1.22028032E8
+jvm_memory_max_bytes{area="heap",id="G1 Survivor Space",} -1.0
+jvm_memory_max_bytes{area="heap",id="G1 Old Gen",} 8.331984896E9
+jvm_memory_max_bytes{area="nonheap",id="Metaspace",} -1.0
+jvm_memory_max_bytes{area="nonheap",id="CodeHeap 'non-nmethods'",} 7598080.0
+jvm_memory_max_bytes{area="heap",id="G1 Eden Space",} -1.0
+jvm_memory_max_bytes{area="nonheap",id="Compressed Class Space",} 1.073741824E9
+jvm_memory_max_bytes{area="nonheap",id="CodeHeap 'non-profiled nmethods'",} 1.22032128E8
+# HELP jvm_gc_pause_seconds Time spent in GC pause
+# TYPE jvm_gc_pause_seconds summary
+jvm_gc_pause_seconds_count{action="end of minor GC",cause="Metadata GC Threshold",} 2.0
+jvm_gc_pause_seconds_sum{action="end of minor GC",cause="Metadata GC Threshold",} 0.031
+jvm_gc_pause_seconds_count{action="end of minor GC",cause="G1 Evacuation Pause",} 1.0
+jvm_gc_pause_seconds_sum{action="end of minor GC",cause="G1 Evacuation Pause",} 0.016
+# HELP jvm_gc_pause_seconds_max Time spent in GC pause
+# TYPE jvm_gc_pause_seconds_max gauge
+jvm_gc_pause_seconds_max{action="end of minor GC",cause="Metadata GC Threshold",} 0.02
+jvm_gc_pause_seconds_max{action="end of minor GC",cause="G1 Evacuation Pause",} 0.0
+# HELP kafka_consumer_connection_count_connections The current number of active connections.
+# TYPE kafka_consumer_connection_count_connections gauge
+kafka_consumer_connection_count_connections{client_id="consumer-1",} 0.0
+# HELP jdbc_connections_active  
+# TYPE jdbc_connections_active gauge
+jdbc_connections_active{name="dataSource",} 0.0