influxdb-client 1.8.0.pre.1240 → 1.9.0.pre.1331

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49b8841c9ce5b13c24595d8fec2b2ed6eb8fe6676b606b9a10ef851d8ea98a9
-  data.tar.gz: 328d60cf43f6d5c1a43e5ac22945a76175c2752b370a5ca155a7236aedbe79be
+  metadata.gz: 13f587f991c459071204269e2e9efd40dc01b3e586710769beef4c70cb85071b
+  data.tar.gz: d8ef882a6370da524e67e926230196011a577f25d27fa0b80bd5372a3842027f
 SHA512:
-  metadata.gz: 5a20d45c4dad7031e96bedb7ac76c3f146a17d8bec00fad5eba2d6cba062bcef172b5c389dce7db589b8d5481256cc246d652c48019fb6087b4d49f88c45c7d6
-  data.tar.gz: 707f373b6a72790a4e34b40490077b2da5e2bd1b2fd703d48237a1a80a4b5fe1053bb2b4263fb8f586e37c85544ac3b292f22d9c8012f101e0db56f483ba617c
+  metadata.gz: 6333aa4d6ed7ce13b520d1659362e057a023c1beef668e23d9fdaa4eb89046f76a3a0f770a6dcdc3dfd3e9b593289d1fc696462c56310a3dc5f14d0449401e82
+  data.tar.gz: d97d59e3a14bfaf828801bbbb81d1abd00f5e865eed54bcddf8588732330c4f452a8d0d0d85cba4535d4a50b9731eaaa02a3ecdaaeee943f2760aae59902534e

data/.circleci/config.yml

@@ -78,7 +78,7 @@ jobs:
         default: &default-ruby-image "circleci/ruby:2.6-stretch"
       influxdb-image:
         type: string
-        default: &default-influxdb-image "influxdb:2.0.0-beta"
+        default: &default-influxdb-image "influxdb:2.0.0-rc"
     docker:
       - image: << parameters.ruby-image >>
       - image: &influx-image quay.io/influxdb/<< parameters.influxdb-image >>

data/.rubocop.yml

@@ -34,7 +34,7 @@ Metrics/MethodLength:
 Metrics/ClassLength:
   Max: 300
 Metrics/AbcSize:
-  Max: 40
+  Max: 50
 Metrics/CyclomaticComplexity:
   Max: 15
 Metrics/PerceivedComplexity:

data/CHANGELOG.md

@@ -1,7 +1,13 @@
-## 1.8.0 [unreleased]
+## 1.9.0 [unreleased]
+
+### Features
+1. [#55](https://github.com/influxdata/influxdb-client-runy/pull/55): Improved logging message for retries
+
+## 1.8.0 [2020-10-02]
 
 ### Features
 1. [#36](https://github.com/influxdata/influxdb-client-ruby/issues/36): Added support for default tags
+1. [#53](https://github.com/influxdata/influxdb-client-ruby/pull/53): Default strategy for batching worker is best-effort
 
 ### API
 1. [#50](https://github.com/influxdata/influxdb-client-ruby/pull/50): Default port changed from 9999 -> 8086

data/README.md

@@ -23,7 +23,7 @@ The client can be installed manually or with bundler.
 To install the client gem manually:
 
 ```
-gem install influxdb-client -v 1.7.0
+gem install influxdb-client -v 1.8.0
 ```
 
 ## Usage
@@ -128,6 +128,7 @@ The writes are processed in batches which are configurable by `WriteOptions`:
 | max_retries | the number of max retries when write fails | 5 |
 | max_retry_delay | maximum delay when retrying write in milliseconds | 180000 |
 | exponential_base | the base for the exponential retry delay, the next delay is computed as `retry_interval * exponential_base^(attempts - 1) + random(jitter_interval)` | 5 |
+| batch_abort_on_exception | the batching worker will be aborted after failed retry strategy | false |
 ```ruby
 write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
                                             batch_size: 10, flush_interval: 5_000, 

data/bin/influxdb-restart.sh

@@ -27,7 +27,7 @@ DEFAULT_DOCKER_REGISTRY="quay.io/influxdb/"
 DOCKER_REGISTRY="${DOCKER_REGISTRY:-$DEFAULT_DOCKER_REGISTRY}"
 
 DEFAULT_INFLUXDB_V2_REPOSITORY="influxdb"
-DEFAULT_INFLUXDB_V2_VERSION="2.0.0-beta"
+DEFAULT_INFLUXDB_V2_VERSION="2.0.0-rc"
 INFLUXDB_V2_REPOSITORY="${INFLUXDB_V2_REPOSITORY:-$DEFAULT_INFLUXDB_V2_REPOSITORY}"
 INFLUXDB_V2_VERSION="${INFLUXDB_V2_VERSION:-$DEFAULT_INFLUXDB_V2_VERSION}"
 INFLUXDB_V2_IMAGE=${DOCKER_REGISTRY}${INFLUXDB_V2_REPOSITORY}:${INFLUXDB_V2_VERSION}

data/lib/influxdb2/client/client.rb

@@ -43,6 +43,7 @@ module InfluxDB2
     # @option options [Integer] :read_timeout Number of seconds to wait for one block of data to be read
     # @option options [Integer] :max_redirect_count Maximal number of followed HTTP redirects
     # @option options [bool] :use_ssl Turn on/off SSL for HTTP communication
+    # @option options [Logger] :logger Logger used for logging. Disable logging by set to false.
     # @option options [Hash] :tags Default tags which will be added to each point written by api.
     #   the body line-protocol
     def initialize(url, token, options = nil)
@@ -50,6 +51,7 @@ module InfluxDB2
       @options = options ? options.dup : {}
       @options[:url] = url if url.is_a? String
       @options[:token] = token if token.is_a? String
+      @options[:logger] = @options[:logger].nil? ? DefaultApi.create_logger : @options[:logger]
       @closed = false
 
       at_exit { close! }

data/lib/influxdb2/client/default_api.rb

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'logger'
+
 module InfluxDB2
   # default api
   class DefaultApi
@@ -32,6 +34,29 @@ module InfluxDB2
       @max_redirect_count = @options[:max_redirect_count] || DEFAULT_REDIRECT_COUNT
     end
 
+    def log(level, message)
+      return unless @options[:logger]
+
+      log_level = case level
+                  when :debug then
+                    Logger::DEBUG
+                  when :warn then
+                    Logger::WARN
+                  when :error then
+                    Logger::ERROR
+                  when :fatal then
+                    Logger::FATAL
+                  else
+                    Logger::INFO
+                  end
+
+      @options[:logger].add(log_level) { message }
+    end
+
+    def self.create_logger
+      Logger.new(STDOUT)
+    end
+
     private
 
     def _parse_uri(api_path)

data/lib/influxdb2/client/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module InfluxDB2
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.9.0'.freeze
 end

data/lib/influxdb2/client/worker.rb

@@ -37,7 +37,7 @@ module InfluxDB2
           _check_background_queue
         end
       end
-      @thread_flush.abort_on_exception = true
+      @thread_flush.abort_on_exception = @write_options.batch_abort_on_exception
 
       @thread_size = Thread.new do
         until api_client.closed
@@ -45,7 +45,7 @@ module InfluxDB2
           sleep 0.01
         end
       end
-      @thread_size.abort_on_exception = true
+      @thread_size.abort_on_exception = @write_options.batch_abort_on_exception
     end
 
     def push(payload)
@@ -116,6 +116,10 @@ module InfluxDB2
                   e.retry_after.to_f
                 end
 
+      message = 'The retriable error occurred during writing of data. '\
+"Reason: '#{e.message}'. Retry in: #{timeout}s."
+
+      @api_client.log(:warn, message)
       sleep timeout
       _write_raw(key, points, attempts + 1, retry_interval * @write_options.exponential_base)
     end

data/lib/influxdb2/client/write_api.rb

@@ -39,8 +39,10 @@ module InfluxDB2
     #   by a random amount
     # @param [Integer] exponential_base: base for the exponential retry delay, the next delay is computed as
     #   "exponential_base^(attempts-1) + random(jitter_interval)"
+    # @param [Boolean] batch_abort_on_exception: batching worker will be aborted after failed retry strategy
     def initialize(write_type: WriteType::SYNCHRONOUS, batch_size: 1_000, flush_interval: 1_000, retry_interval: 5_000,
-                   jitter_interval: 0, max_retries: 5, max_retry_delay: 180_000, exponential_base: 5)
+                   jitter_interval: 0, max_retries: 5, max_retry_delay: 180_000, exponential_base: 5,
+                   batch_abort_on_exception: false)
       _check_not_negative('batch_size', batch_size)
       _check_not_negative('flush_interval', flush_interval)
       _check_not_negative('retry_interval', retry_interval)
@@ -56,10 +58,11 @@ module InfluxDB2
       @max_retries = max_retries
       @max_retry_delay = max_retry_delay
       @exponential_base = exponential_base
+      @batch_abort_on_exception = batch_abort_on_exception
     end
 
     attr_reader :write_type, :batch_size, :flush_interval, :retry_interval, :jitter_interval,
-                :max_retries, :max_retry_delay, :exponential_base
+                :max_retries, :max_retry_delay, :exponential_base, :batch_abort_on_exception
 
     def _check_not_negative(key, value)
       raise ArgumentError, "The '#{key}' should be positive or zero, but is: #{value}" if value <= 0

data/test/influxdb/default_api_test.rb

@@ -0,0 +1,60 @@
+# The MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'test_helper'
+require 'influxdb2/client/default_api'
+
+class DefaultApiTest < MiniTest::Test
+  def setup
+    @logger = MockLogger.new
+    @api = InfluxDB2::DefaultApi.new(options: { logger: @logger })
+  end
+
+  def test_level
+    @api.log(:debug, 'debug message')
+    @api.log(:warn, 'warn message')
+    @api.log(:error, 'error message')
+    @api.log(:info, 'info message')
+    @api.log(:others, 'others message')
+
+    assert_equal 5, @logger.messages.count
+
+    assert_equal Logger::DEBUG, @logger.messages[0][0]
+    assert_equal 'debug message', @logger.messages[0][1]
+
+    assert_equal Logger::WARN, @logger.messages[1][0]
+    assert_equal 'warn message', @logger.messages[1][1]
+
+    assert_equal Logger::ERROR, @logger.messages[2][0]
+    assert_equal 'error message', @logger.messages[2][1]
+
+    assert_equal Logger::INFO, @logger.messages[3][0]
+    assert_equal 'info message', @logger.messages[3][1]
+
+    assert_equal Logger::INFO, @logger.messages[4][0]
+    assert_equal 'others message', @logger.messages[4][1]
+  end
+
+  def test_supports_false
+    @api = InfluxDB2::DefaultApi.new(options: { logger: false })
+
+    @api.log(:info, 'without error')
+  end
+end

data/test/influxdb/delete_api_integration_test.rb

@@ -73,12 +73,16 @@ class DeleteApiIntegrationTest < MiniTest::Test
   end
 
   def test_delete_all
+    # TODO: https://github.com/influxdata/influxdb/issues/19545
+    skip
     @client.create_delete_api.delete(Time.utc(2010, 10, 15, 7, 20, 15), Time.utc(2020, 10, 14, 8, 20, 15))
 
     assert_equal 0, _query_count
   end
 
   def test_delete_without_interval
+    # TODO: https://github.com/influxdata/influxdb/issues/19545
+    skip
     error = assert_raises InfluxDB2::InfluxError do
       @client.create_delete_api.delete(nil, nil)
     end

data/test/influxdb/write_api_batching_test.rb

@@ -226,6 +226,7 @@ class WriteApiRetryStrategyTest < MiniTest::Test
   def setup
     WebMock.disable_net_connect!
 
+    @logger = MockLogger.new
     @write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
                                                  batch_size: 2, flush_interval: 5_000, retry_interval: 2_000)
     @client = InfluxDB2::Client.new('http://localhost:8086',
@@ -233,7 +234,8 @@ class WriteApiRetryStrategyTest < MiniTest::Test
                                     bucket: 'my-bucket',
                                     org: 'my-org',
                                     precision: InfluxDB2::WritePrecision::NANOSECOND,
-                                    use_ssl: false)
+                                    use_ssl: false,
+                                    logger: @logger)
 
     @write_client = @client.create_write_api(write_options: @write_options)
   end
@@ -338,38 +340,34 @@ class WriteApiRetryStrategyTest < MiniTest::Test
                                                 batch_size: 1, retry_interval: 2_000, max_retries: 3,
                                                 max_retry_delay: 5_000, exponential_base: 2)
 
-    error = assert_raises InfluxDB2::InfluxError do
-      @client.create_write_api(write_options: write_options).write(data: point)
-
-      sleep(0.5)
+    @client.create_write_api(write_options: write_options).write(data: point)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 1, body: request)
+    sleep(0.5)
 
-      sleep(2)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 2, body: request)
+    sleep(2)
 
-      sleep(4)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 2, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 3, body: request)
+    sleep(4)
 
-      sleep(5)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 3, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 4, body: request)
+    sleep(5)
 
-      sleep(5)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 4, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 4, body: request)
+    sleep(5)
 
-      sleep(5)
-    end
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 4, body: request)
 
-    assert_equal('429', error.code)
+    sleep(5)
 
     assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
                      times: 4, body: request)
@@ -384,7 +382,8 @@ class WriteApiRetryStrategyTest < MiniTest::Test
 
     write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
                                                 batch_size: 1, retry_interval: 2_000, max_retries: 3,
-                                                max_retry_delay: 5_000, exponential_base: 2)
+                                                max_retry_delay: 5_000, exponential_base: 2,
+                                                batch_abort_on_exception: true)
 
     error = assert_raises InfluxDB2::InfluxError do
       @client.create_write_api(write_options: write_options).write(data: 'h2o,location=west value=33i 15')
@@ -420,33 +419,29 @@ class WriteApiRetryStrategyTest < MiniTest::Test
                                                 batch_size: 1, retry_interval: 2_000, max_retries: 3,
                                                 max_retry_delay: 5_000, exponential_base: 2)
 
-    error = assert_raises InfluxDB2::InfluxError do
-      @client.create_write_api(write_options: write_options).write(data: point)
-
-      sleep(0.5)
+    @client.create_write_api(write_options: write_options).write(data: point)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 1, body: request)
+    sleep(0.5)
 
-      sleep(3)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 2, body: request)
+    sleep(3)
 
-      sleep(3)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 2, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 3, body: request)
+    sleep(3)
 
-      sleep(3)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 3, body: request)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 4, body: request)
+    sleep(3)
 
-      sleep(3)
-    end
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 4, body: request)
 
-    assert_equal('429', error.code)
+    sleep(3)
 
     assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
                      times: 4, body: request)
@@ -473,38 +468,37 @@ class WriteApiRetryStrategyTest < MiniTest::Test
                                                 batch_size: 1, retry_interval: 2_000, max_retries: 3,
                                                 max_retry_delay: 5_000, exponential_base: 2)
 
-    error = assert_raises InfluxDB2::InfluxError do
-      @client.create_write_api(write_options: write_options).write(data: point)
+    @client.create_write_api(write_options: write_options).write(data: point)
 
-      sleep(0.5)
+    sleep(0.5)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 1, body: request)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request)
 
-      sleep(2)
+    sleep(2)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 2, body: request)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 2, body: request)
 
-      sleep(4)
+    sleep(4)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 3, body: request)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 3, body: request)
 
-      sleep(5)
+    sleep(5)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 4, body: request)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 4, body: request)
 
-      sleep(5)
+    sleep(5)
 
-      assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
-                       times: 4, body: request)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 4, body: request)
 
-      sleep(5)
-    end
+    sleep(5)
 
-    assert_equal('Connection refused - ' + error_message, error.message)
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 4, body: request)
   end
 
   def test_write_connection_error
@@ -545,4 +539,89 @@ class WriteApiRetryStrategyTest < MiniTest::Test
     assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
                      times: 3, body: request)
   end
+
+  def test_abort_on_exception
+    error_body = '{"code":"invalid","message":"unable to parse '\
+                 '\'h2o,location=europe 1\'"}'
+
+    stub_request(:any, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 400, headers: { 'X-Platform-Error-Code' => 'invalid' }, body: error_body)
+      .to_return(status: 204)
+
+    write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
+                                                batch_size: 1, retry_interval: 500, max_retries: 1,
+                                                max_retry_delay: 5_000, exponential_base: 1,
+                                                batch_abort_on_exception: true)
+
+    write_api = @client.create_write_api(write_options: write_options)
+
+    error = assert_raises InfluxDB2::InfluxError do
+      write_api.write(data: 'h2o,location=europe 1')
+      write_api.write(data: 'h2o,location=europe level=2.0 1')
+
+      sleep(2)
+    end
+
+    assert_equal("unable to parse 'h2o,location=europe 1'", error.message)
+
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: 'h2o,location=europe 1')
+
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 0, body: 'h2o,location=europe level=2.0 1')
+  end
+
+  def test_abort_on_exception_next_batch
+    error_body = '{"code":"invalid","message":"unable to parse '\
+                 '\'h2o,location=europe 1\'"}'
+
+    stub_request(:any, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 400, headers: { 'X-Platform-Error-Code' => 'invalid' }, body: error_body)
+      .to_return(status: 204)
+
+    write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
+                                                batch_size: 1, retry_interval: 500, max_retries: 1,
+                                                max_retry_delay: 5_000, exponential_base: 1)
+
+    write_api = @client.create_write_api(write_options: write_options)
+
+    write_api.write(data: 'h2o,location=europe 1')
+    write_api.write(data: 'h2o,location=europe level=2.0 1')
+
+    sleep(2)
+
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: 'h2o,location=europe 1')
+
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: 'h2o,location=europe level=2.0 1')
+  end
+
+  def test_retry_contains_message
+    error_body = '{"code":"temporarily unavailable","message":"Server is temporarily unavailable to accept writes."}'
+
+    stub_request(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 429, headers: { 'X-Platform-Error-Code' => 'temporarily unavailable', 'Retry-After' => '3' },
+                 body: error_body).then
+      .to_return(status: 204)
+
+    request = "h2o_feet,location=coyote_creek water_level=1.0 1\n" \
+               'h2o_feet,location=coyote_creek water_level=2.0 2'
+
+    @write_client.write(data: ['h2o_feet,location=coyote_creek water_level=1.0 1',
+                               InfluxDB2::Point.new(name: 'h2o_feet')
+                                   .add_tag('location', 'coyote_creek')
+                                   .add_field('water_level', 2.0)
+                                   .time(2, InfluxDB2::WritePrecision::NANOSECOND)])
+
+    sleep(5)
+
+    assert_requested(:post, 'http://localhost:8086/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 2, body: request)
+
+    message = 'The retriable error occurred during writing of data. '\
+"Reason: 'Server is temporarily unavailable to accept writes.'. Retry in: 3.0s."
+
+    assert_equal(message, @logger.messages[0][1])
+  end
 end

data/test/test_helper.rb

@@ -37,3 +37,15 @@ require 'minitest/reporters'
 Minitest::Reporters.use!
 
 require 'webmock/minitest'
+
+class MockLogger
+  attr_accessor :messages
+
+  def initialize
+    @messages = []
+  end
+
+  def add(level, &block)
+    @messages << [level, yield(block)]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre.1240
+  version: 1.9.0.pre.1331
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,6 +168,7 @@ files:
 - lib/influxdb2/client/worker.rb
 - lib/influxdb2/client/write_api.rb
 - test/influxdb/client_test.rb
+- test/influxdb/default_api_test.rb
 - test/influxdb/delete_api_integration_test.rb
 - test/influxdb/delete_api_test.rb
 - test/influxdb/flux_csv_parser_test.rb
@@ -207,6 +208,7 @@ specification_version: 4
 summary: Ruby library for InfluxDB 2.
 test_files:
 - test/influxdb/client_test.rb
+- test/influxdb/default_api_test.rb
 - test/influxdb/delete_api_integration_test.rb
 - test/influxdb/delete_api_test.rb
 - test/influxdb/flux_csv_parser_test.rb