arvados 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02b9cf5178988a7687b980129f28267e22b5af8eec3ad772d67fc1f1bdf86d97
-  data.tar.gz: b8636927e7723490f031e96f7b51e5395c2b8bc4a6d0c7936f399bfef12c67e1
+  metadata.gz: c45d6de575df79d6bf649e8f549b5fd429c108d7ebedf8a949bc100a68cefdc8
+  data.tar.gz: 06aaee486049713794ddf2ff2d48a669b7deed7474e51f4564c44fceb0b6c469
 SHA512:
-  metadata.gz: '09ca6bc0ff5c39b1686d6c919f2dfba9c18eed02e27b1803f61efebd8ed1ae313c0ba1e510da2957ad17b696eda4f6bdff3f82f40dcc907a0be4cd73943d6f93'
-  data.tar.gz: 81fc3139bab6e688f81c8f12a22fdd85174872377d73ba673046dd7e92ffb7e8b482e8308c8e61f32d38f607e5ff9255318fc4e1efe3656e7df417793771eead
+  metadata.gz: e9e558450dcb390f4c78f8ef918f513692c55c5171fc78e8047a9fe161e86f419cc7a3e43b28e541ee3cbad183f0c6ee5504c34c16457cb4113b988c152b3700
+  data.tar.gz: 559165823ba689fec94dc539890650de9d96d468b25efacb893501bcbfdde28f4d04bc00a0b12fe211d9ab8019593d2a42654cb85a3fe86541f2f9ac90d44c87

data/lib/arvados.rb

@@ -16,6 +16,26 @@ ActiveSupport::Inflector.inflections do |inflect|
 end
 
 class Arvados
+  class ArvadosClient < Google::APIClient
+    attr_reader :request_id
+
+    def execute(*args)
+      @request_id = "req-" + Random::DEFAULT.rand(2**128).to_s(36)[0..19]
+      if args.last.is_a? Hash
+        args.last[:headers] ||= {}
+        args.last[:headers]['X-Request-Id'] = @request_id
+      end
+      begin
+        super(*args)
+      rescue => e
+        if !e.message.match(/.*req-[0-9a-zA-Z]{20}.*/)
+          raise $!, "#{$!} (Request ID: #{@request_id})", $!.backtrace
+        end
+        raise e
+      end
+    end
+  end
+
   class TransactionFailedError < StandardError
   end
 
@@ -101,7 +121,7 @@ class Arvados
   end
 
   def client
-    @client ||= Google::APIClient.
+    @client ||= ArvadosClient.
       new(:host => config["ARVADOS_API_HOST"],
           :application_name => @application_name,
           :application_version => @application_version.to_s)
@@ -207,6 +227,9 @@ class Arvados
                 })
       resp = JSON.parse result.body, :symbolize_names => true
       if resp[:errors]
+        if !resp[:errors][0].match(/.*req-[0-9a-zA-Z]{20}.*/)
+          resp[:errors][0] += " (#{result.headers['X-Request-Id'] or client.request_id})"
+        end
         raise Arvados::TransactionFailedError.new(resp[:errors])
       elsif resp[:uuid] and resp[:etag]
         self.new(resp)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,7 +132,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
-description: Arvados client library, git commit 2462bc7f4efbb51b0d4532833d93edb4aefd9b59
+description: Arvados client library, git commit f4554a781a3f6806783cbc6f116c3d7e974c6952
 email: packaging@arvados.org
 executables: []
 extensions: []