cpee-logging-xes-yaml 1.3.21 → 1.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 781e1920d2f1c740b9266c8b6c16e8f6deb515abd8496bc2e235b3f0016790b6
-  data.tar.gz: e17203546cdc764602584353ae8bffdf66b85040e0928a18b8467571b0c10475
+  metadata.gz: '0826aa750d298fd8ec36f2e650295d8584d5861b9db5f9043ce7aa4bdd211f95'
+  data.tar.gz: 949622e3a7b0c311d6f3c959c7cf3e702c010d09730801b60436cbd9f3840e60
 SHA512:
-  metadata.gz: e94e0a10e89ea868f533fa5186596bab4ba448bea86e6efeb5fa33f08df4fcff5f94aafbb5d95eb850c803b696f4c21222e1a1fefd69151d2488bfd1573faa68
-  data.tar.gz: 3578abef72c8f7eef3b3874a31bf1f70b89429beeab58509b10f8a8b66bc35bf954d086b2fbe89d09fbeb67ad0efb8ce134e01394f07baea428ee603f0c1dbe0
+  metadata.gz: e193a45610da57a8384a4e7efc9611b68e6f5280f7ffdbf03f2a0e4ea726f261c7ba5cc8d291b49a4e80e783e1f3e9a8805b9288e368fcd6d47861de1ec4fc0f
+  data.tar.gz: e9e0a9b52b398c87872f4a692ae42440e6eea1c265603c5d48f5776288a13a0af4148fa5dbf01d8cc7be6a557846045c0333e00fa163ce83d6a27b9ed741487a

data/cpee-logging-xes-yaml.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-logging-xes-yaml"
-  s.version          = "1.3.21"
+  s.version          = "1.3.23"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Logging for the cloud process execution engine (cpee.org)"

data/lib/cpee-logging-xes-yaml/tools.rb

@@ -76,6 +76,7 @@ end
 module CPEE
   module Logging
 
+    # Forward event to subscriptions
     def self::notify(opts,topic,event_name,payload)
       opts[:subscriptions].each do |e,urls|
         if e == topic + '/' + event_name
@@ -92,7 +93,7 @@ module CPEE
       end
     end
 
-    def self::val_merge(target,val,tid,tso)
+    def self::merge_val(target,val,tid,tso)
       if val.is_a? Stream
         val.source = tso if val.source.nil?
         target.push *val.to_list
@@ -114,7 +115,7 @@ module CPEE
     def self::extract_probes(where,xml)
       XML::Smart::string(xml) do |doc|
         doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
-        doc.find('//d:call').each do |c|
+        doc.find('//d:call | //d:manipulate').each do |c|
           File.unlink(where + '_' + c.attributes['id'] + '.probe') rescue nil
           c.find('d:annotations/d:_context_data_analysis/d:probes[d:probe]').each do |p|
             File.write(where + '_' + c.attributes['id'] + '.probe', p.dump)
@@ -122,14 +123,15 @@ module CPEE
         end
       end
     end
+
     def self::extract_annotations(where,xml)
       ret = {}
       XML::Smart::string(xml) do |doc|
         doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
-        doc.find('/d:description | //d:call').each do |c|
-          tid = c.attributes['id'] || 'start'
+        doc.find('/d:description | //d:call | //d:manipulate').each do |c|
+          tid = c.attributes['id'] || 'complex'
           fname = where + '_' + tid + '.anno'
-          nset = if tid == 'start'
+          nset = if tid == 'complex'
             c.find('d:*[starts-with(name(),"_")]')
           else
             c.find('d:annotations')
@@ -143,7 +145,7 @@ module CPEE
             if ret[tid].length > 1
               ret[tid] = "<annotations xmlns=\"http://cpee.org/ns/description/1.0\">\n" +
                 ret[tid].join("\n") + "\n" +
-                "</annotations>"
+                '</annotations>'
             else
               ret[tid] = ret[tid][0]
             end
@@ -169,7 +171,7 @@ module CPEE
           YAML::load(res['data']) rescue nil
         elsif res['mimetype'] == 'text/plain'
           t = res['data']
-          if t.start_with?("<?xml version=")
+          if t.start_with?('<?xml version=')
             t = XML::Smart::string(t)
           else
             t = t.to_f if t == t.to_f.to_s
@@ -188,7 +190,7 @@ module CPEE
       ret.length == 1 ? ret[0] : ret
     end
 
-    def self::extract_sensor(rs,code,pid,result)
+    def self::extract_val(rs,code,pid,result)
       rs.instance_eval(code,'probe',1)
     rescue => e
       e.backtrace[0].gsub(/(\w+):(\d+):in.*/,'Probe ' + pid + ' Line \2: ') + e.message
@@ -257,60 +259,68 @@ module CPEE
       end
 
       event = {}
-      event["concept:instance"] = instancenr
-      event["concept:name"] = content["label"] if content["label"]
-      if content["endpoint"]
-        event["concept:endpoint"] = content["endpoint"]
+      event['concept:instance'] = instancenr
+      event['concept:name'] = content['label'] if content['label']
+      if content['endpoint']
+        event['concept:endpoint'] = content['endpoint']
       end
-      event["id:id"] = (activity.nil? || activity == "") ? 'external' : activity
-      event["cpee:activity"] = event["id:id"]
-      event["cpee:activity_uuid"] = content['activity-uuid'] if content['activity-uuid']
-      event["cpee:instance"] = instance
+      event['id:id'] = (activity.nil? || activity == '') ? 'external' : activity
+      event['cpee:activity'] = event['id:id']
+      event['cpee:activity_uuid'] = content['activity-uuid'] if content['activity-uuid']
+      event['cpee:instance'] = instance
       case event_name
         when 'calling'
-          event["lifecycle:transition"] = "start"
+          event['lifecycle:transition'] = 'start'
         when 'done'
-          event["lifecycle:transition"] = "complete"
+          event['lifecycle:transition'] = 'complete'
         else
-          event["lifecycle:transition"] = "unknown"
+          event['lifecycle:transition'] = 'unknown'
       end
-      event["cpee:lifecycle:transition"] = "#{topic}/#{event_name}"
-      event["cpee:state"] = content['state'] if content['state']
-      event["cpee:description"] = content['dslx'] if content['dslx']
-      event["cpee:change_uuid"] = content['change_uuid'] if content['change_uuid']
-      event["cpee:exposition"] = content['exposition'] if content['exposition']
-      unless parameters["arguments"]&.nil?
-        event["data"] = parameters["arguments"]
+      event['cpee:lifecycle:transition'] = "#{topic}/#{event_name}"
+      event['cpee:state'] = content['state'] if content['state']
+      event['cpee:description'] = content['dslx'] if content['dslx']
+      event['cpee:change_uuid'] = content['change_uuid'] if content['change_uuid']
+      event['cpee:exposition'] = content['exposition'] if content['exposition']
+      unless parameters['arguments']&.nil?
+        event['data'] = parameters['arguments']
       end if parameters
       if content['changed']&.any?
-        event["data"] = content['values'].map do |k,v|
+        event['data'] = content['values'].map do |k,v|
           { 'name' => k, 'value' => v }
         end
 
-        fname = File.join(log_dir,instance + '_' + event["id:id"] + '.probe')
+        fname = File.join(log_dir,instance + '_' + event['id:id'] + '.probe')
         dname = File.join(log_dir,instance + '.data.json')
 
+        # Handle intrinsic data probes
         if File.exist?(fname)
           rs = WEEL::ReadStructure.new(File.exist?(dname) ? JSON::load(File::open(dname)) : {},{},{},{})
           XML::Smart::open_unprotected(fname) do |doc|
             doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
             doc.find('//d:probe[d:extractor_type="intrinsic"]').each do |p|
-              pid = p.find('string(d:id)')
+              pid    = p.find('string(d:id)')
+              source = p.find('string(d:source)')
+              val = CPEE::Logging::extract_val(rs,p.find('string(d:extractor_code)'),pid,nil) rescue nil
               event['stream:datastream'] ||= []
-              val = CPEE::Logging::extract_sensor(rs,p.find('string(d:extractor_code)'),pid,nil) rescue nil
-              CPEE::Logging::val_merge(event['stream:datastream'],val,pid,p.find('string(d:source)'))
+              # Do not add datastream entries if the dataprobes return nil
+              if val != nil
+                CPEE::Logging::merge_val(event['stream:datastream'],val,pid,source)
+              end
             end
           end
-          notification['datastream'] = event['stream:datastream']
-          EM.defer do
-            notification['topic'] = 'stream'
-            notification['name'] = 'extraction'
-            self::notify(opts,'stream','extraction',notification.to_json)
+          if event['stream:datastream'] && event['stream:datastream'].any?
+            notification['datastream'] = event['stream:datastream']
+            EM.defer do
+              notification['topic'] = 'stream'
+              notification['name'] = 'extraction'
+              self::notify(opts,'stream','extraction',notification.to_json)
+            end
           end
         end
       end
+      # Handle extrinsic data probes
       if topic == 'activity' && event_name == 'receiving' && receiving && !receiving.empty?
-        fname = File.join(log_dir,instance + '_' + event["id:id"] + '.probe')
+        fname = File.join(log_dir,instance + '_' + event['id:id'] + '.probe')
         dname = File.join(log_dir,instance + '.data.json')
 
         if File.exist?(fname)
@@ -324,13 +334,16 @@ module CPEE
               doc.find('//d:probe[d:extractor_type="extrinsic"]').each do |p|
                 pid = p.find('string(d:id)')
                 te['stream:datastream'] ||= []
-                val = CPEE::Logging::extract_sensor(rs,p.find('string(d:extractor_code)'),pid,rc) rescue nil
-                CPEE::Logging::val_merge(te['stream:datastream'],val,pid,p.find('string(d:source)'))
+                val = CPEE::Logging::extract_val(rs,p.find('string(d:extractor_code)'),pid,rc) rescue nil
+                if not val.nil?
+                  # Do not add datastream entries if the dataprobes return nil
+                  CPEE::Logging::merge_val(te['stream:datastream'],val,pid,p.find('string(d:source)'))
+                end
               end
             end
           end
-          if te['stream:datastream']
-            te["cpee:lifecycle:transition"] = "stream/data"
+          if te['stream:datastream'] && te['stream:datastream'].any? 
+            te['cpee:lifecycle:transition'] = 'stream/data'
             File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
               f << {'event' => te}.to_yaml
             end
@@ -344,9 +357,12 @@ module CPEE
         end
       end
       if receiving && !receiving.empty?
-        event["data"] = receiving
+        event['data'] = receiving
+      end
+      if content['data'] && !content['data'].empty?
+        event['data'] = content['data']
       end
-      event["time:timestamp"]= notification['timestamp'] || Time.now.xmlschema(4)
+      event['time:timestamp']= notification['timestamp'] || Time.now.xmlschema(4)
       File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
         f << {'event' => event}.to_yaml
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-logging-xes-yaml
 version: !ruby/object:Gem::Version
-  version: 1.3.21
+  version: 1.3.23
 platform: ruby
 authors:
 - Juergen eTM Mangler