Fix actions and ready to merge

Author: CodePrometheus

.github/workflows/main.yml

@@ -17,9 +17,12 @@
 name: Ruby
 
 on:
+  pull_request:
   push:
     branches:
       - main
+  schedule:
+    - cron: '0 18 * * *'
 
 jobs:
   build:

examples/sinatra-demo/sinatra-demo.rb

@@ -29,10 +29,4 @@
   value = redis.get("hello")
   puts "Value of 'hello': #{value}"
   "Hello #{params[:name]}!"
-end
-
-
-
-
-
-
+end

lib/skywalking_ruby/agent.rb

@@ -62,10 +62,6 @@ def started?
       def config
         @config ||= Configuration.new.agent_config
       end
-      
-      def segment_signal_ready
-        @agent&.reporter&.signal_ready
-      end
     end
 
     attr_reader :plugins, :logger, :reporter

lib/skywalking_ruby/reporter/buffer_trigger.rb

@@ -52,21 +52,20 @@ def close_queue
           @closed = true
         end
       end
-      
+
       def closed?
-        @mutex.synchronize do
-          @closed
-        end
+        @closed
       end
 
       def stream_data
-        return enum_for(:stream_data) unless block_given?
-
-        until closed?
+        begin
           segment = @buffer.pop(false)
-          unless segment.nil?
-            yield(generate_segment(segment))
-          end
+        rescue ThreadError
+          return nil
+        end
+
+        Enumerator.new do |yie|
+          yie << generate_segment(segment) unless segment.nil?
         end
       end
 

lib/skywalking_ruby/reporter/grpc.rb

@@ -41,11 +41,6 @@ def report_heartbeat
       def report_segment(enumerator)
         @trace_client.report_segment(enumerator)
       end
-
-      def shutdown
-        @ms_client.close
-        @trace_client.close
-      end
     end
   end
 end

lib/skywalking_ruby/reporter/report.rb

@@ -22,8 +22,6 @@ module Reporter
     class Report
       def initialize(config)
         @config = config
-        @mutex = Mutex.new
-        @condition = ConditionVariable.new
         init_proto
       end
 
@@ -49,19 +47,10 @@ def init_reporter
 
         @@trigger = BufferTrigger.new(@config)
         @daemon_loop << Thread.new do
-          @mutex.synchronize do
-            @condition.wait(@mutex)
-          end
           report_segment
         end
       end
-      
-      def signal_ready
-        @mutex.synchronize do
-          @condition.signal
-        end
-      end
-      
+
       def self.trigger
         @@trigger
       end
@@ -79,15 +68,14 @@ def stop
             daemon.join
           end
         end
-        @protocol.shutdown
       end
 
       def report_heartbeat
         @protocol.report_heartbeat
       end
 
       def report_segment
-        @protocol.report_segment(@@trigger.stream_data)
+        @protocol.report_segment(@@trigger.stream_data) until @@trigger.closed?
       end
     end
   end

lib/skywalking_ruby/tracing/span_context.rb

@@ -148,7 +148,6 @@ def stop?(span)
         @n_spans -= 1
         if @n_spans.zero?
           Reporter::Report.trigger << @segment
-          Agent.segment_signal_ready
           return true
         end