datawire_mdk 2.0.22 → 2.0.23

data/lib/mdk_runtime/actors.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-24 14:33:24.783025
+# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
 module Quark
 require "quark"
 def self.mdk_runtime; MdkRuntime; end

data/lib/mdk_runtime/files.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-24 14:33:24.783025
+# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
 module Quark
 require "quark"
 def self.mdk_runtime; MdkRuntime; end

data/lib/mdk_runtime/promise.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-24 14:33:24.783025
+# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
 module Quark
 require "quark"
 def self.mdk_runtime; MdkRuntime; end

data/lib/mdk_tracing.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-24 14:33:24.783025
+# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
 module Quark
 require "quark"
 def self.mdk_tracing; MdkTracing; end
@@ -7,18 +7,61 @@ require "datawire-quark-core"
 require_relative 'quark/reflect' # 0 ('quark',) ()
 require_relative 'mdk_tracing/api' # 0 ('mdk_tracing',) ()
 require_relative 'mdk_tracing/protocol' # 0 ('mdk_tracing',) ()
-require_relative 'mdk_protocol' # 0 () ()
 require_relative 'mdk_runtime/actors' # 0 ('mdk_runtime',) ()
+require_relative 'mdk_protocol' # 0 () ()
 require_relative 'quark' # 0 () ()
 require_relative 'mdk_runtime' # 0 () ()
 require_relative 'mdk_rtp' # 0 () ()
 
 
-def self.SharedContextInitializer; SharedContextInitializer; end
-class SharedContextInitializer < ::DatawireQuarkCore::QuarkObject
+def self.TracingDestination; TracingDestination; end
+##
+# MDK can use this to handle logging on the Session.
+
+class TracingDestination < ::DatawireQuarkCore::QuarkObject
+    extend ::DatawireQuarkCore::Static
+
+    static mdk_tracing_TracingDestination_ref: -> { nil }
+
+
+
+    def initialize()
+        self.__init_fields__
+
+        nil
+    end
+
+
+
+
+    ##
+    # Send a log message to the server.
+
+    def log(ctx, procUUID, level, category, text)
+        raise NotImplementedError, '`TracingDestination.log` is an abstract method'
+
+        nil
+    end
+
+    def __init_fields__()
+        
+
+        nil
+    end
+
+
+end
+TracingDestination.unlazy_statics
+
+def self.FakeTracer; FakeTracer; end
+##
+# In-memory testing of logs.
+
+class FakeTracer < ::DatawireQuarkCore::QuarkObject
+    attr_accessor :messages
     extend ::DatawireQuarkCore::Static
 
-    static mdk_tracing_SharedContextInitializer_ref: -> { nil }
+    static mdk_tracing_FakeTracer_ref: -> { nil }
 
 
 
@@ -31,22 +74,46 @@ class SharedContextInitializer < ::DatawireQuarkCore::QuarkObject
 
 
 
-    def getValue()
+    def log(ctx, procUUID, level, category, text)
+        
+        (@messages) << ({"level" => level, "category" => category, "text" => text, "context" => (ctx).traceId})
+
+        nil
+    end
+
+    def onStart(dispatcher)
+        
+        nil
+
+        nil
+    end
+
+    def onStop()
         
-        return ::DatawireQuarkCore.cast(nil) { ::Quark.mdk_protocol.SharedContext }
+        nil
+
+        nil
+    end
+
+    def onMessage(origin, message)
+        
+        nil
 
         nil
     end
 
     def _getClass()
         
-        return "mdk_tracing.SharedContextInitializer"
+        return "mdk_tracing.FakeTracer"
 
         nil
     end
 
     def _getField(name)
         
+        if ((name) == ("messages"))
+            return (self).messages
+        end
         return nil
 
         nil
@@ -54,24 +121,30 @@ class SharedContextInitializer < ::DatawireQuarkCore::QuarkObject
 
     def _setField(name, value)
         
-        nil
+        if ((name) == ("messages"))
+            (self).messages = ::DatawireQuarkCore.cast(value) { ::DatawireQuarkCore::List }
+        end
 
         nil
     end
 
     def __init_fields__()
         
+        self.messages = ::DatawireQuarkCore::List.new([])
 
         nil
     end
 
 
 end
-SharedContextInitializer.unlazy_statics
+FakeTracer.unlazy_statics
 
 def self.Tracer; Tracer; end
+##
+# Send log messages to the MCP server.
+
 class Tracer < ::DatawireQuarkCore::QuarkObject
-    attr_accessor :logger, :lastPoll, :_context, :_client, :runtime
+    attr_accessor :logger, :lastPoll, :_client, :runtime
     extend ::DatawireQuarkCore::Static
 
     static mdk_tracing_Tracer_ref: -> { nil }
@@ -133,62 +206,11 @@ class Tracer < ::DatawireQuarkCore::QuarkObject
         nil
     end
 
-    def initContext()
-        
-        @_context.setValue(::Quark.mdk_protocol.SharedContext.new())
-
-        nil
-    end
-
-    def joinContext(context)
-        
-        @_context.setValue(context.start_span())
-
-        nil
-    end
-
-    def joinEncodedContext(encodedContext)
-        
-        newContext = ::Quark.mdk_protocol.SharedContext.decode(encodedContext)
-        self.joinContext(newContext)
-
-        nil
-    end
-
-    def getContext()
-        
-        return @_context.getValue()
-
-        nil
-    end
-
-    def setContext(ctx)
-        
-        @_context.setValue(ctx)
-
-        nil
-    end
-
-    def start_span()
-        
-        @_context.setValue(self.getContext().start_span())
-
-        nil
-    end
-
-    def finish_span()
-        
-        @_context.setValue(self.getContext().finish_span())
-
-        nil
-    end
-
     ##
     # Send a log message to the server.
 
-    def log(procUUID, level, category, text)
+    def log(ctx, procUUID, level, category, text)
         
-        ctx = self.getContext()
         ctx.tick()
         @logger.trace(("CTX ") + (ctx.toString()))
         evt = ::Quark.mdk_tracing.protocol.LogEvent.new()
@@ -226,9 +248,6 @@ class Tracer < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("lastPoll"))
             return (self).lastPoll
         end
-        if ((name) == ("_context"))
-            return (self)._context
-        end
         if ((name) == ("_client"))
             return (self)._client
         end
@@ -248,9 +267,6 @@ class Tracer < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("lastPoll"))
             (self).lastPoll = ::DatawireQuarkCore.cast(value) { ::Integer }
         end
-        if ((name) == ("_context"))
-            (self)._context = ::DatawireQuarkCore.cast(value) { ::DatawireQuarkCore::TLS }
-        end
         if ((name) == ("_client"))
             (self)._client = ::DatawireQuarkCore.cast(value) { ::Quark.mdk_tracing.protocol.TracingClient }
         end
@@ -265,7 +281,6 @@ class Tracer < ::DatawireQuarkCore::QuarkObject
         
         self.logger = ::Quark.quark._getLogger("MDK Tracer")
         self.lastPoll = 0
-        self._context = ::DatawireQuarkCore::TLS.new(::Quark.mdk_tracing.SharedContextInitializer.new())
         self._client = nil
         self.runtime = nil
 

data/lib/mdk_tracing/api.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-24 14:33:24.783025
+# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
 module Quark
 require "quark"
 def self.mdk_tracing; MdkTracing; end

data/lib/mdk_tracing/protocol.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-24 14:33:24.783025
+# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
 module Quark
 require "quark"
 def self.mdk_tracing; MdkTracing; end
@@ -15,7 +15,7 @@ require_relative '../mdk_runtime/actors' # 0 ('mdk_runtime',) ('mdk_tracing',)
 
 def self.LogEvent; LogEvent; end
 class LogEvent < ::Quark.mdk_protocol.Serializable
-    attr_accessor :context, :timestamp, :node, :level, :category, :contentType, :text, :sequence, :sync
+    attr_accessor :context, :timestamp, :node, :level, :category, :contentType, :text
     extend ::DatawireQuarkCore::Static
 
     static _json_type: -> { "log" }
@@ -33,9 +33,16 @@ class LogEvent < ::Quark.mdk_protocol.Serializable
 
 
 
+    def getTimestamp()
+        
+        return (self).timestamp
+
+        nil
+    end
+
     def toString()
         
-        return (((((((((((((((("<LogEvent ") + ((@sequence).to_s)) + (" @")) + ((@timestamp).to_s)) + (" ")) + (@context.toString())) + (", ")) + (@node)) + (", ")) + (@level)) + (", ")) + (@category)) + (", ")) + (@contentType)) + (", ")) + (@text)) + (">")
+        return (((((((((((((("<LogEvent ") + ((@timestamp).to_s)) + (" ")) + (@context.toString())) + (", ")) + (@node)) + (", ")) + (@level)) + (", ")) + (@category)) + (", ")) + (@contentType)) + (", ")) + (@text)) + (">")
 
         nil
     end
@@ -73,12 +80,6 @@ class LogEvent < ::Quark.mdk_protocol.Serializable
         if ((name) == ("text"))
             return (self).text
         end
-        if ((name) == ("sequence"))
-            return (self).sequence
-        end
-        if ((name) == ("sync"))
-            return (self).sync
-        end
         return nil
 
         nil
@@ -110,12 +111,6 @@ class LogEvent < ::Quark.mdk_protocol.Serializable
         if ((name) == ("text"))
             (self).text = ::DatawireQuarkCore.cast(value) { ::String }
         end
-        if ((name) == ("sequence"))
-            (self).sequence = ::DatawireQuarkCore.cast(value) { ::Integer }
-        end
-        if ((name) == ("sync"))
-            (self).sync = ::DatawireQuarkCore.cast(value) { ::Integer }
-        end
 
         nil
     end
@@ -130,8 +125,6 @@ class LogEvent < ::Quark.mdk_protocol.Serializable
         self.category = nil
         self.contentType = nil
         self.text = nil
-        self.sequence = nil
-        self.sync = nil
 
         nil
     end
@@ -276,7 +269,7 @@ LogAck.unlazy_statics
 
 def self.TracingClient; TracingClient; end
 class TracingClient < ::DatawireQuarkCore::QuarkObject
-    attr_accessor :_tracer, :_started, :_mutex, :_handler, :_dispatcher, :_syncRequestPeriod, :_syncInFlightMax, :_buffered, :_inFlight, :_logged, :_sent, :_failedSends, :_recorded, :_lastSyncTime, :_wsclient, :_sock, :_myLog
+    attr_accessor :_tracer, :_started, :_mutex, :_handler, :_dispatcher, :_wsclient, :_sock, :_sendWithAcks
     extend ::DatawireQuarkCore::Static
 
     static mdk_tracing_protocol_TracingClient_ref: -> { nil }
@@ -288,6 +281,7 @@ class TracingClient < ::DatawireQuarkCore::QuarkObject
         self.__init_fields__
         @_tracer = tracer
         @_wsclient = wsclient
+        @_sendWithAcks = ::Quark.mdk_protocol.SendWithAcks.new()
         wsclient.subscribe(self)
 
         nil
@@ -296,14 +290,6 @@ class TracingClient < ::DatawireQuarkCore::QuarkObject
 
 
 
-    def _debug(message)
-        
-        s = (((("[") + (((@_buffered).size).to_s)) + (" buf, ")) + (((@_inFlight).size).to_s)) + (" inf] ")
-        @_myLog.debug((s) + (message))
-
-        nil
-    end
-
     ##
     # Attach a subscriber that will receive results of queries.
 
@@ -341,13 +327,7 @@ class TracingClient < ::DatawireQuarkCore::QuarkObject
         
         @_mutex.acquire()
         (self)._sock = websock
-        while (((@_inFlight).size) > (0)) do
-            evt = (@_inFlight).delete_at(((@_inFlight).size) - (1))
-            (@_buffered).insert((0), (evt))
-            @_failedSends = (@_failedSends) + ((1))
-            self._debug(("no ack for #") + (((evt).sequence).to_s))
-        end
-        self._debug(("Starting up! with connection ") + (((self)._sock).to_s))
+        (self)._sendWithAcks.onConnected(self, (self)._dispatcher, websock)
         if ((@_handler) != (nil))
             (self)._dispatcher.tell(self, ::Quark.mdk_tracing.protocol.Subscribe.new().encode(), (self)._sock)
         end
@@ -359,20 +339,7 @@ class TracingClient < ::DatawireQuarkCore::QuarkObject
     def onPump()
         
         @_mutex.acquire()
-        while (((@_buffered).size) > (0)) do
-            debugSuffix = ""
-            evt = (@_buffered).delete_at(0)
-            (@_inFlight) << (evt)
-            if ((((evt).timestamp) > ((@_lastSyncTime) + (@_syncRequestPeriod))) || (((@_inFlight).size) == (@_syncInFlightMax)))
-                (evt).sync = 1
-                @_lastSyncTime = (evt).timestamp
-                debugSuffix = " with sync set"
-            end
-            (self)._dispatcher.tell(self, evt.encode(), (self)._sock)
-            (evt).sync = 0
-            @_sent = (@_sent) + ((1))
-            self._debug((((("sent #") + (((evt).sequence).to_s)) + (debugSuffix)) + (" to ")) + (((self)._sock).to_s))
-        end
+        (self)._sendWithAcks.onPump(self, (self)._dispatcher, (self)._sock)
         @_mutex.release()
 
         nil
@@ -409,15 +376,7 @@ class TracingClient < ::DatawireQuarkCore::QuarkObject
     def onLogAck(ack)
         
         @_mutex.acquire()
-        while (((@_inFlight).size) > (0)) do
-            if ((((@_inFlight)[0]).sequence) <= ((ack).sequence))
-                evt = (@_inFlight).delete_at(0)
-                @_recorded = (@_recorded) + ((1))
-                self._debug(((("ack #") + (((ack).sequence).to_s)) + (", discarding #")) + (((evt).sequence).to_s))
-            else
-                break
-            end
-        end
+        (self)._sendWithAcks.onAck((ack).sequence)
         @_mutex.release()
 
         nil
@@ -429,11 +388,7 @@ class TracingClient < ::DatawireQuarkCore::QuarkObject
     def log(evt)
         
         @_mutex.acquire()
-        (evt).sequence = @_logged
-        (evt).sync = 0
-        @_logged = (@_logged) + ((1))
-        (@_buffered) << (evt)
-        self._debug(("logged #") + (((evt).sequence).to_s))
+        (self)._sendWithAcks.send(::Quark.mdk_tracing.protocol.LogEvent._json_type, evt)
         @_mutex.release()
 
         nil
@@ -463,41 +418,14 @@ class TracingClient < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("_dispatcher"))
             return (self)._dispatcher
         end
-        if ((name) == ("_syncRequestPeriod"))
-            return (self)._syncRequestPeriod
-        end
-        if ((name) == ("_syncInFlightMax"))
-            return (self)._syncInFlightMax
-        end
-        if ((name) == ("_buffered"))
-            return (self)._buffered
-        end
-        if ((name) == ("_inFlight"))
-            return (self)._inFlight
-        end
-        if ((name) == ("_logged"))
-            return (self)._logged
-        end
-        if ((name) == ("_sent"))
-            return (self)._sent
-        end
-        if ((name) == ("_failedSends"))
-            return (self)._failedSends
-        end
-        if ((name) == ("_recorded"))
-            return (self)._recorded
-        end
-        if ((name) == ("_lastSyncTime"))
-            return (self)._lastSyncTime
-        end
         if ((name) == ("_wsclient"))
             return (self)._wsclient
         end
         if ((name) == ("_sock"))
             return (self)._sock
         end
-        if ((name) == ("_myLog"))
-            return (self)._myLog
+        if ((name) == ("_sendWithAcks"))
+            return (self)._sendWithAcks
         end
         return nil
 
@@ -521,41 +449,14 @@ class TracingClient < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("_dispatcher"))
             (self)._dispatcher = ::DatawireQuarkCore.cast(value) { ::Quark.mdk_runtime.actors.MessageDispatcher }
         end
-        if ((name) == ("_syncRequestPeriod"))
-            (self)._syncRequestPeriod = ::DatawireQuarkCore.cast(value) { ::Integer }
-        end
-        if ((name) == ("_syncInFlightMax"))
-            (self)._syncInFlightMax = ::DatawireQuarkCore.cast(value) { ::Integer }
-        end
-        if ((name) == ("_buffered"))
-            (self)._buffered = ::DatawireQuarkCore.cast(value) { ::DatawireQuarkCore::List }
-        end
-        if ((name) == ("_inFlight"))
-            (self)._inFlight = ::DatawireQuarkCore.cast(value) { ::DatawireQuarkCore::List }
-        end
-        if ((name) == ("_logged"))
-            (self)._logged = ::DatawireQuarkCore.cast(value) { ::Integer }
-        end
-        if ((name) == ("_sent"))
-            (self)._sent = ::DatawireQuarkCore.cast(value) { ::Integer }
-        end
-        if ((name) == ("_failedSends"))
-            (self)._failedSends = ::DatawireQuarkCore.cast(value) { ::Integer }
-        end
-        if ((name) == ("_recorded"))
-            (self)._recorded = ::DatawireQuarkCore.cast(value) { ::Integer }
-        end
-        if ((name) == ("_lastSyncTime"))
-            (self)._lastSyncTime = ::DatawireQuarkCore.cast(value) { ::Integer }
-        end
         if ((name) == ("_wsclient"))
             (self)._wsclient = ::DatawireQuarkCore.cast(value) { ::Quark.mdk_protocol.WSClient }
         end
         if ((name) == ("_sock"))
             (self)._sock = ::DatawireQuarkCore.cast(value) { ::Quark.mdk_runtime.actors.Actor }
         end
-        if ((name) == ("_myLog"))
-            (self)._myLog = value
+        if ((name) == ("_sendWithAcks"))
+            (self)._sendWithAcks = ::DatawireQuarkCore.cast(value) { ::Quark.mdk_protocol.SendWithAcks }
         end
 
         nil
@@ -568,18 +469,9 @@ class TracingClient < ::DatawireQuarkCore::QuarkObject
         self._mutex = ::DatawireQuarkCore::Lock.new()
         self._handler = nil
         self._dispatcher = nil
-        self._syncRequestPeriod = 5000
-        self._syncInFlightMax = 50
-        self._buffered = ::DatawireQuarkCore::List.new([])
-        self._inFlight = ::DatawireQuarkCore::List.new([])
-        self._logged = 0
-        self._sent = 0
-        self._failedSends = 0
-        self._recorded = 0
-        self._lastSyncTime = 0
         self._wsclient = nil
         self._sock = nil
-        self._myLog = ::Quark.quark._getLogger("TracingClient")
+        self._sendWithAcks = nil
 
         nil
     end