etna 0.1.36 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6d9abd6b64884e701b1055215018b85939ee0bf6cc19275eccae0ebffe92856
-  data.tar.gz: a382140c854224855b317923551d467baa3b29202ec6ebccc2fb8d7782115d06
+  metadata.gz: 484c950fffbafcf5132df923bc0ef88a79faa6c285ccde653805aac526e4a97e
+  data.tar.gz: f513b75b048e816acc494c09cb0eccbc2c38cda02c2723266fe7bd98c8595f3a
 SHA512:
-  metadata.gz: e150a0e7dac99e3c637151033d4105617910188f9c61c8e2812b2fa75c3d3967e95bb2fa43babb98802b14640658e02167c81b825fa0e1be41cef6340a74d4fa
-  data.tar.gz: 6f7365324ceed077161b4507397380837cc0d355f6cbd4dfff22b2abb527eaeafc2455e3cb3138d7b9a8085d3b4a2b3cf05b86417f2458a9bc80da859c77ed24
+  metadata.gz: 6ad0e99925dc6110c8f80f4a1e1417d610b28838497f09afe8be1c69a65fec95a7d549af987aaccde2b42480347bf336838be5398ef580d3024476206b4d611d
+  data.tar.gz: 44eb05596c635e7ab96df7971fed6b24bfee7bd545238e173e3d1b57bdcfe7b30db5deea355d2711b192d026d8fb72afc32cbcbcf4a83ef92848184433b7a813

data/lib/etna.rb

@@ -21,6 +21,7 @@ require_relative './etna/environment_scoped'
 require_relative './etna/filesystem'
 require_relative './etna/formatting'
 require_relative './etna/cwl'
+require_relative './etna/metrics'
 
 class EtnaApp
   include Etna::Application

data/lib/etna/application.rb

@@ -8,6 +8,7 @@ require_relative './command'
 require_relative './generate_autocompletion_script'
 require 'singleton'
 require 'rollbar'
+require 'fileutils'
 
 module Etna::Application
   def self.included(other)
@@ -59,6 +60,23 @@ module Etna::Application
     end
   end
 
+  def setup_yabeda
+    Yabeda.configure!
+  end
+
+  def write_job_metrics(name)
+    node_metrics_dir = config(:node_metrics_dir) || "/tmp/metrics.prom"
+    ::FileUtils.mkdir_p(node_metrics_dir)
+
+    tmp_file = ::File.join(node_metrics_dir, "#{name}.prom.$$")
+    ::File.open(tmp_file, "w") do |f|
+      f.write(Prometheus::Client::Formats::Text.marshal(Prometheus::Client.registry))
+    end
+
+    require 'fileutils'
+    ::FileUtils.mv(tmp_file, ::File.join(node_metrics_dir, "#{name}.prom"))
+  end
+
   def setup_logger
     @logger = Etna::Logger.new(
       # The name of the log_file, required.

data/lib/etna/directed_graph.rb

@@ -52,7 +52,12 @@ class DirectedGraph
             result[grandparent] << child_node if result.include?(grandparent)
           end
 
-          result[child_node] = []
+          # Depending on the graph shape, diamonds could lead to
+          #   resetting of previously calculated dependencies.
+          # Here we avoid resetting existing entries in `result`
+          #   and instead concatenate them if they already exist.
+          result[child_node] = [] unless result.include?(child_node)
+          result[n].concat(result[child_node]) if result.include?(child_node) && result.include?(n)
         end
       end
 

data/lib/etna/metrics.rb

@@ -0,0 +1,26 @@
+
+module Etna
+  class MetricsExporter
+    def initialize(app, path: '/metrics')
+      @app = app
+      @path = path
+    end
+
+    def exporter
+      @exporter ||= begin
+        exporter = Yabeda::Prometheus::Exporter.new(@app, path: @path)
+        Rack::Auth::Basic.new(exporter) do |user, pw|
+          user == 'prometheus' && pw == ENV['METRICS_PW']
+        end
+      end
+    end
+
+    def call(env)
+      if env['PATH_INFO'] == @path
+        exporter.call(env)
+      else
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/etna/route.rb

@@ -148,7 +148,10 @@ module Etna
       params = request.env['rack.request.params']
 
       @auth[:user].all? do |constraint, param_name|
-        user.respond_to?(constraint) && user.send(constraint, params[param_name])
+        user.respond_to?(constraint) && (
+          param_name.is_a?(Symbol) ?
+            user.send(constraint, params[param_name]) :
+            user.send(constraint, param_name))
       end
     end
 

data/lib/etna/server.rb

@@ -74,6 +74,11 @@ module Etna
     def initialize
       # Setup logging.
       application.setup_logger
+
+      # This needs to be required before yabeda invocation, but cannot belong at the top of any module since clients
+      # do not install yabeda.
+      require 'yabeda'
+      application.setup_yabeda
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etna
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
 platform: ruby
 authors:
 - Saurabh Asthana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -168,6 +168,7 @@ files:
 - lib/etna/hmac.rb
 - lib/etna/json_serializable_struct.rb
 - lib/etna/logger.rb
+- lib/etna/metrics.rb
 - lib/etna/multipart_serializable_nested_hash.rb
 - lib/etna/parse_body.rb
 - lib/etna/route.rb