arvados 2.3.2 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71f2c2b74a66c77bae78b0491d7b645ab04fda1f52fd99d59decd6c0d5e2937f
-  data.tar.gz: 94981c95d7c0958d184bae3613390998b72cfe23113b0d21fca566d5e17dd02d
+  metadata.gz: d3803d37166d87eeb87057626b8c578fd1f7b52cea3ce756ade4c3d42bcda8e7
+  data.tar.gz: 7968249bd3f23494aa4174896c5c6f5cde506ce42278857d0c1e4d9e4c11947e
 SHA512:
-  metadata.gz: 5e7124a399e596a6a3b0efb49a3e9271ecb20d83a3716f5635b28c8c7c9c890df2ac09d6a88753eb18cddfd0f469bfd071e53d0e817a095dcf961f3272f446c0
-  data.tar.gz: 5c221140aae53fd3eb6897643b16d776436bd48635ce6025db09895819d2c812acb185e679eb4ba1b8a3139b0365d5ee8065bfaac6893d26f84f5752b50ab945
+  metadata.gz: 99f91ecfb2f02ae7d0326b15109b8261222c932895f495a2916d208f8d86a595ed0b1577bace601f416a059942f32dec7abf305eca769bac73c34ac20bd3e35b
+  data.tar.gz: 1a21b5f661da43fc8e7c2d67267f9b4b477e9d8cb053183c216ae51dec57af26c4b616b2f6a84b9a106d3a7a3e512e527f8bf4d6d2e71260adc7734c765893ad

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.2
+  version: 2.4.1
 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: []