influxdb-client 1.1.0 → 1.2.0

data/test/influxdb/query_api_integration_test.rb

@@ -33,7 +33,7 @@ class QueryApiIntegrationTest < MiniTest::Test
 
   def test_query
     now = Time.now.utc
-    measurement = 'h2o_query_' + now.to_i.to_s
+    measurement = 'h2o_query_' + now.to_i.to_s + now.nsec.to_s
 
     @client.create_write_api.write(data: InfluxDB2::Point.new(name: measurement)
                                                          .add_tag('location', 'europe')

data/test/influxdb/query_api_test.rb

@@ -72,4 +72,25 @@ class QueryApiTest < MiniTest::Test
     assert_equal 10, record1.value
     assert_equal 'free', record1.field
   end
+
+  def test_headers
+    stub_request(:post, 'http://localhost:9999/api/v2/query?org=my-org')
+      .to_return(body: SUCCESS_DATA)
+
+    client = InfluxDB2::Client.new('http://localhost:9999', 'my-token',
+                                   bucket: 'my-bucket',
+                                   org: 'my-org',
+                                   use_ssl: false)
+
+    client.create_query_api
+          .query(query: 'from(bucket:"my-bucket") |> range(start: 1970-01-01T00:00:00.000000001Z) |> last()')
+
+    headers = {
+      'Authorization' => 'Token my-token',
+      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}",
+      'Content-Type' => 'application/json'
+    }
+    assert_requested(:post, 'http://localhost:9999/api/v2/query?org=my-org',
+                     times: 1, headers: headers)
+  end
 end

data/test/influxdb/write_api_batching_test.rb

@@ -25,7 +25,7 @@ class WriteApiBatchingTest < MiniTest::Test
     WebMock.disable_net_connect!
 
     @write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
-                                                 batch_size: 2, flush_interval: 5_000)
+                                                 batch_size: 2, flush_interval: 5_000, retry_interval: 2_000)
     @client = InfluxDB2::Client.new('http://localhost:9999',
                                     'my-token',
                                     bucket: 'my-bucket',
@@ -44,6 +44,29 @@ class WriteApiBatchingTest < MiniTest::Test
     WebMock.reset!
   end
 
+  def test_batch_configuration
+    error = assert_raises ArgumentError do
+      InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING, batch_size: 0)
+    end
+    assert_equal "The 'batch_size' should be positive or zero, but is: 0", error.message
+
+    error = assert_raises ArgumentError do
+      InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING, flush_interval: -10)
+    end
+    assert_equal "The 'flush_interval' should be positive or zero, but is: -10", error.message
+
+    error = assert_raises ArgumentError do
+      InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING, retry_interval: 0)
+    end
+    assert_equal "The 'retry_interval' should be positive or zero, but is: 0", error.message
+
+    InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING, jitter_interval: 0)
+    error = assert_raises ArgumentError do
+      InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING, jitter_interval: -10)
+    end
+    assert_equal "The 'jitter_interval' should be positive number, but is: -10", error.message
+  end
+
   def test_batch_size
     stub_request(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
       .to_return(status: 204)
@@ -136,6 +159,19 @@ class WriteApiBatchingTest < MiniTest::Test
     stub_request(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
       .to_return(status: 204)
 
+    @client.close!
+
+    @write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
+                                                 batch_size: 10, flush_interval: 5_000)
+    @client = InfluxDB2::Client.new('http://localhost:9999',
+                                    'my-token',
+                                    bucket: 'my-bucket',
+                                    org: 'my-org',
+                                    precision: InfluxDB2::WritePrecision::NANOSECOND,
+                                    use_ssl: false)
+
+    @write_client = @client.create_write_api(write_options: @write_options)
+
     @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=1.0 1')
     @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=2.0 2')
     @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=3.0 3')
@@ -150,4 +186,107 @@ class WriteApiBatchingTest < MiniTest::Test
                      "h2o_feet,location=coyote_creek level\\ water_level=2.0 2\n" \
                      'h2o_feet,location=coyote_creek level\\ water_level=3.0 3')
   end
+
+  def test_retry_interval_by_config
+    error_body = '{"code":"temporarily unavailable","message":"Token is temporarily over quota. '\
+                 'The Retry-After header describes when to try the write again."}'
+
+    stub_request(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 429, headers: { 'X-Platform-Error-Code' => 'temporarily unavailable' }, 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',
+                               'h2o_feet,location=coyote_creek water_level=2.0 2'])
+
+    sleep(0.5)
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request)
+
+    sleep(1)
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request)
+
+    sleep(1)
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 2, body: request)
+  end
+
+  def test_retry_interval_by_header
+    error_body = '{"code":"temporarily unavailable","message":"Server is temporarily unavailable to accept writes. '\
+                 'The Retry-After header describes when to try the write again."}'
+
+    stub_request(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 503, 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(0.5)
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request)
+
+    sleep(1)
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request)
+
+    sleep(1)
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request)
+
+    sleep(1)
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 2, body: request)
+  end
+
+  def test_jitter_interval
+    @client.close!
+
+    @client = InfluxDB2::Client.new('http://localhost:9999',
+                                    'my-token',
+                                    bucket: 'my-bucket',
+                                    org: 'my-org',
+                                    precision: InfluxDB2::WritePrecision::NANOSECOND,
+                                    use_ssl: false)
+
+    @write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
+                                                 batch_size: 2, flush_interval: 5_000, jitter_interval: 2_000)
+    @write_client = @client.create_write_api(write_options: @write_options)
+
+    stub_request(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .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',
+                               'h2o_feet,location=coyote_creek water_level=2.0 2'])
+
+    sleep(0.05)
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 0, body: request)
+
+    sleep(2)
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request)
+  end
 end

data/test/influxdb/write_api_integration_test.rb

@@ -35,7 +35,7 @@ class WriteApiIntegrationTest < MiniTest::Test
 
     now = Time.now.utc
 
-    measurement = 'h2o_' + now.to_i.to_s
+    measurement = 'h2o_' + now.to_i.to_s + now.nsec.to_s
     point = InfluxDB2::Point.new(name: measurement)
                             .add_tag('location', 'europe')
                             .add_field('level', 2)
@@ -61,6 +61,7 @@ class WriteApiIntegrationTest < MiniTest::Test
     uri = URI.parse('http://localhost:9999/api/v2/query?org=my-org')
     request = Net::HTTP::Post.new(uri.request_uri)
     request['Authorization'] = 'Token my-token'
+    request[InfluxDB2::DefaultApi::HEADER_CONTENT_TYPE] = 'application/json'
     request.body = query.to_json
 
     http = Net::HTTP.new(uri.host, uri.port)

data/test/influxdb/write_api_test.rb

@@ -129,6 +129,25 @@ class WriteApiTest < MiniTest::Test
                      times: 1, body: expected)
   end
 
+  def test_array_of_array
+    stub_request(:any, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 204)
+    client = InfluxDB2::Client.new('http://localhost:9999', 'my-token',
+                                   bucket: 'my-bucket',
+                                   org: 'my-org',
+                                   precision: InfluxDB2::WritePrecision::NANOSECOND,
+                                   use_ssl: false)
+
+    client.create_write_api.write(data: ['h2o,location=west value=33i 15', ['h2o,location=west value=34i 16',
+                                                                            'h2o,location=west value=35i 17']])
+
+    expected = "h2o,location=west value=33i 15\nh2o,location=west value=34i 16"\
+               "\nh2o,location=west value=35i 17"
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: expected)
+  end
+
   def test_authorization_header
     stub_request(:any, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
       .to_return(status: 204)
@@ -232,4 +251,25 @@ class WriteApiTest < MiniTest::Test
 
     assert_equal 'The time precision not_supported is not supported.', error.message
   end
+
+  def test_headers
+    stub_request(:any, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 204)
+
+    client = InfluxDB2::Client.new('http://localhost:9999', 'my-token',
+                                   bucket: 'my-bucket',
+                                   org: 'my-org',
+                                   precision: InfluxDB2::WritePrecision::NANOSECOND,
+                                   use_ssl: false)
+
+    client.create_write_api.write(data: 'h2o,location=west value=33i 15')
+
+    headers = {
+      'Authorization' => 'Token my-token',
+      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}",
+      'Content-Type' => 'text/plain'
+    }
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: 'h2o,location=west value=33i 15', headers: headers)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -149,9 +149,11 @@ files:
 - lib/influxdb2/client.rb
 - lib/influxdb2/client/client.rb
 - lib/influxdb2/client/default_api.rb
+- lib/influxdb2/client/delete_api.rb
 - lib/influxdb2/client/flux_csv_parser.rb
 - lib/influxdb2/client/flux_table.rb
 - lib/influxdb2/client/influx_error.rb
+- lib/influxdb2/client/models/delete_predicate_request.rb
 - lib/influxdb2/client/models/dialect.rb
 - lib/influxdb2/client/models/query.rb
 - lib/influxdb2/client/point.rb
@@ -160,6 +162,8 @@ files:
 - lib/influxdb2/client/worker.rb
 - lib/influxdb2/client/write_api.rb
 - test/influxdb/client_test.rb
+- test/influxdb/delete_api_integration_test.rb
+- test/influxdb/delete_api_test.rb
 - test/influxdb/flux_csv_parser_test.rb
 - test/influxdb/point_test.rb
 - test/influxdb/query_api_integration_test.rb
@@ -197,6 +201,8 @@ specification_version: 4
 summary: Ruby library for InfluxDB 2.
 test_files:
 - test/influxdb/client_test.rb
+- test/influxdb/delete_api_integration_test.rb
+- test/influxdb/delete_api_test.rb
 - test/influxdb/flux_csv_parser_test.rb
 - test/influxdb/point_test.rb
 - test/influxdb/query_api_integration_test.rb