update metrics

Author: CodePrometheus

Gemfile

@@ -17,4 +17,8 @@ source 'https://rubygems.org'
 
 gemspec name: 'skywalking'
 
-ruby ">= 3.0.0"
+ruby ">= 3.0.0"
+
+# Optional dependencies for enhanced performance
+# Uncomment the following line to enable FFI for better system call performance
+# gem 'ffi', '~> 1.17'

docs/en/agent/meter-log-reporter.md

@@ -10,28 +10,30 @@ The agent automatically collects Ruby runtime metrics when `meter_reporter_activ
 
 **CPU Metrics:**
 
-- `instance_ruby_cpu_usage_percent` - Ruby process CPU usage percentage (based on load average)
+- `instance_ruby_cpu_usage_percent` - Ruby process CPU usage percentage
 
 **Memory Metrics:**
 
 - `instance_ruby_memory_rss_mb` - Ruby process RSS memory usage in MB
+- `instance_ruby_memory_usage_percent` - Ruby process memory usage percentage
 
 **Garbage Collection Metrics:**
 
 - `instance_ruby_gc_count_total` - Total GC execution count
 - `instance_ruby_gc_minor_count_total` - Minor GC count (if available)
 - `instance_ruby_gc_major_count_total` - Major GC count (if available)
+- `instance_ruby_gc_time_total` - Total GC time in milliseconds (cumulative)
 - `instance_ruby_heap_usage_percent` - Heap memory usage percentage
 - `instance_ruby_heap_live_slots_count` - Number of live heap slots
-- `instance_ruby_heap_allocated_slots_count` - Number of allocated heap slots
 
 **Object System Metrics:**
 
 - `instance_ruby_total_allocated_objects` - Total allocated objects count
 
 **Thread Metrics:**
 
-- `instance_ruby_thread_count_active` - Number of active threads
+- `instance_ruby_thread_count_active` - Number of active threads (all alive threads)
+- `instance_ruby_thread_count_running` - Number of threads in running state
 
 ### Log Integration
 

docs/en/setup/quick-start.md

@@ -140,7 +140,7 @@ The following lists all the configuration options:
 | properties_report_period_factor | SW_AGENT_PROPERTIES_REPORT_PERIOD_FACTOR | 10                   | The agent will report service instance properties every `collector_heartbeat_period * properties_report_period_factor` seconds.           |
 | max_queue_size                  | SW_AGENT_MAX_QUEUE_SIZE                  | 10000                | The maximum queue size for reporting data.                                                                                                |
 | meter_reporter_active           | SW_AGENT_METER_REPORTER_ACTIVE           | true                 | Enable/disable meter reporter for runtime metrics collection.                                                                             |
-| meter_report_period             | SW_AGENT_METER_REPORT_PERIOD             | 20                   | Meter report period in seconds.                                                                                                           |
+| meter_report_period             | SW_AGENT_METER_REPORT_PERIOD             | 60                   | Meter report period in seconds.                                                                                                           |
 | max_meter_queue_size            | SW_AGENT_MAX_METER_QUEUE_SIZE            | 1000                 | Maximum meter queue size for buffering metrics data.                                                                                      |
 | log_reporter_active             | SW_AGENT_LOG_REPORTER_ACTIVE             | true                 | Enable/disable log reporter for log collection.                                                                                           |
 | log_reporter_level              | SW_AGENT_LOG_REPORTER_LEVEL              | 1 (INFO)             | Minimum log level to report (Logger::DEBUG=0, INFO=1, WARN=2, ERROR=3, FATAL=4).                                                          |

lib/skywalking/agent.rb

@@ -63,7 +63,7 @@ def started?
       end
 
       attr_reader :logger, :agent_config
-      
+
       # Get the singleton instance
       # @return [Agent, nil] the agent instance or nil if not started
       def instance
@@ -120,7 +120,7 @@ def start_log_reporting_thread
       Thread.new do
         loop do
           break unless log_reporter_active?
-          
+
           process_log_queue
           sleep @config[:log_report_period]
         end
@@ -132,13 +132,13 @@ def process_log_queue
       log_count = 0
       enumerator = Enumerator.new do |yielder|
         while (log_data = log_buffer.stream_data)
-          log_data.each do |data| 
+          log_data.each do |data|
             log_count += 1
-            yielder << data 
+            yielder << data
           end
         end
       end
-      
+
       enumerator.each_slice(10) do |batch|
         begin
           reporter.report_log(batch)

lib/skywalking/configuration.rb

@@ -112,7 +112,7 @@ class Configuration
       },
       :meter_report_period => {
         type: :int,
-        default: 20,
+        default: 60,
         desc: 'Meter report period in seconds'
       },
       :max_meter_queue_size => {
@@ -213,18 +213,18 @@ def override_config_by_env
         next if env_value.nil?
 
         type = env_schema[:type]
-        case type
-        when :string
-          new_config[env_key] = env_value.to_s
-        when :bool
-          # rubocop:disable Performance/CollectionLiteralInLoop
-          new_config[env_key] = !%w[0 false].include?(env_value.strip.downcase)
-          # rubocop:enable Performance/CollectionLiteralInLoop
-        when :int
-          new_config[env_key] = env_value.to_i
-        else
-          env_value
-        end
+        new_config[env_key] = case type
+                              when :string
+                                env_value.to_s
+                              when :bool
+                                # rubocop:disable Performance/CollectionLiteralInLoop
+                                !%w[0 false].include?(env_value.strip.downcase)
+                              # rubocop:enable Performance/CollectionLiteralInLoop
+                              when :int
+                                env_value.to_i
+                              else
+                                env_value
+                              end
       end
 
       new_config

lib/skywalking/environment.rb

@@ -37,7 +37,7 @@ def app_name
       rescue
         nil
       end
-      
+
       def env
         ::Rails.env
       end
@@ -63,7 +63,7 @@ def app_name
       rescue
         "Sinatra"
       end
-      
+
       def env
         ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
       end
@@ -81,7 +81,7 @@ def present?
       def app_name
         "Ruby"
       end
-      
+
       def env
         ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
       end
@@ -111,7 +111,7 @@ def framework_root
                             "."
                           end
     end
-    
+
     def framework_env
       @framework_env ||= framework_info.env
     end

lib/skywalking/meter/meter_service.rb

@@ -61,8 +61,8 @@ def stop
       private
 
       def run_collection_loop
-        period = @config[:meter_report_period] || 20
-        
+        period = @config[:meter_report_period]
+
         while @running
           begin
             collect_and_queue_metrics

lib/skywalking/meter/runtime/cpu_data_source.rb

@@ -13,27 +13,43 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-require 'sys/cpu'
 require_relative '../base'
 
 module Skywalking
   module Meter
     module Runtime
-      # DataSource for collecting CPU usage metrics
+      # DataSource for collecting Ruby process CPU usage metrics
       class CpuDataSource < DataSource
         def initialize
-          @cpu_count = Sys::CPU.num_cpu || 1
+          @last_cpu_time = Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID)
+          @last_wall_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         end
-        
-        # Return current process CPU utilization percentage
+
+        # Ruby process CPU usage percentage
         def cpu_usage_percent_generator
-          # Use Sys::CPU load average as a simple metric
-          # This is similar to how Python's psutil works
-          load_avg = Sys::CPU.load_avg[0] # 1-minute load average
-          load_avg * 100.0 / @cpu_count
-          
-        rescue
-          0.0
+          begin
+            current_cpu_time = Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID)
+            current_wall_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+            cpu_time_diff = current_cpu_time - @last_cpu_time
+            wall_time_diff = current_wall_time - @last_wall_time
+
+            # Calculate CPU usage as percentage of wall time
+            if wall_time_diff > 0
+              cpu_usage = (cpu_time_diff / wall_time_diff) * 100.0
+              cpu_usage = [cpu_usage, 0.0].max
+            else
+              cpu_usage = 0.0
+            end
+
+            # Update last values for next calculation
+            @last_cpu_time = current_cpu_time
+            @last_wall_time = current_wall_time
+
+            cpu_usage
+          rescue
+            0.0
+          end
         end
       end
     end

lib/skywalking/meter/runtime/gc_data_source.rb

@@ -20,30 +20,48 @@ module Meter
     module Runtime
       # DataSource for collecting GC metrics
       class GcDataSource < DataSource
+        def initialize
+          @cached_stats = nil
+          @cached_count = nil
+          @cache_time = 0
+          @cache_duration = 60
+        end
+
         # Total GC count
         def gc_count_total_generator
-          GC.count
+          get_gc_data
+          @cached_count || 0
         rescue
           0
         end
-        
+
         # Minor GC count (if available)
         def gc_minor_count_total_generator
-          GC.stat[:minor_gc_count] || 0
+          stats = get_gc_stats
+          stats[:minor_gc_count] || 0
         rescue
           0
         end
-        
+
         # Major GC count (if available)
         def gc_major_count_total_generator
-          GC.stat[:major_gc_count] || 0
+          stats = get_gc_stats
+          stats[:major_gc_count] || 0
+        rescue
+          0
+        end
+
+        # GC total time
+        def gc_time_total_generator
+          stats = get_gc_stats
+          stats[:time] || 0
         rescue
           0
         end
 
         # Heap usage percentage
         def heap_usage_percent_generator
-          stats = GC.stat
+          stats = get_gc_stats
           if stats[:heap_available_slots] && stats[:heap_available_slots] > 0
             (stats[:heap_live_slots].to_f / stats[:heap_available_slots] * 100)
           else
@@ -52,6 +70,29 @@ def heap_usage_percent_generator
         rescue
           0.0
         end
+
+        private
+
+        # Get cached GC statistics, refresh if cache is expired
+        def get_gc_stats
+          current_time = Time.now.to_i
+          if @cached_stats.nil? || (current_time - @cache_time) > @cache_duration
+            @cached_stats = GC.stat
+            @cache_time = current_time
+          end
+          @cached_stats
+        end
+
+        # Get both GC.count and GC.stat data, refresh if cache is expired
+        def get_gc_data
+          current_time = Time.now.to_i
+          if @cached_stats.nil? || (current_time - @cache_time) > @cache_duration
+            @cached_stats = GC.stat
+            @cached_count = GC.count
+            @cache_time = current_time
+          end
+          @cached_stats
+        end
       end
     end
   end