couchbase 3.7.0-x86_64-linux → 3.8.1-x86_64-linux

data/lib/couchbase/datastructures/couchbase_set.rb

@@ -37,6 +37,8 @@ module Couchbase
         @collection = collection
         @options = options
         @cas = 0
+        @observability = @collection.instance_variable_get(:@observability)
+        @observability = Observability::Wrapper.new if @observability.nil?
       end
 
       # Calls the given block once for each element in the set, passing that element as a parameter.
@@ -44,49 +46,58 @@ module Couchbase
       # @yieldparam [Object] item
       #
       # @return [CouchbaseSet, Enumerable]
-      def each(&)
+      def each(parent_span: nil, &)
         if block_given?
-          begin
-            result = @collection.get(@id, @options.get_options)
-            current = result.content
-            @cas = result.cas
-          rescue Error::DocumentNotFound
-            current = []
-            @cas = 0
-          end
+          current =
+            @observability.record_operation(Observability::OP_SET_EACH, parent_span, self) do |obs_handler|
+              options = @options.get_options.clone
+              options.parent_span = obs_handler.op_span
+              result = @collection.get(@id, options)
+              @cas = result.cas
+              result.content
+            rescue Error::DocumentNotFound
+              @cas = 0
+              []
+            end
           current.each(&)
           self
         else
-          enum_for(:each)
+          enum_for(:each, parent_span: parent_span)
         end
       end
 
       # @return [Integer] returns the number of elements in the set.
-      def length
-        result = @collection.lookup_in(@id, [
-                                         LookupInSpec.count(""),
-                                       ], @options.lookup_in_options)
-        result.content(0)
-      rescue Error::DocumentNotFound
-        0
+      def length(parent_span: nil)
+        @observability.record_operation(Observability::OP_SET_LENGTH, parent_span, self) do |obs_handler|
+          options = @options.lookup_in_options.clone
+          options.parent_span = obs_handler.op_span
+          result = @collection.lookup_in(@id, [
+                                           LookupInSpec.count(""),
+                                         ], options)
+          result.content(0)
+        rescue Error::DocumentNotFound
+          0
+        end
       end
 
       alias size length
 
       # @return [Boolean] returns true if set is empty
-      def empty?
-        size.zero?
+      def empty?(parent_span: nil)
+        size(parent_span: parent_span).zero?
       end
 
       # Adds the given value to the set
       #
       # @param [Object] obj
       # @return [CouchbaseSet]
-      def add(obj)
-        begin
+      def add(obj, parent_span: nil)
+        @observability.record_operation(Observability::OP_SET_ADD, parent_span, self) do |obs_handler|
+          options = @options.mutate_in_options.clone
+          options.parent_span = obs_handler.op_span
           @collection.mutate_in(@id, [
                                   MutateInSpec.array_add_unique("", obj),
-                                ], @options.mutate_in_options)
+                                ], options)
         rescue Error::PathExists
           # ignore
         end
@@ -94,31 +105,37 @@ module Couchbase
       end
 
       # Removes all elements from the set
-      def clear
-        @collection.remove(@id, @options.remove_options)
-        nil
-      rescue Error::DocumentNotFound
-        nil
+      def clear(parent_span: nil)
+        @observability.record_operation(Observability::OP_SET_CLEAR, parent_span, self) do |obs_handler|
+          options = @options.remove_options.clone
+          options.parent_span = obs_handler.op_span
+          @collection.remove(@id, options)
+          nil
+        rescue Error::DocumentNotFound
+          nil
+        end
       end
 
       # Deletes the given object from the set.
       #
       # @return [Boolean] true if the value has been removed
-      def delete(obj)
-        result = @collection.get(@id)
-        idx = result.content.index(obj)
-        return false unless idx
+      def delete(obj, parent_span: nil)
+        @observability.record_operation(Observability::OP_SET_DELETE, parent_span, self) do |obs_handler|
+          result = @collection.get(@id, Options::Get.new(parent_span: obs_handler.op_span))
+          idx = result.content.index(obj)
+          return false unless idx
 
-        options = Options::MutateIn.new
-        options.cas = result.cas
-        @collection.mutate_in(@id, [
-                                MutateInSpec.remove("[#{idx}]"),
-                              ], options)
-        true
-      rescue Error::CasMismatch
-        retry
-      rescue Error::DocumentNotFound
-        false
+          options = Options::MutateIn.new(parent_span: obs_handler.op_span)
+          options.cas = result.cas
+          @collection.mutate_in(@id, [
+                                  MutateInSpec.remove("[#{idx}]"),
+                                ], options)
+          true
+        rescue Error::CasMismatch
+          retry
+        rescue Error::DocumentNotFound
+          false
+        end
       end
     end
 

data/lib/couchbase/deprecations.rb

@@ -19,7 +19,7 @@ module Couchbase
     def self.deprecate_constants(removed_in_version, parent, constants)
       deprecator = Module.new do
         define_method(:const_missing) do |old_name|
-          return super unless constants.key?(old_name)
+          return super(old_name) unless constants.key?(old_name)
 
           new_name = constants[old_name]
 

data/lib/couchbase/diagnostics.rb

@@ -47,7 +47,7 @@ module Couchbase
         yield self if block_given?
       end
 
-      def to_json(*args)
+      def to_json(*)
         data = {
           id: @id,
           state: @state,
@@ -56,7 +56,7 @@ module Couchbase
         }
         data[:details] = @details if @details
         data[:last_activity_us] = @last_activity_us if @last_activity_us
-        data.to_json(*args)
+        data.to_json(*)
       end
     end
 
@@ -88,13 +88,13 @@ module Couchbase
     # @return [Integer] version
     attr_accessor :version
 
-    def to_json(*args)
+    def to_json(*)
       {
         version: @version,
         id: @id,
         sdk: @sdk,
         services: @services,
-      }.to_json(*args)
+      }.to_json(*)
     end
   end
 
@@ -130,7 +130,7 @@ module Couchbase
         yield self if block_given?
       end
 
-      def to_json(*args)
+      def to_json(*)
         data = {
           id: @id,
           state: @state,
@@ -139,7 +139,7 @@ module Couchbase
           latency: @latency,
         }
         data[:error] = @error if @error
-        data.to_json(*args)
+        data.to_json(*)
       end
     end
 
@@ -171,13 +171,13 @@ module Couchbase
     # @return [Integer] version
     attr_accessor :version
 
-    def to_json(*args)
+    def to_json(*)
       {
         version: @version,
         id: @id,
         sdk: @sdk,
         services: @services,
-      }.to_json(*args)
+      }.to_json(*)
     end
   end
 end

data/lib/couchbase/errors.rb

@@ -44,7 +44,7 @@ module Couchbase
       end
 
       def to_s
-        result = super
+        result = +super
         result << ", context=#{JSON.generate(@context)}" if @context
         result << ", cause=#{@cause}" if @cause
         result
@@ -410,5 +410,11 @@ module Couchbase
 
     class ClusterClosed < CouchbaseError
     end
+
+    class TracerError < CouchbaseError
+    end
+
+    class MeterError < CouchbaseError
+    end
   end
 end

data/lib/couchbase/json_transcoder.rb

@@ -35,7 +35,7 @@ module Couchbase
       format = TranscoderFlags.decode(flags).format
       raise Error::DecodingFailure, "Unable to decode #{format} with the JsonTranscoder" unless format == :json || format.nil?
 
-      JSON.parse(blob) unless blob&.empty?
+      JSON.parse(blob) unless blob && blob.empty?
     end
   end
 end

data/lib/couchbase/libcouchbase.rb

@@ -1,6 +1,6 @@
         begin
           require_relative "#{RUBY_VERSION[/(\d+\.\d+)/]}/libcouchbase"
         rescue LoadError
-          raise LoadError, "unable to load couchbase extension for Ruby #{RUBY_VERSION}. Only available for 3.1, 3.2, 3.3, 3.4. " \
+          raise LoadError, "unable to load couchbase extension for Ruby #{RUBY_VERSION}. Only available for 3.2, 3.3, 3.4, 4.0. " \
             "Try to install couchbase from sources with 'gem install --platform ruby couchbase'"
         end

data/lib/couchbase/management/analytics_index_manager.rb

@@ -629,8 +629,9 @@ module Couchbase
       alias inspect to_s
 
       # @param [Couchbase::Backend] backend
-      def initialize(backend)
+      def initialize(backend, observability)
         @backend = backend
+        @observability = observability
       end
 
       # Creates a new dataverse
@@ -643,7 +644,9 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::DataverseExists]
       def create_dataverse(dataverse_name, options = Options::Analytics::CreateDataverse.new)
-        @backend.analytics_dataverse_create(dataverse_name, options.to_backend)
+        @observability.record_operation(Observability::OP_AM_CREATE_DATAVERSE, options.parent_span, self, :analytics) do |obs_handler|
+          @backend.analytics_dataverse_create(dataverse_name, options.to_backend, obs_handler)
+        end
       end
 
       # Drops a dataverse
@@ -656,7 +659,9 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::DataverseNotFound]
       def drop_dataverse(dataverse_name, options = Options::Analytics::DropDataverse.new)
-        @backend.analytics_dataverse_drop(dataverse_name, options.to_backend)
+        @observability.record_operation(Observability::OP_AM_DROP_DATAVERSE, options.parent_span, self, :analytics) do |obs_handler|
+          @backend.analytics_dataverse_drop(dataverse_name, options.to_backend, obs_handler)
+        end
       end
 
       # Creates a new dataset
@@ -671,7 +676,9 @@ module Couchbase
       # @raise [Error::DatasetExists]
       # @raise [Error::LinkNotFound]
       def create_dataset(dataset_name, bucket_name, options = Options::Analytics::CreateDataset.new)
-        @backend.analytics_dataset_create(dataset_name, bucket_name, options.to_backend)
+        @observability.record_operation(Observability::OP_AM_CREATE_DATASET, options.parent_span, self, :analytics) do |_obs_handler|
+          @backend.analytics_dataset_create(dataset_name, bucket_name, options.to_backend)
+        end
       end
 
       # Drops a dataset
@@ -684,7 +691,9 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::DatasetNotFound]
       def drop_dataset(dataset_name, options = Options::Analytics::DropDataset.new)
-        @backend.analytics_dataset_drop(dataset_name, options.to_backend)
+        @observability.record_operation(Observability::OP_AM_DROP_DATASET, options.parent_span, self, :analytics) do |obs_handler|
+          @backend.analytics_dataset_drop(dataset_name, options.to_backend, obs_handler)
+        end
       end
 
       # Gets all datasets
@@ -693,13 +702,15 @@ module Couchbase
       #
       # @return [Array<AnalyticsDataset>]
       def get_all_datasets(options = Options::Analytics::GetAllDatasets.new)
-        resp = @backend.analytics_dataset_get_all(options.to_backend)
-        resp.map do |entry|
-          AnalyticsDataset.new do |dataset|
-            dataset.name = entry[:name]
-            dataset.dataverse_name = entry[:dataverse_name]
-            dataset.link_name = entry[:link_name]
-            dataset.bucket_name = entry[:bucket_name]
+        @observability.record_operation(Observability::OP_AM_GET_ALL_DATASETS, options.parent_span, self, :analytics) do |obs_handler|
+          resp = @backend.analytics_dataset_get_all(options.to_backend, obs_handler)
+          resp.map do |entry|
+            AnalyticsDataset.new do |dataset|
+              dataset.name = entry[:name]
+              dataset.dataverse_name = entry[:dataverse_name]
+              dataset.link_name = entry[:link_name]
+              dataset.bucket_name = entry[:bucket_name]
+            end
           end
         end
       end
@@ -716,7 +727,9 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::IndexExists]
       def create_index(index_name, dataset_name, fields, options = Options::Analytics::CreateIndex.new)
-        @backend.analytics_index_create(index_name, dataset_name, fields.entries, options.to_backend)
+        @observability.record_operation(Observability::OP_AM_CREATE_INDEX, options.parent_span, self, :analytics) do |obs_handler|
+          @backend.analytics_index_create(index_name, dataset_name, fields.entries, options.to_backend, obs_handler)
+        end
       end
 
       # Drops an index
@@ -730,7 +743,9 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::IndexNotFound]
       def drop_index(index_name, dataset_name, options = Options::Analytics::DropIndex.new)
-        @backend.analytics_index_drop(index_name, dataset_name, options.to_backend)
+        @observability.record_operation(Observability::OP_AM_DROP_INDEX, options.parent_span, self, :analytics) do |obs_handler|
+          @backend.analytics_index_drop(index_name, dataset_name, options.to_backend, obs_handler)
+        end
       end
 
       # Gets all indexes
@@ -739,13 +754,15 @@ module Couchbase
       #
       # @return [Array<AnalyticsIndex>]
       def get_all_indexes(options = Options::Analytics::GetAllIndexes.new)
-        resp = @backend.analytics_index_get_all(options.to_backend)
-        resp.map do |entry|
-          AnalyticsIndex.new do |dataset|
-            dataset.name = entry[:name]
-            dataset.dataverse_name = entry[:dataverse_name]
-            dataset.dataset_name = entry[:dataset_name]
-            dataset.is_primary = entry[:is_primary]
+        @observability.record_operation(Observability::OP_AM_GET_ALL_INDEXES, options.parent_span, self, :analytics) do |obs_handler|
+          resp = @backend.analytics_index_get_all(options.to_backend, obs_handler)
+          resp.map do |entry|
+            AnalyticsIndex.new do |dataset|
+              dataset.name = entry[:name]
+              dataset.dataverse_name = entry[:dataverse_name]
+              dataset.dataset_name = entry[:dataset_name]
+              dataset.is_primary = entry[:is_primary]
+            end
           end
         end
       end
@@ -759,7 +776,9 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::LinkNotFound]
       def connect_link(options = Options::Analytics::ConnectLink.new)
-        @backend.analytics_link_connect(options.to_backend)
+        @observability.record_operation(Observability::OP_AM_CONNECT_LINK, options.parent_span, self, :analytics) do |obs_handler|
+          @backend.analytics_link_connect(options.to_backend, obs_handler)
+        end
       end
 
       # Disconnects a link,
@@ -771,7 +790,9 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::LinkNotFound]
       def disconnect_link(options = Options::Analytics::DisconnectLink.new)
-        @backend.analytics_link_disconnect(options.to_backend)
+        @observability.record_operation(Observability::OP_AM_DISCONNECT_LINK, options.parent_span, self, :analytics) do |obs_handler|
+          @backend.analytics_link_disconnect(options.to_backend, obs_handler)
+        end
       end
 
       # Gets the pending mutations for all datasets.
@@ -784,7 +805,9 @@ module Couchbase
       # @return [Hash<String => Integer>] dictionary, where keys are dataset coordinates encoded as +"dataverse.dataset"+
       #   and values are number of mutations for given dataset.
       def get_pending_mutations(options = Options::Analytics::GetPendingMutations.new)
-        @backend.analytics_get_pending_mutations(options.to_backend)
+        @observability.record_operation(Observability::OP_AM_GET_PENDING_MUTATIONS, options.parent_span, self, :analytics) do |obs_handler|
+          @backend.analytics_get_pending_mutations(options.to_backend, obs_handler)
+        end
       end
 
       # Creates a link
@@ -797,7 +820,9 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::LinkExists]
       def create_link(link, options = Options::Analytics::CreateLink.new)
-        @backend.analytics_link_create(link.to_backend, options.to_backend)
+        @observability.record_operation(Observability::OP_AM_CREATE_LINK, options.parent_span, self, :analytics) do |obs_handler|
+          @backend.analytics_link_create(link.to_backend, options.to_backend, obs_handler)
+        end
       end
 
       # Replaces the link
@@ -810,7 +835,9 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::LinkNotFound]
       def replace_link(link, options = Options::Analytics::ReplaceLink.new)
-        @backend.analytics_link_replace(link.to_backend, options.to_backend)
+        @observability.record_operation(Observability::OP_AM_REPLACE_LINK, options.parent_span, self, :analytics) do |obs_handler|
+          @backend.analytics_link_replace(link.to_backend, options.to_backend, obs_handler)
+        end
       end
 
       # Drops the link
@@ -824,7 +851,9 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::LinkNotFound]
       def drop_link(link_name, dataverse_name, options = Options::Analytics::DropLink.new)
-        @backend.analytics_link_drop(link_name, dataverse_name, options.to_backend)
+        @observability.record_operation(Observability::OP_AM_DROP_LINK, options.parent_span, self, :analytics) do |obs_handler|
+          @backend.analytics_link_drop(link_name, dataverse_name, options.to_backend, obs_handler)
+        end
       end
 
       # Retrieves the links
@@ -836,38 +865,40 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::LinkNotFound]
       def get_links(options = Options::Analytics::GetLinks.new)
-        resp = @backend.analytics_link_get_all(options.to_backend)
-        resp.map do |entry|
-          case entry[:type]
-          when :s3
-            S3ExternalAnalyticsLink.new(
-              entry[:link_name],
-              entry[:dataverse],
-              entry[:access_key_id],
-              nil,
-              entry[:region],
-              service_endpoint: entry[:service_endpoint],
-            )
-          when :couchbase
-            CouchbaseRemoteAnalyticsLink.new(
-              entry[:link_name],
-              entry[:dataverse],
-              entry[:hostname],
-              username: entry[:username],
-              encryption: EncryptionSettings.new(
-                level: entry[:encryption_level],
-                certificate: entry[:certificate],
-                client_certificate: entry[:client_certificate],
-              ),
-            )
-          when :azureblob
-            AzureBlobExternalAnalyticsLink.new(
-              entry[:link_name],
-              entry[:dataverse],
-              account_name: entry[:account_name],
-              blob_endpoint: entry[:blob_endpoint],
-              endpoint_suffix: entry[:endpoint_suffix],
-            )
+        @observability.record_operation(Observability::OP_AM_GET_LINKS, options.parent_span, self, :analytics) do |obs_handler|
+          resp = @backend.analytics_link_get_all(options.to_backend, obs_handler)
+          resp.map do |entry|
+            case entry[:type]
+            when :s3
+              S3ExternalAnalyticsLink.new(
+                entry[:link_name],
+                entry[:dataverse],
+                entry[:access_key_id],
+                nil,
+                entry[:region],
+                service_endpoint: entry[:service_endpoint],
+              )
+            when :couchbase
+              CouchbaseRemoteAnalyticsLink.new(
+                entry[:link_name],
+                entry[:dataverse],
+                entry[:hostname],
+                username: entry[:username],
+                encryption: EncryptionSettings.new(
+                  level: entry[:encryption_level],
+                  certificate: entry[:certificate],
+                  client_certificate: entry[:client_certificate],
+                ),
+              )
+            when :azureblob
+              AzureBlobExternalAnalyticsLink.new(
+                entry[:link_name],
+                entry[:dataverse],
+                account_name: entry[:account_name],
+                blob_endpoint: entry[:blob_endpoint],
+                endpoint_suffix: entry[:endpoint_suffix],
+              )
+            end
           end
         end
       end