search-engine-for-typesense 1.0.2 → 30.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e75164a75fffb48d91c5b95b987a0fe3591fe8be8a94706434f23e13a46388fe
-  data.tar.gz: 53b56f4fad3d6ea77c4e0f8529c3a4fa94ce00bd8c7e869f7ac7a8dd4f97332e
+  metadata.gz: cc6c98f51d7d42de6bdebe417e43a17bcdda2f4abb89c102277225183466a53e
+  data.tar.gz: 511940a80bace746eb5424a756fdc561e34595a6e2867d9f98631eddc669e8a4
 SHA512:
-  metadata.gz: 50af37d6c697cd164d54a5054c9d8b3f56e7cd0a6335c88bc7e864deb459b0f690961c800f748d297110b483cce70598d6fbfc0520ba8a4a0b78c007fd5cf6a2
-  data.tar.gz: b127d78b4e67973cceab0b493a65eedadd9b4e8fe573108bedef4689875c0329966656048e64a1be6b6cf9e6ee5e5874f30711af9240721dc4aa9318a90830e3
+  metadata.gz: da964bae21bea332b73a385d1af55ffcc402b443bad34498fca153fa5a4304e784c78ba41a2891c9293204beb9fd653ef8282d5604daa7834584f19695d7cddc
+  data.tar.gz: c1fb500960c5849d69c3bcb5f8ee97c2de7d138347889c670df008724166e14ab25bbcadd4c846c05526c49c51f31f7c35061b30609d525b596aa70f2edada96

data/README.md

@@ -9,6 +9,12 @@ Mountless Rails::Engine for [Typesense](https://typesense.org). Expressive Relat
 > [!NOTE]
 > This project is not affiliated with [Typesense](https://typesense.org) and is a wrapper for the [`typesense` gem](https://github.com/typesense/typesense-ruby).
 
+## Versioning
+
+The gem version mirrors the Typesense server major/minor it targets. Patch releases are reserved for gem-only fixes and enhancements.
+
+Example: `30.1.x` targets Typesense `30.1`.
+
 ## Quickstart
 
 ```ruby
@@ -39,7 +45,7 @@ end
 SearchEngine::Product.where(name: "milk").select(:id, :name).limit(5).to_a
 ```
 
-See [Quickstart](https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/quickstart).
+See [Quickstart](https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/quickstart).
 
 ### Host app SearchEngine models
 
@@ -117,7 +123,7 @@ SearchEngine::Product.upsert_bulk(data: [mapped])
 
 ## Documentation
 
-See the [Docs](https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/index)
+See the [Docs](https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/index)
 
 ## Test/offline mode
 
@@ -133,16 +139,16 @@ If you set `SearchEngine.configure { |c| c.client = ... }`, the custom client is
 
 ## Example app
 
-See `examples/demo_shop` — demonstrates single/multi search, JOINs, grouping, presets/curation, and DX/observability. Supports offline mode via the stub client (see [Testing](https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/testing)).
+See `examples/demo_shop` — demonstrates single/multi search, JOINs, grouping, presets/curation, and DX/observability. Supports offline mode via the stub client (see [Testing](https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/testing)).
 
 ## Contributing
 
-See [Docs Style Guide](https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/docs-style-guide). Follow YARDoc for public APIs, add backlinks on docs landing pages, and redact secrets in examples.
+See [Docs Style Guide](https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/docs-style-guide). Follow YARDoc for public APIs, add backlinks on docs landing pages, and redact secrets in examples.
 
 <!-- Badge references (placeholders) -->
 [ci-badge]: https://img.shields.io/github/actions/workflow/status/lstpsche/search-engine-for-typesense/ci.yml?branch=main
 [ci-url]: #
-[gem-badge]: https://img.shields.io/gem/v/search-engine-for-typesense.svg?label=gem
+[gem-badge]: https://badge.fury.io/rb/search-engine-for-typesense.svg?icon=si%3Arubygems
 [gem-url]: https://rubygems.org/gems/search-engine-for-typesense
 [docs-badge]: https://img.shields.io/badge/docs-index-blue
-[docs-url]: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/index
+[docs-url]: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/index

data/app/search_engine/search_engine/index_partition_job.rb

@@ -18,7 +18,7 @@ module SearchEngine
     rescue_from(SearchEngine::Errors::Timeout) { |error| retry_if_possible(error) }
     rescue_from(SearchEngine::Errors::Connection) { |error| retry_if_possible(error) }
     rescue_from(SearchEngine::Errors::Api) do |error|
-      if transient_status?(error.status.to_i)
+      if SearchEngine::Indexer::RetryPolicy.transient_status?(error.status.to_i)
         retry_if_possible(error)
       else
         instrument_error(error)
@@ -82,14 +82,14 @@ module SearchEngine
     end
 
     def retry_if_possible(error)
-      attempts, base, max, jitter = retry_settings
-      attempt_no = executions.to_i # number of times we've run so far (1-based)
-      if attempt_no >= attempts
+      policy = retry_policy
+      attempt_no = executions.to_i
+      if attempt_no >= policy.attempts
         instrument_error(error)
         raise
       end
 
-      wait_seconds = backoff_seconds(attempt_no + 1, base: base, max: max, jitter_fraction: jitter)
+      wait_seconds = policy.next_delay(attempt_no + 1, error)
       instrument(
         'search_engine.dispatcher.job_error',
         error_payload(error).merge(queue: queue_name, job_id: job_id, retry_after_s: wait_seconds)
@@ -124,28 +124,9 @@ module SearchEngine
       SearchEngine::Instrumentation.instrument(event, payload) {}
     end
 
-    def retry_settings
+    def retry_policy
       cfg = SearchEngine.config.indexer
-      attempts = cfg&.retries && cfg.retries[:attempts].to_i.positive? ? cfg.retries[:attempts].to_i : 3
-      base = cfg&.retries && cfg.retries[:base].to_f.positive? ? cfg.retries[:base].to_f : 0.5
-      max = cfg&.retries && cfg.retries[:max].to_f.positive? ? cfg.retries[:max].to_f : 5.0
-      jitter = cfg&.retries && cfg.retries[:jitter_fraction].to_f >= 0 ? cfg.retries[:jitter_fraction].to_f : 0.2
-      [attempts, base, max, jitter]
-    end
-
-    def backoff_seconds(attempt, base:, max:, jitter_fraction:)
-      exp = [base * (2 ** (attempt - 1)), max].min
-      jitter = exp * jitter_fraction
-      delta = rand(-jitter..jitter)
-      sleep_time = exp + delta
-      sleep_time.positive? ? sleep_time : 0.0
-    end
-
-    def transient_status?(code)
-      return true if code == 429
-      return true if code >= 500 && code <= 599
-
-      false
+      SearchEngine::Indexer::RetryPolicy.from_config(cfg&.retries)
     end
 
     def monotonic_ms

data/lib/generators/search_engine/install/install_generator.rb

@@ -8,7 +8,7 @@ module SearchEngine
     #
     # @example
     #   rails g search_engine:install
-    # @see https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/dx
+    # @see https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/dx
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('templates', __dir__)
 

data/lib/generators/search_engine/install/templates/initializer.rb.tt

@@ -11,10 +11,10 @@
 # - Explore queries in `rails console` using SE helpers: `SE.q("milk")`
 #
 # Docs:
-# - Quickstart: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/quickstart
-# - CLI (Doctor): https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/cli
-# - DX helpers: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/dx
-# - Configuration: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/configuration
+# - Quickstart: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/quickstart
+# - CLI (Doctor): https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/cli
+# - DX helpers: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/dx
+# - Configuration: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/configuration
 SearchEngine.configure do |c|
   c.host = ENV.fetch('TYPESENSE_HOST', 'localhost')
   c.port = Integer(ENV.fetch('TYPESENSE_PORT', 8108))
@@ -83,7 +83,7 @@ SearchEngine.configure do |c|
   # c.logger = Rails.logger
 
   # --- Presets -------------------------------------------------------------
-  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/presets
+  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/presets
 
   # Enable preset namespacing and resolution. Default: true
   # c.presets.enabled = true
@@ -95,7 +95,7 @@ SearchEngine.configure do |c|
   # c.presets.locked_domains = %i[filter_by sort_by include_fields exclude_fields]
 
   # --- Selection & Grouping ------------------------------------------------
-  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/field-selection
+  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/field-selection
 
   # Raise when requested fields are missing during hydration. Default: false
   # c.selection.strict_missing = false
@@ -104,7 +104,7 @@ SearchEngine.configure do |c|
   # c.grouping.warn_on_ambiguous = true
 
   # --- Observability & Logging --------------------------------------------
-  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/observability
+  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/observability
 
   # Quiet by default: structured instrumentation logs ([se.*]) are OFF unless
   # explicitly enabled below.
@@ -129,13 +129,13 @@ SearchEngine.configure do |c|
   # c.opentelemetry = { enabled: false, service_name: 'search_engine' }
 
   # --- Schema lifecycle ----------------------------------------------------
-  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/schema
+  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/schema
 
   # Retention: how many previous physical collections to keep after swap. Default: 0
   # c.schema.retention.keep_last = 0
 
   # --- Indexer -------------------------------------------------------------
-  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/indexer
+  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/indexer
 
   # Default batch size for imports when not provided. Default: 2000
   # c.indexer.batch_size = 2000
@@ -202,7 +202,7 @@ SearchEngine.configure do |c|
   # c.partitioning.max_error_samples = 5
 
   # --- Stale deletes -------------------------------------------------------
-  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/deletion
+  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/deletion
 
   # Global kill switch for stale delete workflows. Default: true
   # c.stale_deletes.enabled = true
@@ -217,7 +217,7 @@ SearchEngine.configure do |c|
   # c.stale_deletes.estimation_enabled = false
 
   # --- Curation ------------------------------------------------------------
-  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/curation
+  # See: https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/curation
 
   # Maximum number of pinned IDs allowed. Default: 50
   # c.curation.max_pins = 50

data/lib/generators/search_engine/model/model_generator.rb

@@ -16,7 +16,7 @@ module SearchEngine
     #
     # @example
     #   rails g search_engine:model Product --collection products --attrs id:integer name:string
-    # @see https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/dx
+    # @see https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/dx
     class ModelGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('templates', __dir__)
 
@@ -31,7 +31,7 @@ module SearchEngine
 
         raise Thor::Error,
               '--collection is required. See ' \
-              'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/dx#generators--console-helpers'
+              'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/dx#generators--console-helpers'
       end
 
       def create_model

data/lib/generators/search_engine/model/templates/model.rb.tt

@@ -2,8 +2,8 @@
 
 # Minimal SearchEngine model generated by `search_engine:model`.
 # Docs:
-# - https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/quickstart
-# - https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/field-selection#guardrails--errors
+# - https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/quickstart
+# - https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/field-selection#guardrails--errors
 class SearchEngine::<%= class_name %> < SearchEngine::Base
   collection "<%= @collection_name %>"
 <% Array(@attributes).each do |(name, type)| -%>

data/lib/search_engine/admin/stopwords.rb

@@ -5,7 +5,7 @@ module SearchEngine
     # Manage stopword sets for a collection.
     #
     # @since 0.1.0
-    # @see https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/synonyms-stopwords#management
+    # @see https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/synonyms-stopwords#management
     # @see `https://typesense.org/docs/latest/api/stopwords.html`
     module Stopwords
       class << self

data/lib/search_engine/admin/synonyms.rb

@@ -5,7 +5,7 @@ module SearchEngine
     # Manage synonym sets for a collection.
     #
     # @since 0.1.0
-    # @see https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/synonyms-stopwords#management
+    # @see https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/synonyms-stopwords#management
     # @see `https://typesense.org/docs/latest/api/synonyms.html`
     module Synonyms
       class << self

data/lib/search_engine/ast/node.rb

@@ -8,7 +8,7 @@ module SearchEngine
     # #children and #each_child, and compact debug output.
     # Subclasses must implement #type and override readers as needed.
     #
-    # @see `https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/query-dsl`
+    # @see `https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/query-dsl`
     class Node
       # Maximum preview length for inspect payloads
       INSPECT_PREVIEW_LIMIT = 80

data/lib/search_engine/ast.rb

@@ -23,7 +23,7 @@ module SearchEngine
   #
   # Exposes ergonomic builders as module functions, returning immutable nodes.
   #
-  # @see `https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/query-dsl`
+  # @see `https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/query-dsl`
   module AST
     module_function
 

data/lib/search_engine/base/creation.rb

@@ -234,7 +234,7 @@ module SearchEngine
             elsif !valid
               raise SearchEngine::Errors::InvalidParams.new(
                 err,
-                doc: 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/indexer#troubleshooting',
+                doc: 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/indexer#troubleshooting',
                 details: { field: key.to_s, expected: expected, got: value.class.name }
               )
             end
@@ -338,7 +338,7 @@ module SearchEngine
             msg = "Missing required fields: #{missing.to_a.sort.inspect} for #{klass.name}."
             raise SearchEngine::Errors::InvalidParams.new(
               msg,
-              doc: 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/indexer#troubleshooting',
+              doc: 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/indexer#troubleshooting',
               details: { missing_required: missing.to_a.sort }
             )
           end
@@ -352,7 +352,7 @@ module SearchEngine
           ].join(' ')
           raise SearchEngine::Errors::InvalidField.new(
             msg,
-            doc: 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/indexer#troubleshooting',
+            doc: 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/indexer#troubleshooting',
             details: { extras: extras.to_a.sort }
           )
         end
@@ -523,7 +523,7 @@ module SearchEngine
             msg = "#{msg} (e.g., #{sample})" if sample
             raise SearchEngine::Errors::InvalidParams.new(
               msg,
-              doc: 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/indexer#troubleshooting',
+              doc: 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/indexer#troubleshooting',
               details: result
             )
           end

data/lib/search_engine/cli/doctor.rb

@@ -12,9 +12,9 @@ module SearchEngine
     # Supports FORMAT env var (table/json) and redaction-aware details.
     #
     # @since M8
-    # @see https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/cli#doctor
+    # @see https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/cli#doctor
     module Doctor
-      DOCS_BASE = 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/'
+      DOCS_BASE = 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/'
 
       module_function
 
@@ -30,7 +30,7 @@ module SearchEngine
         # Returns exit code (0 success, 1 failure).
         # @return [Integer]
         # @since M8
-        # @see https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/cli#doctor
+        # @see https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/cli#doctor
         def run
           puts 'Executing doctor checks...'
 
@@ -136,7 +136,7 @@ module SearchEngine
           ok = missing.empty?
           hint = unless ok
                    'Set TYPESENSE_* envs or configure in an initializer. ' \
-                   'See https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/installation#configuration'
+                   'See https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/installation#configuration'
                  end
 
           details = cfg.to_h_redacted
@@ -158,7 +158,7 @@ module SearchEngine
             started,
             error,
             hint: 'Unexpected error reading configuration',
-            doc: 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/configuration'
+            doc: 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/configuration'
           )
         end
 
@@ -275,7 +275,7 @@ module SearchEngine
                    nil
                  else
                    'Run schema lifecycle to create physical collections and swap alias. ' \
-                   'See https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/schema#lifecycle'
+                   'See https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/schema#lifecycle'
                  end
           details = { resolved: resolved, missing: missing }
           Builder.result_for_check(

data/lib/search_engine/client/http_adapter.rb

@@ -56,7 +56,7 @@ module SearchEngine
 
         # Fallback: attempt a generic call via low-level typesense endpoint access if available.
         # This keeps adapter permissive for future endpoints without adding Faraday here.
-        raise ArgumentError, "Unsupported request path for adapter: #{request.method} #{request.path}"
+        raise ArgumentError, "Unsupported request path for adapter: #{request.http_method} #{request.path}"
       end
     end
   end

data/lib/search_engine/client/request_builder.rb

@@ -10,7 +10,7 @@ module SearchEngine
     # Sanitizes internal-only keys before encoding to ensure the payload is
     # compatible with the Typesense API.
     #
-    # @see `https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/client`
+    # @see `https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/client`
     # @see `https://typesense.org/docs/latest/api/`
     class RequestBuilder
       # Normalized request container used by the transport adapter.
@@ -39,7 +39,7 @@ module SearchEngine
       DEFAULT_HEADERS_JSON = { 'Content-Type' => CONTENT_TYPE_JSON }.freeze
 
       # Centralized doc links used by client error mapping
-      DOC_CLIENT_ERRORS = 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/client#errors'
+      DOC_CLIENT_ERRORS = 'https://nikita-shkoda.mintlify.app/projects/search-engine-for-typesense/v30.1/client#errors'
 
       INTERNAL_ONLY_KEYS = %i[
         _join

data/lib/search_engine/client/services/base.rb

@@ -41,8 +41,8 @@ module SearchEngine
           client.__send__(:with_exception_mapping, *args, &block)
         end
 
-        def instrument(*args)
-          client.__send__(:instrument, *args)
+        def instrument(*args, **kwargs)
+          client.__send__(:instrument, *args, **kwargs)
         end
 
         def log_success(*args)

data/lib/search_engine/client/services/collections.rb

@@ -28,7 +28,7 @@ module SearchEngine
 
           raise
         ensure
-          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {})
+          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {}, request_token: start)
         end
 
         # @param collection_name [String]
@@ -54,7 +54,7 @@ module SearchEngine
 
           raise
         ensure
-          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {})
+          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {}, request_token: start)
         end
 
         # @param alias_name [String]
@@ -72,7 +72,7 @@ module SearchEngine
 
           symbolize_keys_deep(result)
         ensure
-          instrument(:put, path, (start ? (current_monotonic_ms - start) : 0.0), {})
+          instrument(:put, path, (start ? (current_monotonic_ms - start) : 0.0), {}, request_token: start)
         end
 
         # @param schema [Hash]
@@ -88,7 +88,7 @@ module SearchEngine
 
           symbolize_keys_deep(result)
         ensure
-          instrument(:post, path, (start ? (current_monotonic_ms - start) : 0.0), {})
+          instrument(:post, path, (start ? (current_monotonic_ms - start) : 0.0), {}, request_token: start)
         end
 
         # @param name [String]
@@ -106,7 +106,7 @@ module SearchEngine
 
           symbolize_keys_deep(result)
         ensure
-          instrument(:patch, path, (start ? (current_monotonic_ms - start) : 0.0), {})
+          instrument(:patch, path, (start ? (current_monotonic_ms - start) : 0.0), {}, request_token: start)
         end
 
         # @param name [String]
@@ -133,7 +133,7 @@ module SearchEngine
 
           raise
         ensure
-          instrument(:delete, path, (start ? (current_monotonic_ms - start) : 0.0), {})
+          instrument(:delete, path, (start ? (current_monotonic_ms - start) : 0.0), {}, request_token: start)
         end
 
         # @return [Array<Hash>]
@@ -153,7 +153,7 @@ module SearchEngine
 
           symbolize_keys_deep(result)
         ensure
-          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {})
+          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {}, request_token: start)
         end
       end
     end

data/lib/search_engine/client/services/documents.rb

@@ -23,7 +23,7 @@ module SearchEngine
             ts.collections[collection].documents.import(jsonl, action: action.to_s)
           end
 
-          instrument(:post, path, current_monotonic_ms - start, {})
+          instrument(:post, path, current_monotonic_ms - start, {}, request_token: start)
           result
         end
 
@@ -51,7 +51,7 @@ module SearchEngine
             ts.collections[collection].documents.delete(filter_by: filter_by)
           end
 
-          instrument(:delete, path, current_monotonic_ms - start, {})
+          instrument(:delete, path, current_monotonic_ms - start, {}, request_token: start)
           symbolize_keys_deep(result)
         end
 
@@ -84,7 +84,7 @@ module SearchEngine
 
           raise
         ensure
-          instrument(:delete, path, current_monotonic_ms - start, {}) if defined?(start)
+          instrument(:delete, path, current_monotonic_ms - start, {}, request_token: start) if defined?(start)
         end
 
         # @param collection [String]
@@ -112,7 +112,7 @@ module SearchEngine
           result = with_exception_mapping(:patch, path, {}, start) do
             ts.collections[collection].documents[s].update(fields)
           end
-          instrument(:patch, path, current_monotonic_ms - start, {})
+          instrument(:patch, path, current_monotonic_ms - start, {}, request_token: start)
           symbolize_keys_deep(result)
         end
 
@@ -142,7 +142,7 @@ module SearchEngine
             ts.collections[collection].documents.update(fields, filter_by: filter_by)
           end
 
-          instrument(:patch, path, current_monotonic_ms - start, {})
+          instrument(:patch, path, current_monotonic_ms - start, {}, request_token: start)
           symbolize_keys_deep(result)
         end
 
@@ -162,7 +162,7 @@ module SearchEngine
             typesense.collections[collection].documents.create(document)
           end
 
-          instrument(:post, path, current_monotonic_ms - start, {})
+          instrument(:post, path, current_monotonic_ms - start, {}, request_token: start)
           symbolize_keys_deep(result)
         end
 
@@ -196,7 +196,11 @@ module SearchEngine
 
           raise
         ensure
-          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {}) if defined?(start)
+          if defined?(start)
+            instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {},
+                       request_token: start
+            )
+          end
         end
 
         private

data/lib/search_engine/client/services/operations.rb

@@ -15,7 +15,7 @@ module SearchEngine
 
           symbolize_keys_deep(result)
         ensure
-          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {})
+          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {}, request_token: start)
         end
 
         def list_api_keys
@@ -37,7 +37,7 @@ module SearchEngine
 
           symbolize_keys_deep(result)
         ensure
-          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {})
+          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {}, request_token: start)
         end
 
         def clear_cache
@@ -48,7 +48,7 @@ module SearchEngine
             typesense.operations.perform('cache/clear')
           end
 
-          instrument(:post, path, current_monotonic_ms - start, {})
+          instrument(:post, path, current_monotonic_ms - start, {}, request_token: start)
           symbolize_keys_deep(result)
         end
 
@@ -75,7 +75,7 @@ module SearchEngine
             end
           end
         ensure
-          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {})
+          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {}, request_token: start)
         end
 
         # Return raw server statistics from Typesense.
@@ -101,7 +101,7 @@ module SearchEngine
             end
           end
         ensure
-          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {})
+          instrument(:get, path, (start ? (current_monotonic_ms - start) : 0.0), {}, request_token: start)
         end
 
         private

data/lib/search_engine/client/services/search.rb

@@ -21,7 +21,7 @@ module SearchEngine
 
           result = instrumented_search(collection, params_obj, cache_params, path, payload, start)
           duration = current_monotonic_ms - start
-          instrument(:post, path, duration, cache_params)
+          instrument(:post, path, duration, cache_params, request_token: start)
           log_success(:post, path, start, cache_params)
 
           klass = begin
@@ -48,7 +48,7 @@ module SearchEngine
             typesense.multi_search.perform({ searches: bodies }, common_params: cache_params)
           end
 
-          instrument(:post, path, current_monotonic_ms - start, cache_params)
+          instrument(:post, path, current_monotonic_ms - start, cache_params, request_token: start)
           symbolize_keys_deep(result)
         end
 
@@ -129,7 +129,7 @@ module SearchEngine
 
           pinned = params[:pinned_hits]
           hidden = params[:hidden_hits]
-          tags   = params[:override_tags]
+          tags   = params[:curation_tags] || params[:override_tags]
 
           pinned_count =
             case pinned