etna 0.1.46 → 0.1.48

data/lib/etna/controller.rb

@@ -133,7 +133,7 @@ MESSAGE_END
     end
 
     def config_hosts
-      [:janus, :magma, :timur, :metis, :vulcan, :polyphemus].map do |host|
+      [:janus, :magma, :timur, :metis, :vulcan, :polyphemus, :gnomon].map do |host|
         [ :"#{host}_host", @server.send(:application).config(host)&.dig(:host) ]
       end.to_h.compact
     end

data/lib/etna/filesystem.rb

@@ -14,45 +14,48 @@ module Etna
       ::File.open(dest, opts, &block)
     end
 
+    class Error < StandardError
+    end
+
     def ls(dir)
-      raise "ls not supported by #{self.class.name}" unless self.class == Filesystem
+      raise Etna::Filesystem::Error, "ls not supported by #{self.class.name}" unless self.class == Filesystem
       ::Dir.entries(dir).select { |p| !p.start_with?('.') }.map do |path|
         ::File.file?(::File.join(dir, path)) ? [:file, path] : [:dir, path]
       end
     end
 
     def with_readable(src, opts = 'r', &block)
-      raise "with_readable not supported by #{self.class.name}" unless self.class == Filesystem
+      raise Etna::Filesystem::Error, "with_readable not supported by #{self.class.name}" unless self.class == Filesystem
       ::File.open(src, opts, &block)
     end
 
     def mkdir_p(dir)
-      raise "mkdir_p not supported by #{self.class.name}" unless self.class == Filesystem
+      raise Etna::Filesystem::Error, "mkdir_p not supported by #{self.class.name}" unless self.class == Filesystem
       ::FileUtils.mkdir_p(dir)
     end
 
     def rm_rf(dir)
-      raise "rm_rf not supported by #{self.class.name}" unless self.class == Filesystem
+      raise Etna::Filesystem::Error, "rm_rf not supported by #{self.class.name}" unless self.class == Filesystem
       ::FileUtils.rm_rf(dir)
     end
 
     def tmpdir
-      raise "tmpdir not supported by #{self.class.name}" unless self.class == Filesystem
+      raise Etna::Filesystem::Error, "tmpdir not supported by #{self.class.name}" unless self.class == Filesystem
       ::Dir.mktmpdir
     end
 
     def exist?(src)
-      raise "exist? not supported by #{self.class.name}" unless self.class == Filesystem
+      raise Etna::Filesystem::Error, "exist? not supported by #{self.class.name}" unless self.class == Filesystem
       ::File.exist?(src)
     end
 
     def mv(src, dest)
-      raise "mv not supported by #{self.class.name}" unless self.class == Filesystem
+      raise Etna::Filesystem::Error, "mv not supported by #{self.class.name}" unless self.class == Filesystem
       ::FileUtils.mv(src, dest)
     end
 
     def stat(src)
-      raise "stat not supported by #{self.class.name}" unless self.class == Filesystem
+      raise Etna::Filesystem::Error, "stat not supported by #{self.class.name}" unless self.class == Filesystem
       ::File.stat(src)
     end
 
@@ -66,7 +69,9 @@ module Etna
       def mkio(file, opts, size_hint: nil, &block)
         rd, wd = IO.pipe
 
-        pid = spawn(*mkcommand(rd, wd, file, opts, size_hint: size_hint))
+        cmd = mkcommand(rd, wd, file, opts, size_hint: size_hint)
+        puts "in mkio: #{cmd}"
+        pid = spawn(*cmd)
         q = Queue.new
 
         closer = Thread.new do
@@ -184,9 +189,22 @@ module Etna
           cmd << @key_file
         end
 
+        cmd << "-O"
+        cmd << @port.to_s
+
         cmd << "-P"
         cmd << @port.to_s
 
+        cmd << "-v"
+        cmd << "-k"
+        cmd << "0"
+        cmd << "--file-manifest=text"
+        cmd << "--file-manifest-path=/var/tmp"
+        cmd << "--file-checksum=md5"
+        cmd << "-l"
+        cmd << "100m"
+        cmd << "--overwrite=always"
+
         remote_path = file
         # https://download.asperasoft.com/download/docs/entsrv/3.9.1/es_admin_linux/webhelp/index.html#dita/stdio_2.html
         local_path = "stdio://"
@@ -212,6 +230,7 @@ module Etna
           cmd << {in: rd}
         end
 
+        puts "end of mkcmd: #{cmd}"
         cmd
       end
     end
@@ -228,7 +247,8 @@ module Etna
             if e.instance_of?(String) && e.start_with?("stdio://")
               "stdio-tar://"
             elsif e == file
-              ::File.dirname(file)
+              dir = ::File.dirname(file)
+              dir[0] == '/' ? dir : "/#{dir}"
             else
               e
             end
@@ -565,4 +585,4 @@ module Etna
       end
     end
   end
-end
+end

data/lib/etna/instrumentation.rb

@@ -0,0 +1,56 @@
+module Etna
+  module Instrumentation
+    def self.included(cls)
+      cls.instance_eval do
+        def self.time_it(method_name, &metric_block)
+          orig_method_name = :"#{method_name}_without_time_it"
+          self.alias_method orig_method_name, method_name
+
+          self.define_method method_name do |*args|
+            time_it(orig_method_name, args, &metric_block)
+          end
+        end
+      end
+    end
+
+    def increment_it(&block)
+      if has_yabeda?
+        metric = yield
+        metric.increment({})
+      end
+    end
+
+    def time_it(method_name, args, &metric_block)
+      if has_yabeda?
+        start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        begin
+          return send(method_name, *args)
+        ensure
+          dur = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+          if block_given?
+            metric = yield
+            tags = {}
+          else
+            tags = {class_name: self.class.name, method_name: method_name.to_s}
+            metric = Yabeda.etna.perf
+          end
+          metric.measure(tags, dur)
+        end
+      else
+        return send(method_name, *args, **kwds)
+      end
+    end
+
+    def with_yabeda_tags(tags, &block)
+      if has_yabeda?
+        Yabeda.with_tags(tags, &block)
+      else
+        yield
+      end
+    end
+
+    def has_yabeda?
+      defined?(Yabeda) && Yabeda.configured?
+    end
+  end
+end

data/lib/etna/route.rb

@@ -1,9 +1,13 @@
 require 'digest'
 require 'date'
+require "addressable/uri"
 require_relative "./censor"
+require_relative './instrumentation'
 
 module Etna
   class Route
+    include Etna::Instrumentation
+
     attr_reader :name
 
     def initialize(method, route, options, &block)
@@ -42,7 +46,7 @@ module Etna
       if params
         PARAM_TYPES.reduce(route) do |path,pat|
           path.gsub(pat) do
-            params[$1.to_sym].split('/').map { |c| block_given? ? yield(c) : URI.encode_www_form_component(c) }.join('/')
+            params[$1.to_sym].split('/').map { |c| block_given? ? yield(c) : Addressable::URI.normalized_encode(c) }.join('/')
           end
         end
       else
@@ -64,19 +68,27 @@ module Etna
     end
 
     def call(app, request)
-      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      update_params(request)
 
-      try_yabeda(request)  do |tags|
-        Yabeda.etna.visits.increment(tags)
+      tags = {}
+      if @action
+        tags[:controller], tags[:action] = @action.split('#')
+      elsif @name
+        tags[:action] = @name
+      else
+        tags[:action] = @route
       end
 
-      begin
+      params = request.env['rack.request.params']
+      user = request.env['etna.user']
+      tags[:user_hash] = user ? hash_user_email(user.email) : 'unknown'
+      if params && (params.include?(:project_name) || params.include?('project_name'))
+        tags[:project_name] = params[:project_name] || params['project_name']
+      end
+
+      with_yabeda_tags(tags) do
+        increment_it { Yabeda.etna.visits }
         process_call(app, request)
-      ensure
-        try_yabeda(request) do |tags|
-          dur = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
-          Yabeda.etna.response_time.measure(tags, dur)
-        end
       end
     end
 
@@ -93,36 +105,7 @@ module Etna
       Digest::MD5.hexdigest(digest)
     end
 
-    def try_yabeda(request, &block)
-      if @action
-        controller, action = @action.split('#')
-      elsif @name
-        controller = "none"
-        action = @name
-      else
-        controller = "none"
-        action = @route
-      end
-
-      params = request.env['rack.request.params']
-      user = request.env['etna.user']
-      user_hash = user ? hash_user_email(user.email) : 'unknown'
-      project_name = "unknown"
-
-      if params && (params.include?(:project_name) || params.include?('project_name'))
-        project_name = params[:project_name] || params['project_name']
-      end
-
-      begin
-        block.call({ controller: controller, action: action, user_hash: user_hash, project_name: project_name })
-      rescue => e
-        raise e unless Etna::Application.instance.environment == :production
-      end
-    end
-
     def process_call(app, request)
-      update_params(request)
-
       unless authorized?(request)
         if cc_available?(request)
           if request.content_type == 'application/json'
@@ -155,6 +138,8 @@ module Etna
       end
     end
 
+    time_it(:process_call) { Yabeda.etna.response_time }
+
     # the route does not require authorization
     def noauth?
       @auth && @auth[:noauth]
@@ -256,7 +241,7 @@ module Etna
         Hash[
           match.names.map(&:to_sym).zip(
             match.captures.map do |capture|
-              capture.split('/').map {|c| URI.decode_www_form_component(c) }.join('/')
+              capture.split('/').map {|c| Addressable::URI.unencode_component(c) }.join('/')
             end
           )
         ]

data/lib/etna/spec/auth.rb

@@ -31,9 +31,17 @@ module Etna::Spec
     def below_admin_roles
       [:editor, :viewer, :guest]
     end
-    
+
     def below_editor_roles
       [:viewer, :guest]
     end
+
+    def stub_janus_refresh
+      stub_request(:post, /\/api\/tokens\/generate/)
+      .to_return({
+        status: 200,
+        body: ""
+      })
+    end
   end
 end

data/lib/etna/user.rb

@@ -71,5 +71,9 @@ module Etna
     def active? project=nil
       permissions.keys.length > 0
     end
+
+    def display_name
+      [ email, name ].join('|')
+    end
   end
 end

data/lib/etna.rb

@@ -28,6 +28,7 @@ require_relative './etna/metrics'
 require_relative './etna/remote'
 require_relative './etna/synchronize_db'
 require_relative './etna/janus_utils'
+require_relative './etna/instrumentation'
 
 class EtnaApp
   include Etna::Application

data/lib/helpers.rb

@@ -43,17 +43,19 @@ module WithEtnaClients
     env_token
   end
 
-  def magma_client
+  def magma_client(logger: nil)
     @magma_client ||= Etna::Clients::Magma.new(
         token: token,
         ignore_ssl: EtnaApp.instance.config(:ignore_ssl),
+        logger: logger,
         **EtnaApp.instance.config(:magma, environment) || {})
   end
 
-  def metis_client
+  def metis_client(logger: nil)
     @metis_client ||= Etna::Clients::Metis.new(
         token: token,
         ignore_ssl: EtnaApp.instance.config(:ignore_ssl),
+        logger: logger,
         **EtnaApp.instance.config(:metis, environment) || {})
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etna
 version: !ruby/object:Gem::Version
-  version: 0.1.46
+  version: 0.1.48
 platform: ruby
 authors:
 - Saurabh Asthana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -200,6 +200,7 @@ files:
 - lib/etna/generate_autocompletion_script.rb
 - lib/etna/hmac.rb
 - lib/etna/injection.rb
+- lib/etna/instrumentation.rb
 - lib/etna/janus_utils.rb
 - lib/etna/json_serializable_struct.rb
 - lib/etna/logger.rb
@@ -240,8 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Base classes for Mount Etna applications