influxdb-client 2.9.0.pre.6399 → 2.9.0.pre.6549

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bf55d488d924797b5389afb1f4c8e7b3f746a79340f177aad381e8ffcf4cfa4
-  data.tar.gz: c5c1012187ded0a8b18f95b395398997efad0c60201f270670c576833e136dac
+  metadata.gz: b1b6ab683d6ef70eff99de868e07895325d4467efd1e0de8987c34cca1c94552
+  data.tar.gz: c344c09cdfe61c111b525d333ec2768a28869eb3c9683197618c387c072d7746
 SHA512:
-  metadata.gz: c78f3d8a91d7484a75be736e7755d4b635641776c63aaff824c9e44f9ec3e3456f2046fcb3870b3248a97aae76356615c01975001783138b27a6731b597b71a4
-  data.tar.gz: f8c7d6315f37b2a3a31e4b0e2b8171e9008e8fe7ab18e4558e66195a5b5de8d5acbb2d908522bbd948990809527524ae9102d4949805bbea89c2d85861f12609
+  metadata.gz: a77d6cb437975a961ad21ddb9baca14bfcd06afc8005475270a4c6cdf87421973c76815c30eb58d67117764a151c604c2a8e750d06213bb5fb69a1a81ced410a
+  data.tar.gz: b89483a139e8ae6447f17e9c316a02f5dc83bbd40307adb61f4b98749393f8d7618e83d611c5a9906f0f5874f0f29c7b234d3950fb3f7d2c6a73427ff92281fc

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 ## 2.9.0 [unreleased]
 
+:warning: The client can be used as a resource:
+
+    InfluxDB2::Client.use('https://localhost:8086', 'my-token') do |client|
+        client.do_something
+    end
+
 ### Features
 1. [#126](https://github.com/influxdata/influxdb-client-ruby/pull/126): Add `Task` API
+1. [#127](https://github.com/influxdata/influxdb-client-ruby/pull/127): Client can be used as a resource
 
 ### Bug Fixes
 1. [#123](https://github.com/influxdata/influxdb-client-ruby/pull/123): Duplicate columns warning shows in improper situations

data/README.md

@@ -81,6 +81,18 @@ Use **InfluxDB::Client** to create a client connected to a running InfluxDB 2 in
 
 ```ruby
 client = InfluxDB2::Client.new('https://localhost:8086', 'my-token')
+
+client.do_something
+
+client.close!
+```
+
+the **InfluxDB::Client** can be also used as a resource:
+
+```ruby
+InfluxDB2::Client.use('https://localhost:8086', 'my-token') do |client|
+  client.do_something
+end
 ```
 
 #### Client Options
@@ -119,38 +131,41 @@ The result retrieved by [QueryApi](https://github.com/influxdata/influxdb-client
 
 Synchronously executes the Flux query and return result as unprocessed String
 ```ruby
-client = InfluxDB2::Client.new('https://localhost:8086', 'my-token',
-                              bucket: 'my-bucket',
-                              org: 'my-org')
+InfluxDB2::Client.use('https://localhost:8086', 'my-token', org: 'my-org') do |client|
 
-query_api = client.create_query_api
-result = query_api.query_raw(query: 'from(bucket:"' + bucket + '") |> range(start: 1970-01-01T00:00:00.000000001Z) |> last()')
+  result = client
+    .create_query_api
+    .query_raw(query: 'from(bucket:"my-bucket") |> range(start: 1970-01-01) |> last()')
+  puts result
+end
 ```
 #### Synchronous query
 Synchronously executes the Flux query and return result as a Array of [FluxTables](https://github.com/influxdata/influxdb-client-ruby/blob/master/lib/influxdb2/client/flux_table.rb)
 ```ruby
-client = InfluxDB2::Client.new('https://localhost:8086', 'my-token',
-                              bucket: 'my-bucket',
-                              org: 'my-org')
-
-query_api = client.create_query_api
-result = query_api.query(query: 'from(bucket:"' + bucket + '") |> range(start: 1970-01-01T00:00:00.000000001Z) |> last()')
+InfluxDB2::Client.use('https://localhost:8086', 'my-token', org: 'my-org') do |client|
+
+  result = client
+    .create_query_api
+    .query(query: 'from(bucket:"my-bucket") |> range(start: 1970-01-01) |> last()')
+  
+  result.each do |table|
+    table.records.each { |record| puts record.values }
+  end
+end
 ```
 
 #### Query stream
 Synchronously executes the Flux query and return stream of [FluxRecord](https://github.com/influxdata/influxdb-client-ruby/blob/master/lib/influxdb2/client/flux_table.rb)
 ```ruby
-client = InfluxDB2::Client.new('https://localhost:8086', 'my-token',
-                              bucket: 'my-bucket',
-                              org: 'my-org')
-
-query_api = client.create_query_api
+InfluxDB2::Client.use('https://localhost:8086', 'my-token', org: 'my-org') do |client|
 
-query = 'from(bucket: "my-bucket") |> range(start: -10m, stop: now()) ' \
-      "|> filter(fn: (r) => r._measurement == \"#{measurement}\")"
+  stream = client
+    .create_query_api
+    .query_stream(query: 'from(bucket:"my-bucket") |> range(start: 1970-01-01) |> last()')
 
-query_api.query_stream(query: query).each do |record|
-  puts record.to_s
+  stream.each do |record|
+    puts record.values
+  end
 end
 ```
 
@@ -168,30 +183,30 @@ Parameterized query example:
 > :warning: Parameterized Queries are supported only in InfluxDB Cloud, currently there is no support in InfluxDB OSS.
 
 ```ruby
-client = InfluxDB2::Client.new('https://localhost:8086', 'my-token',
-                              bucket: 'my-bucket',
-                              org: 'my-org')
-
-query = 'from(bucket: params.bucketParam) |> range(start: duration(v: params.startParam))'
-params = { 'bucketParam' => 'my-bucket', 'startParam' => '-1h' }
-
-query_api = client.create_query_api
-result = query_api.query(query: query, params: params)
-
-result[0].records.each { |record| puts "#{record.time} #{record.measurement}: #{record.field} #{record.value}" }
+InfluxDB2::Client.use('https://localhost:8086', 'my-token', org: 'my-org') do |client|
+
+    query = 'from(bucket: params.bucketParam) |> range(start: duration(v: params.startParam))'
+    params = { 'bucketParam' => 'my-bucket', 'startParam' => '-1h' }
+    
+    query_api = client.create_query_api
+    result = query_api.query(query: query, params: params)
+    
+    result[0].records.each { |record| puts "#{record.time} #{record.measurement}: #{record.field} #{record.value}" }
+end
 ```
 
 ### Writing data
 The [WriteApi](https://github.com/influxdata/influxdb-client-ruby/blob/master/lib/influxdb2/client/write_api.rb) supports synchronous and batching writes into InfluxDB 2.x. In default api uses synchronous write. To enable batching you can use WriteOption.
 
 ```ruby
-client = InfluxDB2::Client.new('https://localhost:8086', 'my-token',
-                              bucket: 'my-bucket',
-                              org: 'my-org',
-                              precision: InfluxDB2::WritePrecision::NANOSECOND)
+InfluxDB2::Client.use('https://localhost:8086', 'my-token',
+                      bucket: 'my-bucket',
+                      org: 'my-org',
+                      precision: InfluxDB2::WritePrecision::NANOSECOND) do |client|
 
-write_api = client.create_write_api
-write_api.write(data: 'h2o,location=west value=33i 15')
+  write_api = client.create_write_api
+  write_api.write(data: 'h2o,location=west value=33i 15')
+end
 ```
 
 #### Batching
@@ -209,39 +224,46 @@ The writes are processed in batches which are configurable by `WriteOptions`:
 | exponential_base         | the base for the exponential retry delay, the next delay is computed using random exponential backoff as a random value within the interval  ``retry_interval * exponential_base^(attempts-1)`` and ``retry_interval * exponential_base^(attempts)``. Example for ``retry_interval=5000, exponential_base=2, max_retry_delay=125000, total=5`` Retry delays are random distributed values within the ranges of ``[5000-10000, 10000-20000, 20000-40000, 40000-80000, 80000-125000]`` | 2             |
 | 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, 
-                                            max_retries: 3, max_retry_delay: 15_000,
-                                            exponential_base: 2)
-client = InfluxDB2::Client.new('http://localhost:8086',
-                               'my-token',
-                               bucket: 'my-bucket',
-                               org: 'my-org',
-                               precision: InfluxDB2::WritePrecision::NANOSECOND,
-                               use_ssl: false)
-
-write_api = client.create_write_api(write_options: write_options)
-write_api.write(data: 'h2o,location=west value=33i 15')
+InfluxDB2::Client.use('http://localhost:8086',
+                      'my-token',
+                      bucket: 'my-bucket',
+                      org: 'my-org',
+                      precision: InfluxDB2::WritePrecision::NANOSECOND,
+                      use_ssl: false) do |client|
+
+  write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
+                                              batch_size: 10, flush_interval: 5_000,
+                                              max_retries: 3, max_retry_delay: 15_000,
+                                              exponential_base: 2)
+
+  write_api = client.create_write_api(write_options: write_options)
+  write_api.write(data: 'h2o,location=west value=33i 15')
+end
 ```
 
 #### Time precision
 
 Configure default time precision:
 ```ruby
-client = InfluxDB2::Client.new('https://localhost:8086', 'my-token',
-                              bucket: 'my-bucket',
-                              org: 'my-org',
-                              precision: InfluxDB2::WritePrecision::NANOSECOND)
+InfluxDB2::Client.use('https://localhost:8086', 'my-token',
+                      bucket: 'my-bucket',
+                      org: 'my-org',
+                      precision: InfluxDB2::WritePrecision::NANOSECOND) do |client|
+
+  client.do_something
+end
 ```
 
 Configure precision per write:
 ```ruby
-client = InfluxDB2::Client.new('https://localhost:8086', 'my-token',
-                                  bucket: 'my-bucket',
-                                  org: 'my-org')
+InfluxDB2::Client.use('https://localhost:8086', 'my-token',
+                      bucket: 'my-bucket',
+                      org: 'my-org',
+                      precision: InfluxDB2::WritePrecision::NANOSECOND) do |client|
 
-write_api = client.create_write_api
-write_api.write(data: 'h2o,location=west value=33i 15', precision: InfluxDB2::WritePrecision::SECOND)
+  write_api = client.create_write_api
+  write_api.write(data: 'h2o,location=west value=33i 15', precision: InfluxDB2::WritePrecision::SECOND)
+end
 ```
 Allowed values for precision are:
 - `InfluxDB2::WritePrecision::NANOSECOND` for nanosecond
@@ -253,18 +275,22 @@ Allowed values for precision are:
 
 Default `bucket` and `organization` destination are configured via `InfluxDB::Client`:
 ```ruby
-client = InfluxDB2::Client.new('https://localhost:8086', 'my-token',
-                              bucket: 'my-bucket',
-                              org: 'my-org')
+InfluxDB2::Client.use('https://localhost:8086', 'my-token',
+                      bucket: 'my-bucket',
+                      org: 'my-org') do |client|
+
+  client.do_something
+end
 ```
 
 but there is also possibility to override configuration per write:
 
 ```ruby
-client = InfluxDB2::Client.new('https://localhost:8086', 'my-token')
+InfluxDB2::Client.use('https://localhost:8086', 'my-token') do |client|
 
-write_api = client.create_write_api
-write_api.write(data: 'h2o,location=west value=33i 15', bucket: 'production-data', org: 'customer-1')
+  write_api = client.create_write_api
+  write_api.write(data: 'h2o,location=west value=33i 15', bucket: 'production-data', org: 'customer-1')
+end
 ```
 
 #### Data format
@@ -277,21 +303,22 @@ The data could be written as:
 1. `Array` of above items
 
 ```ruby
-client = InfluxDB2::Client.new('https://localhost:8086', 'my-token',
-                              bucket: 'my-bucket',
-                              org: 'my-org',
-                              precision: InfluxDB2::WritePrecision::NANOSECOND)
+InfluxDB2::Client.use('https://localhost:8086', 'my-token',
+                      bucket: 'my-bucket',
+                      org: 'my-org',
+                      precision: InfluxDB2::WritePrecision::NANOSECOND) do |client|
 
-point = InfluxDB2::Point.new(name: 'h2o')
-                       .add_tag('location', 'europe')
-                       .add_field('level', 2)
+  point = InfluxDB2::Point.new(name: 'h2o')
+                          .add_tag('location', 'europe')
+                          .add_field('level', 2)
 
-hash = { name: 'h2o',
-         tags: { host: 'aws', region: 'us' },
-         fields: { level: 5, saturation: '99%' }, time: 123 }
+  hash = { name: 'h2o',
+           tags: { host: 'aws', region: 'us' },
+           fields: { level: 5, saturation: '99%' }, time: 123 }
 
-write_api = client.create_write_api
-write_api.write(data: ['h2o,location=west value=33i 15', point, hash])
+  write_api = client.create_write_api
+  write_api.write(data: ['h2o,location=west value=33i 15', point, hash])
+end
 ```
 
 #### Default Tags
@@ -306,22 +333,23 @@ The expressions:
 ##### Via API
 
 ```ruby
-client = InfluxDB2::Client.new('http://localhost:8086', 'my-token',
-                               bucket: 'my-bucket',
-                               org: 'my-org',
-                               precision: InfluxDB2::WritePrecision::NANOSECOND,
-                               use_ssl: false,
-                               tags: { id: '132-987-655' })
-
-point_settings = InfluxDB2::PointSettings.new(default_tags: { customer: 'California Miner' })
-point_settings.add_default_tag('data_center', '${env.data_center}')
-
-write_api = client.create_write_api(write_options: InfluxDB2::SYNCHRONOUS,
-                                    point_settings: point_settings)
-
-write_api.write(data: InfluxDB2::Point.new(name: 'h2o')
-                                      .add_tag('location', 'europe')
-                                      .add_field('level', 2))
+InfluxDB2::Client.use('http://localhost:8086', 'my-token',
+                      bucket: 'my-bucket',
+                      org: 'my-org',
+                      precision: InfluxDB2::WritePrecision::NANOSECOND,
+                      use_ssl: false,
+                      tags: { id: '132-987-655' }) do |client|
+
+  point_settings = InfluxDB2::PointSettings.new(default_tags: { customer: 'California Miner' })
+  point_settings.add_default_tag('data_center', '${env.data_center}')
+
+  write_api = client.create_write_api(write_options: InfluxDB2::SYNCHRONOUS,
+                                      point_settings: point_settings)
+
+  write_api.write(data: InfluxDB2::Point.new(name: 'h2o')
+                                        .add_tag('location', 'europe')
+                                        .add_field('level', 2))
+end
 ```
 
 ### Delete data
@@ -329,14 +357,15 @@ write_api.write(data: InfluxDB2::Point.new(name: 'h2o')
 The [DeleteApi](https://github.com/influxdata/influxdb-client-ruby/blob/master/lib/influxdb2/client/delete_api.rb) supports deletes [points](https://docs.influxdata.com/influxdb/latest/reference/key-concepts/data-elements/#point) from an InfluxDB bucket.
 
 ```ruby
-client = InfluxDB2::Client.new('http://localhost:8086', 'my-token',
-                               bucket: 'my-bucket',
-                               org: 'my-org',
-                               precision: InfluxDB2::WritePrecision::NANOSECOND)
-
-client.create_delete_api.delete(DateTime.rfc3339('2019-02-03T04:05:06+07:00'),
-                                DateTime.rfc3339('2019-03-03T04:05:06+07:00'),
-                                predicate: 'key1="value1" AND key2="value"')
+InfluxDB2::Client.use('http://localhost:8086', 'my-token',
+                      bucket: 'my-bucket',
+                      org: 'my-org',
+                      precision: InfluxDB2::WritePrecision::NANOSECOND) do |client|
+
+  client.create_delete_api.delete(DateTime.rfc3339('2019-02-03T04:05:06+07:00'),
+                                  DateTime.rfc3339('2019-03-03T04:05:06+07:00'),
+                                  predicate: 'key1="value1" AND key2="value"')
+end
 ```
 
 The time range could be specified as:
@@ -376,51 +405,50 @@ bucket = 'my-bucket'
 org = 'my-org'
 token = 'my-token'
 
-client = InfluxDB2::Client.new(url,
-                               token,
-                               bucket: bucket,
-                               org: org,
-                               use_ssl: false,
-                               precision: InfluxDB2::WritePrecision::NANOSECOND)
-
-api = InfluxDB2::API::Client.new(client)
-
-# Find my organization
-organization = api.create_organizations_api
-                  .get_orgs
-                  .orgs
-                  .select { |it| it.name == 'my-org' }
-                  .first
-
-#
-# Create new Bucket
-#
-retention_rule = InfluxDB2::API::RetentionRule.new(type: 'expire', every_seconds: 3600)
-bucket_name = 'new-bucket-name'
-request = InfluxDB2::API::PostBucketRequest.new(org_id: organization.id,
-                                                name: bucket_name,
-                                                retention_rules: [retention_rule])
-bucket = api.create_buckets_api
-            .post_buckets(request)
-
-#
-# Create Permission to read/write from Bucket
-#
-resource = InfluxDB2::API::Resource.new(type: 'buckets',
-                                        id: bucket.id,
-                                        org_id: organization.id)
-authorization = InfluxDB2::API::Authorization.new(description: "Authorization to read/write bucket: #{bucket.name}",
-                                                  org_id: organization.id,
-                                                  permissions: [
-                                                    InfluxDB2::API::Permission.new(action: 'read', resource: resource),
-                                                    InfluxDB2::API::Permission.new(action: 'write', resource: resource)
-                                                  ])
-result = api.create_authorizations_api
-            .post_authorizations(authorization)
-
-print("The token: '#{result.token}' is authorized to read/write from/to bucket: '#{bucket.name}'.")
-
-client.close!
+InfluxDB2::Client.use(url,
+                      token,
+                      bucket: bucket,
+                      org: org,
+                      use_ssl: false,
+                      precision: InfluxDB2::WritePrecision::NANOSECOND) do |client|
+
+  api = InfluxDB2::API::Client.new(client)
+
+  # Find my organization
+  organization = api.create_organizations_api
+                    .get_orgs
+                    .orgs
+                    .select { |it| it.name == 'my-org' }
+                    .first
+
+  #
+  # Create new Bucket
+  #
+  retention_rule = InfluxDB2::API::RetentionRule.new(type: 'expire', every_seconds: 3600)
+  bucket_name = 'new-bucket-name'
+  request = InfluxDB2::API::PostBucketRequest.new(org_id: organization.id,
+                                                  name: bucket_name,
+                                                  retention_rules: [retention_rule])
+  bucket = api.create_buckets_api
+              .post_buckets(request)
+
+  #
+  # Create Permission to read/write from Bucket
+  #
+  resource = InfluxDB2::API::Resource.new(type: 'buckets',
+                                          id: bucket.id,
+                                          org_id: organization.id)
+  authorization = InfluxDB2::API::Authorization.new(description: "Authorization to read/write bucket: #{bucket.name}",
+                                                    org_id: organization.id,
+                                                    permissions: [
+                                                      InfluxDB2::API::Permission.new(action: 'read', resource: resource),
+                                                      InfluxDB2::API::Permission.new(action: 'write', resource: resource)
+                                                    ])
+  result = api.create_authorizations_api
+              .post_authorizations(authorization)
+
+  print("The token: '#{result.token}' is authorized to read/write from/to bucket: '#{bucket.name}'.")
+end
 
 ```
 - sources - [create_new_bucket.rb](/examples/create_new_bucket.rb)

data/lib/influxdb2/client/client.rb

@@ -63,6 +63,23 @@ module InfluxDB2
       at_exit { close! }
     end
 
+    # Instantiate a new InfluxDB client with code block. The client will be passed as an argument
+    # and will be automatically closed when the block terminates.
+    #
+    # It takes same args as {InfluxDB2::Client#initialize}.
+    #
+    # @example Instantiate a client.
+    #   InfluxDBClient::Client.use(url: 'https://localhost:8086', token: 'my-token') do |client|
+    #     ping = client.ping
+    #     puts ping.version
+    #   end
+    def self.use(*args)
+      client = Client.new(*args)
+      yield client
+    ensure
+      client.close!
+    end
+
     # Write time series data into InfluxDB thought WriteApi.
     #
     # @return [WriteApi] New instance of WriteApi.

data/test/influxdb/client_test.rb

@@ -126,4 +126,32 @@ class ClientTest < Minitest::Test
 
     assert_match 'authorization: ***', output.string
   end
+
+  def test_resource
+    InfluxDB2::Client.use('http://localhost:8086', 'my-token', use_ssl: false) do |client|
+      ping = client.ping
+      assert_equal 'ok', ping.status
+    end
+  end
+
+  def test_resource_closed
+    client = nil
+    InfluxDB2::Client.use('http://localhost:8086', 'my-token', use_ssl: false) do |resource|
+      client = resource
+    end
+    assert_equal true, client.instance_variable_get(:@closed)
+  end
+
+  def test_resource_closed_error
+    client = nil
+    begin
+      InfluxDB2::Client.use('http://localhost:8086', 'my-token', use_ssl: false) do |resource|
+        client = resource
+        raise 'Just for testing.'
+      end
+    rescue StandardError => e
+      puts e
+    end
+    assert_equal true, client.instance_variable_get(:@closed)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 2.9.0.pre.6399
+  version: 2.9.0.pre.6549
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-14 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler