@azure/search-documents 12.3.0-beta.1 → 13.0.0

package/dist/esm/searchIndexClient.js

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 import { isTokenCredential } from "@azure/core-auth";
-import { bearerTokenAuthenticationPolicy } from "@azure/core-rest-pipeline";
-import { SearchServiceClient as GeneratedClient } from "./generated/service/searchServiceClient.js";
+import { bearerTokenAuthenticationPolicy, bearerTokenAuthenticationPolicyName, } from "@azure/core-rest-pipeline";
+import { SearchIndexClient as GeneratedClient } from "./searchIndex/searchIndexClient.js";
 import { KnowledgeRetrievalClient } from "./knowledgeRetrievalClient.js";
 import { logger } from "./logger.js";
 import { createOdataMetadataPolicy } from "./odataMetadataPolicy.js";
@@ -10,7 +10,7 @@ import { createSearchApiKeyCredentialPolicy } from "./searchApiKeyCredentialPoli
 import { KnownSearchAudience } from "./searchAudience.js";
 import { SearchClient } from "./searchClient.js";
 import * as utils from "./serviceUtils.js";
-import { createSpan } from "./tracing.js";
+import { tracingClient } from "./tracing.js";
 /**
  * Class to perform operations to manage
  * (create, update, list/delete)
@@ -64,8 +64,12 @@ export class SearchIndexClient {
         this.endpoint = endpoint;
         this.credential = credential;
         this.options = options;
+        this.serviceVersion =
+            this.options.serviceVersion ?? this.options.apiVersion ?? utils.defaultServiceVersion;
+        this.apiVersion = this.serviceVersion;
         const internalClientPipelineOptions = {
             ...this.options,
+            apiVersion: this.serviceVersion,
             ...{
                 loggingOptions: {
                     logger: logger.info,
@@ -80,11 +84,10 @@ export class SearchIndexClient {
                 },
             },
         };
-        this.serviceVersion =
-            this.options.serviceVersion ?? this.options.apiVersion ?? utils.defaultServiceVersion;
-        this.apiVersion = this.serviceVersion;
-        this.client = new GeneratedClient(this.endpoint, this.serviceVersion, internalClientPipelineOptions);
+        this.client = new GeneratedClient(this.endpoint, credential, internalClientPipelineOptions);
         this.pipeline = this.client.pipeline;
+        // Replaced with a custom policy below
+        this.pipeline.removePolicy({ name: bearerTokenAuthenticationPolicyName });
         if (isTokenCredential(credential)) {
             const scope = this.options.audience
                 ? `${this.options.audience}/.default`
@@ -96,112 +99,19 @@ export class SearchIndexClient {
         }
         this.client.pipeline.addPolicy(createOdataMetadataPolicy("minimal"));
     }
-    async *listIndexesPage(options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-listIndexesPage", options);
-        try {
-            const result = await this.client.indexes.list(updatedOptions);
-            const mapped = result.indexes.map(utils.generatedIndexToPublicIndex);
-            yield mapped;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
-    }
-    async *listIndexesAll(options = {}) {
-        for await (const page of this.listIndexesPage(options)) {
-            yield* page;
-        }
-    }
     /**
      * Retrieves a list of existing indexes in the service.
      * @param options - Options to the list index operation.
      */
     listIndexes(options = {}) {
-        const iter = this.listIndexesAll(options);
-        return {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: () => {
-                return this.listIndexesPage(options);
-            },
-        };
-    }
-    async *listAliasesPage(options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-listAliases", options);
-        try {
-            const result = await this.client.aliases.list(updatedOptions);
-            yield result.aliases;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
-    }
-    async *listAliasesAll(options = {}) {
-        for await (const page of this.listAliasesPage(options)) {
-            yield* page;
-        }
+        return utils.mapPagedAsyncIterable(this.client.listIndexes(options), utils.generatedIndexToPublicIndex);
     }
     /**
      * Lists all aliases available for a search service.
      * @param options - The options parameters.
      */
     listAliases(options = {}) {
-        const iter = this.listAliasesAll(options);
-        return {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: () => {
-                return this.listAliasesPage(options);
-            },
-        };
-    }
-    async *listIndexesNamesPage(options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-listIndexesNamesPage", options);
-        try {
-            const result = await this.client.indexes.list({
-                ...updatedOptions,
-                select: "name",
-            });
-            const mapped = result.indexes.map((idx) => idx.name);
-            yield mapped;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
-    }
-    async *listIndexesNamesAll(options = {}) {
-        for await (const page of this.listIndexesNamesPage(options)) {
-            yield* page;
-        }
+        return this.client.listAliases(options);
     }
     /**
      * Retrieves a list of names of existing indexes in the service.
@@ -209,39 +119,17 @@ export class SearchIndexClient {
      */
     // eslint-disable-next-line @azure/azure-sdk/ts-naming-options
     listIndexesNames(options = {}) {
-        const iter = this.listIndexesNamesAll(options);
-        return {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: () => {
-                return this.listIndexesNamesPage(options);
-            },
-        };
+        return utils.mapPagedAsyncIterable(this.client.listIndexesWithSelectedProperties({ ...options, select: "name" }), (idx) => idx.name);
     }
     /**
      * Retrieves a list of existing SynonymMaps in the service.
      * @param options - Options to the list SynonymMaps operation.
      */
     async listSynonymMaps(options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-listSynonymMaps", options);
-        try {
-            const result = await this.client.synonymMaps.list(updatedOptions);
+        return tracingClient.withSpan("SearchIndexClient-listSynonymMaps", options, async (updatedOptions) => {
+            const result = await this.client.getSynonymMaps(updatedOptions);
             return result.synonymMaps.map(utils.generatedSynonymMapToPublicSynonymMap);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Retrieves a list of names of existing SynonymMaps in the service.
@@ -249,24 +137,13 @@ export class SearchIndexClient {
      */
     // eslint-disable-next-line @azure/azure-sdk/ts-naming-options
     async listSynonymMapsNames(options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-listSynonymMapsNames", options);
-        try {
-            const result = await this.client.synonymMaps.list({
+        return tracingClient.withSpan("SearchIndexClient-listSynonymMapsNames", options, async (updatedOptions) => {
+            const result = await this.client.getSynonymMaps({
                 ...updatedOptions,
                 select: "name",
             });
             return result.synonymMaps.map((sm) => sm.name);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Retrieves information about an index.
@@ -274,21 +151,10 @@ export class SearchIndexClient {
      * @param options - Additional optional arguments.
      */
     async getIndex(indexName, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-getIndex", options);
-        try {
-            const result = await this.client.indexes.get(indexName, updatedOptions);
+        return tracingClient.withSpan("SearchIndexClient-getIndex", options, async (updatedOptions) => {
+            const result = await this.client.getIndex(indexName, updatedOptions);
             return utils.generatedIndexToPublicIndex(result);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Retrieves information about a SynonymMap.
@@ -298,21 +164,10 @@ export class SearchIndexClient {
     async getSynonymMap(synonymMapName, 
     // eslint-disable-next-line @azure/azure-sdk/ts-naming-options
     options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-getSynonymMaps", options);
-        try {
-            const result = await this.client.synonymMaps.get(synonymMapName, updatedOptions);
+        return tracingClient.withSpan("SearchIndexClient-getSynonymMap", options, async (updatedOptions) => {
+            const result = await this.client.getSynonymMap(synonymMapName, updatedOptions);
             return utils.generatedSynonymMapToPublicSynonymMap(result);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a new index.
@@ -320,21 +175,11 @@ export class SearchIndexClient {
      * @param options - Additional optional arguments.
      */
     async createIndex(index, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-createIndex", options);
-        try {
-            const result = await this.client.indexes.create(utils.publicIndexToGeneratedIndex(index), updatedOptions);
+        return tracingClient.withSpan("SearchIndexClient-createIndex", options, async (updatedOptions) => {
+            const result = await this.client.createIndex(utils.publicIndexToGeneratedIndex(index), updatedOptions);
+            this.client.pipeline.removePolicy({ name: "debugPolicy" });
             return utils.generatedIndexToPublicIndex(result);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a new SynonymMap in a search service.
@@ -342,21 +187,10 @@ export class SearchIndexClient {
      * @param options - Additional optional arguments.
      */
     async createSynonymMap(synonymMap, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-createSynonymMaps", options);
-        try {
-            const result = await this.client.synonymMaps.create(utils.publicSynonymMapToGeneratedSynonymMap(synonymMap), updatedOptions);
+        return tracingClient.withSpan("SearchIndexClient-createSynonymMaps", options, async (updatedOptions) => {
+            const result = await this.client.createSynonymMap(utils.publicSynonymMapToGeneratedSynonymMap(synonymMap), updatedOptions);
             return utils.generatedSynonymMapToPublicSynonymMap(result);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a new index or modifies an existing one.
@@ -364,25 +198,11 @@ export class SearchIndexClient {
      * @param options - Additional optional arguments.
      */
     async createOrUpdateIndex(index, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-createOrUpdateIndex", options);
-        try {
+        return tracingClient.withSpan("SearchIndexClient-createOrUpdateIndex", options, async (updatedOptions) => {
             const etag = options.onlyIfUnchanged ? index.etag : undefined;
-            const result = await this.client.indexes.createOrUpdate(index.name, utils.publicIndexToGeneratedIndex(index), {
-                ...updatedOptions,
-                ifMatch: etag,
-            });
+            const result = await this.client.createOrUpdateIndex(utils.publicIndexToGeneratedIndex(index), index.name, { ...updatedOptions, ifMatch: etag });
             return utils.generatedIndexToPublicIndex(result);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a new SynonymMap or modifies an existing one.
@@ -390,46 +210,24 @@ export class SearchIndexClient {
      * @param options - Additional optional arguments.
      */
     async createOrUpdateSynonymMap(synonymMap, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-createOrUpdateSynonymMap", options);
-        try {
+        return tracingClient.withSpan("SearchIndexClient-createOrUpdateSynonymMap", options, async (updatedOptions) => {
             const etag = options.onlyIfUnchanged ? synonymMap.etag : undefined;
-            const result = await this.client.synonymMaps.createOrUpdate(synonymMap.name, utils.publicSynonymMapToGeneratedSynonymMap(synonymMap), {
+            const result = await this.client.createOrUpdateSynonymMap(utils.publicSynonymMapToGeneratedSynonymMap(synonymMap), synonymMap.name, {
                 ...updatedOptions,
                 ifMatch: etag,
             });
             return utils.generatedSynonymMapToPublicSynonymMap(result);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     async deleteIndex(index, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-deleteIndex", options);
-        try {
+        return tracingClient.withSpan("SearchIndexClient-deleteIndex", options, async (updatedOptions) => {
             const indexName = typeof index === "string" ? index : index.name;
             const etag = typeof index === "string" ? undefined : options.onlyIfUnchanged ? index.etag : undefined;
-            await this.client.indexes.delete(indexName, {
+            await this.client.deleteIndex(indexName, {
                 ...updatedOptions,
                 ifMatch: etag,
             });
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Deletes an existing SynonymMap.
@@ -437,29 +235,18 @@ export class SearchIndexClient {
      * @param options - Additional optional arguments.
      */
     async deleteSynonymMap(synonymMap, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-deleteSynonymMap", options);
-        try {
+        return tracingClient.withSpan("SearchIndexClient-deleteSynonymMap", options, async (updatedOptions) => {
             const synonymMapName = typeof synonymMap === "string" ? synonymMap : synonymMap.name;
             const etag = typeof synonymMap === "string"
                 ? undefined
                 : options.onlyIfUnchanged
                     ? synonymMap.etag
                     : undefined;
-            await this.client.synonymMaps.delete(synonymMapName, {
+            await this.client.deleteSynonymMap(synonymMapName, {
                 ...updatedOptions,
                 ifMatch: etag,
             });
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a new search alias or updates an alias if it already exists.
@@ -467,25 +254,13 @@ export class SearchIndexClient {
      * @param options - The options parameters.
      */
     async createOrUpdateAlias(alias, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-createOrUpdateAlias", options);
-        try {
+        return tracingClient.withSpan("SearchIndexClient-createOrUpdateAlias", options, async (updatedOptions) => {
             const etag = options.onlyIfUnchanged ? alias.etag : undefined;
-            const result = await this.client.aliases.createOrUpdate(alias.name, alias, {
+            return this.client.createOrUpdateAlias(alias, alias.name, {
                 ...updatedOptions,
                 ifMatch: etag,
             });
-            return result;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a new search alias.
@@ -493,42 +268,19 @@ export class SearchIndexClient {
      * @param options - The options parameters.
      */
     async createAlias(alias, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-createAlias", options);
-        try {
-            const result = await this.client.aliases.create(alias, updatedOptions);
-            return result;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("SearchIndexClient-createAlias", options, async (updatedOptions) => {
+            return this.client.createAlias(alias, updatedOptions);
+        });
     }
     async deleteAlias(alias, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-deleteAlias", options);
-        try {
+        return tracingClient.withSpan("SearchIndexClient-deleteAlias", options, async (updatedOptions) => {
             const aliasName = typeof alias === "string" ? alias : alias.name;
             const etag = typeof alias === "string" ? undefined : options.onlyIfUnchanged ? alias.etag : undefined;
-            await this.client.aliases.delete(aliasName, {
+            await this.client.deleteAlias(aliasName, {
                 ...updatedOptions,
                 ifMatch: etag,
             });
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Retrieves an alias definition.
@@ -536,21 +288,9 @@ export class SearchIndexClient {
      * @param options - The options parameters.
      */
     async getAlias(aliasName, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-getAlias", options);
-        try {
-            const result = await this.client.aliases.get(aliasName, updatedOptions);
-            return result;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("SearchIndexClient-getAlias", options, async (updatedOptions) => {
+            return this.client.getAlias(aliasName, updatedOptions);
+        });
     }
     /**
      * Retrieves statistics about an index, such as the count of documents and the size
@@ -559,21 +299,9 @@ export class SearchIndexClient {
      * @param options - Additional optional arguments.
      */
     async getIndexStatistics(indexName, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-getIndexStatistics", options);
-        try {
-            const result = await this.client.indexes.getStatistics(indexName, updatedOptions);
-            return result;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("SearchIndexClient-getIndexStatistics", options, async (updatedOptions) => {
+            return this.client.getIndexStatistics(indexName, updatedOptions);
+        });
     }
     /**
      * Calls an analyzer or tokenizer manually on provided text.
@@ -582,110 +310,35 @@ export class SearchIndexClient {
      * @param options - Additional arguments
      */
     async analyzeText(indexName, options) {
-        const { abortSignal, requestOptions, tracingOptions, analyzerName: analyzer, tokenizerName: tokenizer, ...restOptions } = options;
+        const { abortSignal, requestOptions, tracingOptions, ...restOptions } = options;
         const operationOptions = {
             abortSignal,
             requestOptions,
             tracingOptions,
         };
-        const { span, updatedOptions } = createSpan("SearchIndexClient-analyzeText", operationOptions);
-        try {
-            const result = await this.client.indexes.analyze(indexName, { ...restOptions, analyzer, tokenizer }, updatedOptions);
-            return result;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("SearchIndexClient-analyzeText", operationOptions, async (updatedOptions) => {
+            return this.client.analyzeText({ ...restOptions }, indexName, updatedOptions);
+        });
     }
     /**
      * Retrieves statistics about the service, such as the count of documents, index, etc.
      * @param options - Additional optional arguments.
      */
     async getServiceStatistics(options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-getServiceStatistics", options);
-        try {
-            const result = await this.client.getServiceStatistics(updatedOptions);
-            return result;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
-    }
-    async *getIndexStatsSummaryPage(options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-getIndexStatsSummaryPage", options);
-        try {
-            const { indexesStatistics } = await this.client.getIndexStatsSummary(updatedOptions);
-            yield indexesStatistics;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
-    }
-    async *getIndexStatsSummaryAll(options = {}) {
-        for await (const page of this.getIndexStatsSummaryPage(options)) {
-            yield* page;
-        }
-    }
-    /**
-     * Retrieves a list of existing indexes in the service.
-     * @param options - Options to the list index operation.
-     */
-    getIndexStatsSummary(options = {}) {
-        const iter = this.getIndexStatsSummaryAll(options);
-        return {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: () => {
-                return this.getIndexStatsSummaryPage(options);
-            },
-        };
+        return tracingClient.withSpan("SearchIndexClient-getServiceStatistics", options, async (updatedOptions) => {
+            return this.client.getServiceStatistics(updatedOptions);
+        });
     }
     /**
      * Creates a new knowledgebase.
      * @param knowledgeBase - definition of the knowledgebase to create.
      * @param options - options parameters.
      */
-    async createKnowledgeBase(knowledgeBase, options) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-createKnowledgeBase", options);
-        try {
-            const result = await this.client.knowledgeBases.create(utils.convertKnowledgeBaseToGenerated(knowledgeBase), updatedOptions);
+    async createKnowledgeBase(knowledgeBase, options = {}) {
+        return tracingClient.withSpan("SearchIndexClient-createKnowledgeBase", options, async (updatedOptions) => {
+            const result = await this.client.createKnowledgeBase(utils.convertKnowledgeBaseToGenerated(knowledgeBase), updatedOptions);
             return utils.convertKnowledgeBaseToPublic(result);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Creates a new knowledge base or updates a knowledge base if it already exists.
@@ -693,263 +346,102 @@ export class SearchIndexClient {
      * @param knowledgeBase - definition of the knowledge base to create or update.
      * @param options - options parameters.
      */
-    async createOrUpdateKnowledgeBase(knowledgeBaseName, knowledgeBase, options) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-createOrUpdateKnowledgeBase", options);
-        try {
-            const etag = updatedOptions.onlyIfUnchanged ? knowledgeBase.etag : undefined;
-            const result = await this.client.knowledgeBases.createOrUpdate(knowledgeBaseName, utils.convertKnowledgeBaseToGenerated(knowledgeBase), {
+    async createOrUpdateKnowledgeBase(knowledgeBaseName, knowledgeBase, options = {}) {
+        return tracingClient.withSpan("SearchIndexClient-createOrUpdateKnowledgeBase", options, async (updatedOptions) => {
+            const etag = options.onlyIfUnchanged ? knowledgeBase.etag : undefined;
+            const result = await this.client.createOrUpdateKnowledgeBase(utils.convertKnowledgeBaseToGenerated(knowledgeBase), knowledgeBaseName, {
                 ...updatedOptions,
                 ifMatch: etag,
             });
             return utils.convertKnowledgeBaseToPublic(result);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Retrieves a knowledge base definition.
      * @param knowledgeBaseName - name of the knowledge base to retrieve.
      * @param options - options parameters.
      */
-    async getKnowledgeBase(knowledgeBaseName, options) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-getKnowledgeBase", options);
-        try {
-            const result = await this.client.knowledgeBases.get(knowledgeBaseName, updatedOptions);
+    async getKnowledgeBase(knowledgeBaseName, options = {}) {
+        return tracingClient.withSpan("SearchIndexClient-getKnowledgeBase", options, async (updatedOptions) => {
+            const result = await this.client.getKnowledgeBase(knowledgeBaseName, updatedOptions);
             return utils.convertKnowledgeBaseToPublic(result);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
-    }
-    async *listKnowledgeBasesPage(options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-listKnowledgeBasesPage", options);
-        try {
-            const { knowledgeBases } = await this.client.knowledgeBases.list(updatedOptions);
-            const mapped = knowledgeBases.map((base) => utils.convertKnowledgeBaseToPublic(base));
-            yield mapped;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
-    }
-    async *listKnowledgeBasesAll(options = {}) {
-        for await (const page of this.listKnowledgeBasesPage(options)) {
-            yield* page;
-        }
+        });
     }
     /**
      * Retrieves a list of existing KnowledgeBases in the service.
      * @param options - Options to the list knowledge bases operation.
      */
     listKnowledgeBases(options = {}) {
-        const iter = this.listKnowledgeBasesAll(options);
-        return {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: () => {
-                return this.listKnowledgeBasesPage(options);
-            },
-        };
+        return utils.mapPagedAsyncIterable(this.client.listKnowledgeBases(options), utils.convertKnowledgeBaseToPublic);
     }
-    async deleteKnowledgeBase(knowledgeBase, options) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-deleteKnowledgeBase", options);
-        try {
+    async deleteKnowledgeBase(knowledgeBase, options = {}) {
+        return tracingClient.withSpan("SearchIndexClient-deleteKnowledgeBase", options, async (updatedOptions) => {
             const knowledgeBaseName = typeof knowledgeBase === "string" ? knowledgeBase : knowledgeBase.name;
-            const etag = typeof knowledgeBase !== "string" && updatedOptions.onlyIfUnchanged
+            const etag = typeof knowledgeBase !== "string" && options.onlyIfUnchanged
                 ? knowledgeBase.etag
                 : undefined;
-            const result = await this.client.knowledgeBases.delete(knowledgeBaseName, {
+            const result = await this.client.deleteKnowledgeBase(knowledgeBaseName, {
                 ...updatedOptions,
                 ifMatch: etag,
             });
             return result;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
-    async createOrUpdateKnowledgeSource(sourceName, knowledgeSource, options) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-createOrUpdateKnowledgeSource", options);
-        try {
-            const etag = updatedOptions.onlyIfUnchanged ? knowledgeSource.etag : undefined;
-            const result = await this.client.knowledgeSources.createOrUpdate(sourceName, utils.convertKnowledgeSourceToGenerated(knowledgeSource), {
+    async createOrUpdateKnowledgeSource(knowledgeSource, options = {}) {
+        return tracingClient.withSpan("SearchIndexClient-createOrUpdateKnowledgeSource", options, async (updatedOptions) => {
+            const etag = options.onlyIfUnchanged ? knowledgeSource.etag : undefined;
+            const result = await this.client.createOrUpdateKnowledgeSource(utils.convertKnowledgeSourceToGenerated(knowledgeSource), knowledgeSource.name, {
                 ...updatedOptions,
                 ifMatch: etag,
             });
             return utils.convertKnowledgeSourceToPublic(result);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
-    async deleteKnowledgeSource(source, options) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-deleteKnowledgeSource", options);
-        try {
+    async deleteKnowledgeSource(source, options = {}) {
+        return tracingClient.withSpan("SearchIndexClient-deleteKnowledgeSource", options, async (updatedOptions) => {
             const sourceName = typeof source === "string" ? source : source.name;
-            const etag = typeof source !== "string" && updatedOptions.onlyIfUnchanged ? source.etag : undefined;
-            const result = await this.client.knowledgeSources.delete(sourceName, {
-                ...updatedOptions,
-                ifMatch: etag,
-            });
-            return result;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+            const etag = typeof source !== "string" && options.onlyIfUnchanged ? source.etag : undefined;
+            return this.client.deleteKnowledgeSource(sourceName, { ...updatedOptions, ifMatch: etag });
+        });
     }
     /**
      * Retrieves a knowledge source definition.
      * @param sourceName - The name of the knowledge source to retrieve.
      * @param options - The options parameters.
      */
-    async getKnowledgeSource(sourceName, options) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-getKnowledgeSource", options);
-        try {
-            const result = await this.client.knowledgeSources.get(sourceName, updatedOptions);
+    async getKnowledgeSource(sourceName, options = {}) {
+        return tracingClient.withSpan("SearchIndexClient-getKnowledgeSource", options, async (updatedOptions) => {
+            const result = await this.client.getKnowledgeSource(sourceName, updatedOptions);
             return utils.convertKnowledgeSourceToPublic(result);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
-    }
-    async *listKnowledgeSourcesPage(options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-listKnowledgeSourcesPage", options);
-        try {
-            const { knowledgeSources } = await this.client.knowledgeSources.list(updatedOptions);
-            const mapped = knowledgeSources.map((source) => utils.convertKnowledgeSourceToPublic(source));
-            yield mapped;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
-    }
-    async *listKnowledgeSourcesAll(options = {}) {
-        for await (const page of this.listKnowledgeSourcesPage(options)) {
-            yield* page;
-        }
+        });
     }
     /**
      * Retrieves a list of existing KnowledgeSources in the service.
      * @param options - Options to the list knowledge sources operation.
      */
     listKnowledgeSources(options = {}) {
-        const iter = this.listKnowledgeSourcesAll(options);
-        return {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: () => {
-                return this.listKnowledgeSourcesPage(options);
-            },
-        };
+        return utils.mapPagedAsyncIterable(this.client.listKnowledgeSources(options), (ks) => utils.convertKnowledgeSourceToPublic(ks));
     }
     /**
      * Creates a new knowledge source.
      * @param knowledgeSource - The definition of the knowledge source to create.
      * @param options - The options parameters.
      */
-    async createKnowledgeSource(knowledgeSource, options) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-createKnowledgeSource", options);
-        try {
-            const result = await this.client.knowledgeSources.create(utils.convertKnowledgeSourceToGenerated(knowledgeSource), updatedOptions);
+    async createKnowledgeSource(knowledgeSource, options = {}) {
+        return tracingClient.withSpan("SearchIndexClient-createKnowledgeSource", options, async (updatedOptions) => {
+            const result = await this.client.createKnowledgeSource(utils.convertKnowledgeSourceToGenerated(knowledgeSource), updatedOptions);
             return utils.convertKnowledgeSourceToPublic(result);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Returns the current status and synchronization history of a knowledge source.
      * @param sourceName - The name of the knowledge source for which to retrieve status.
      * @param options - The options parameters.
      */
-    async getKnowledgeSourceStatus(sourceName, options) {
-        const { span, updatedOptions } = createSpan("SearchIndexClient-getKnowledgeSourceStatus", options);
-        try {
-            const result = await this.client.knowledgeSources.getStatus(sourceName, updatedOptions);
-            return result;
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+    async getKnowledgeSourceStatus(sourceName, options = {}) {
+        return tracingClient.withSpan("SearchIndexClient-getKnowledgeSourceStatus", options, async (updatedOptions) => {
+            return this.client.getKnowledgeSourceStatus(sourceName, updatedOptions);
+        });
     }
     /**
      * Retrieves the SearchClient corresponding to this SearchIndexClient