@azure/eventgrid 4.9.1-alpha.20220408.2 → 4.10.0-alpha.20220412.2

package/dist-esm/src/eventGridClient.js

@@ -6,8 +6,7 @@ import { DEFAULT_EVENTGRID_SCOPE } from "./constants";
 import { cloudEventReservedPropertyNames, } from "./models";
 import { GeneratedClient } from "./generated/generatedClient";
 import { cloudEventDistributedTracingEnricherPolicy } from "./cloudEventDistrubtedTracingEnricherPolicy";
-import { createSpan } from "./tracing";
-import { SpanStatusCode } from "@azure/core-tracing";
+import { tracingClient } from "./tracing";
 import { v4 as uuidv4 } from "uuid";
 import { bearerTokenAuthenticationPolicy, tracingPolicyName } from "@azure/core-rest-pipeline";
 /**
@@ -52,31 +51,23 @@ export class EventGridPublisherClient {
      * @param events - The events to send. The events should be in the schema used when constructing the client.
      * @param options - Options to control the underlying operation.
      */
-    async send(events, options) {
-        const { span, updatedOptions } = createSpan("EventGridPublisherClient-send", options || {});
-        try {
+    send(events, options = {}) {
+        return tracingClient.withSpan("EventGridPublisherClient.send", options, (updatedOptions) => {
             switch (this.inputSchema) {
                 case "EventGrid": {
-                    return await this.client.publishEvents(this.endpointUrl, events.map(convertEventGridEventToModelType), updatedOptions);
+                    return this.client.publishEvents(this.endpointUrl, events.map(convertEventGridEventToModelType), updatedOptions);
                 }
                 case "CloudEvent": {
-                    return await this.client.publishCloudEventEvents(this.endpointUrl, events.map(convertCloudEventToModelType), updatedOptions);
+                    return this.client.publishCloudEventEvents(this.endpointUrl, events.map(convertCloudEventToModelType), updatedOptions);
                 }
                 case "Custom": {
-                    return await this.client.publishCustomEventEvents(this.endpointUrl, events, updatedOptions);
+                    return this.client.publishCustomEventEvents(this.endpointUrl, events, updatedOptions);
                 }
                 default: {
                     throw new Error(`Unknown input schema type '${this.inputSchema}'`);
                 }
             }
-        }
-        catch (e) {
-            span.setStatus({ code: SpanStatusCode.ERROR, message: e.message });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 /**

package/dist-esm/src/eventGridClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"eventGridClient.js","sourceRoot":"","sources":["../../src/eventGridClient.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT license.\n\nimport { isTokenCredential, KeyCredential, SASCredential } from \"@azure/core-auth\";\nimport { OperationOptions, CommonClientOptions } from \"@azure/core-client\";\n\nimport { eventGridCredentialPolicy } from \"./eventGridAuthenticationPolicy\";\nimport { DEFAULT_EVENTGRID_SCOPE } from \"./constants\";\nimport {\n  SendCloudEventInput,\n  SendEventGridEventInput,\n  cloudEventReservedPropertyNames,\n} from \"./models\";\nimport { GeneratedClient } from \"./generated/generatedClient\";\nimport {\n  CloudEvent as CloudEventWireModel,\n  EventGridEvent as EventGridEventWireModel,\n} from \"./generated/models\";\nimport { cloudEventDistributedTracingEnricherPolicy } from \"./cloudEventDistrubtedTracingEnricherPolicy\";\nimport { createSpan } from \"./tracing\";\nimport { SpanStatusCode } from \"@azure/core-tracing\";\nimport { v4 as uuidv4 } from \"uuid\";\nimport { TokenCredential } from \"@azure/core-auth\";\nimport { bearerTokenAuthenticationPolicy, tracingPolicyName } from \"@azure/core-rest-pipeline\";\n\n/**\n * Options for the Event Grid Client.\n */\nexport type EventGridPublisherClientOptions = CommonClientOptions;\n\n/**\n * Options for the send events operation.\n */\nexport type SendOptions = OperationOptions;\n\n/**\n * A map of input schema names to shapes of the input for the send method on EventGridPublisherClient.\n */\nexport interface InputSchemaToInputTypeMap {\n  /**\n   * The shape of the input to `send` when the client is configured to send events using the Event Grid schema.\n   */\n  EventGrid: SendEventGridEventInput<unknown>;\n  /**\n   * The shape of the input to `send` when the client is configured to send events using the Cloud Event schema.\n   */\n  CloudEvent: SendCloudEventInput<unknown>;\n  /**\n   * The shape of the input to `send` when the client is configured to send events using a custom schema.\n   */\n\n  Custom: Record<string, unknown>;\n}\n\n/**\n * Allowed schema types, to be used when constructing the EventGridPublisherClient.\n */\nexport type InputSchema = keyof InputSchemaToInputTypeMap;\n\n/**\n * Client class for publishing events to the Event Grid Service.\n */\nexport class EventGridPublisherClient<T extends InputSchema> {\n  /**\n   * The URL to the Event Grid endpoint.\n   */\n  public readonly endpointUrl: string;\n\n  /**\n   * The version of the Even Grid service.\n   */\n  public readonly apiVersion: string;\n\n  /**\n   * The AutoRest generated client for the EventGrid dataplane.\n   */\n  private readonly client: GeneratedClient;\n\n  /**\n   * The schema that will be used when sending events.\n   */\n  private readonly inputSchema: InputSchema;\n\n  /**\n   * Creates an instance of EventGridPublisherClient which sends events using the Event Grid Schema.\n   *\n   * Example usage:\n   * ```ts\n   * import { EventGridPublisherClient, AzureKeyCredential } from \"@azure/eventgrid\";\n   *\n   * const client = new EventGridPublisherClient(\n   *    \"<service endpoint>\",\n   *    \"EventGrid\",\n   *    new AzureKeyCredential(\"<api key>\")\n   * );\n   * ```\n   *\n   * @param endpointUrl - The URL to the Event Grid endpoint, e.g. https://eg-topic.westus2-1.eventgrid.azure.net/api/events.\n   * @param inputSchema - The schema that the Event Grid endpoint is configured to accept. One of \"EventGrid\", \"CloudEvent\", or \"Custom\".\n   * @param credential - Used to authenticate requests to the service.\n   * @param options - Used to configure the Event Grid Client.\n   */\n  constructor(\n    endpointUrl: string,\n    inputSchema: T,\n    credential: KeyCredential | SASCredential | TokenCredential,\n    options: EventGridPublisherClientOptions = {}\n  ) {\n    this.endpointUrl = endpointUrl;\n    this.inputSchema = inputSchema;\n\n    this.client = new GeneratedClient(options);\n\n    const authPolicy = isTokenCredential(credential)\n      ? bearerTokenAuthenticationPolicy({ credential, scopes: DEFAULT_EVENTGRID_SCOPE })\n      : eventGridCredentialPolicy(credential);\n\n    this.client.pipeline.addPolicy(authPolicy);\n    this.client.pipeline.addPolicy(cloudEventDistributedTracingEnricherPolicy(), {\n      afterPolicies: [tracingPolicyName],\n    });\n    this.apiVersion = this.client.apiVersion;\n  }\n\n  /**\n   * Sends events to a topic.\n   *\n   * @param events - The events to send. The events should be in the schema used when constructing the client.\n   * @param options - Options to control the underlying operation.\n   */\n  async send(events: InputSchemaToInputTypeMap[T][], options?: SendOptions): Promise<void> {\n    const { span, updatedOptions } = createSpan(\"EventGridPublisherClient-send\", options || {});\n\n    try {\n      switch (this.inputSchema) {\n        case \"EventGrid\": {\n          return await this.client.publishEvents(\n            this.endpointUrl,\n            (events as InputSchemaToInputTypeMap[\"EventGrid\"][]).map(\n              convertEventGridEventToModelType\n            ),\n            updatedOptions\n          );\n        }\n        case \"CloudEvent\": {\n          return await this.client.publishCloudEventEvents(\n            this.endpointUrl,\n            (events as InputSchemaToInputTypeMap[\"CloudEvent\"][]).map(convertCloudEventToModelType),\n            updatedOptions\n          );\n        }\n        case \"Custom\": {\n          return await this.client.publishCustomEventEvents(\n            this.endpointUrl,\n            events as InputSchemaToInputTypeMap[\"Custom\"][],\n            updatedOptions\n          );\n        }\n        default: {\n          throw new Error(`Unknown input schema type '${this.inputSchema}'`);\n        }\n      }\n    } catch (e) {\n      span.setStatus({ code: SpanStatusCode.ERROR, message: e.message });\n      throw e;\n    } finally {\n      span.end();\n    }\n  }\n}\n\n/**\n * @internal\n */\nexport function convertEventGridEventToModelType(\n  event: SendEventGridEventInput<any>\n): EventGridEventWireModel {\n  return {\n    eventType: event.eventType,\n    eventTime: event.eventTime ?? new Date(),\n    id: event.id ?? uuidv4(),\n    subject: event.subject,\n    topic: event.topic,\n    data: event.data,\n    dataVersion: event.dataVersion,\n  };\n}\n\n/**\n * @internal\n */\nexport function convertCloudEventToModelType(event: SendCloudEventInput<any>): CloudEventWireModel {\n  if (event.extensionAttributes) {\n    for (const propName in event.extensionAttributes) {\n      // Per the cloud events spec: \"CloudEvents attribute names MUST consist of lower-case letters ('a' to 'z') or digits ('0' to '9') from the ASCII character set\"\n      // they also can not match an existing defined property name.\n\n      if (\n        !/^[a-z0-9]*$/.test(propName) ||\n        cloudEventReservedPropertyNames.indexOf(propName) !== -1\n      ) {\n        throw new Error(`invalid extension attribute name: ${propName}`);\n      }\n    }\n  }\n\n  const converted: CloudEventWireModel = {\n    specversion: \"1.0\",\n    type: event.type,\n    source: event.source,\n    id: event.id ?? uuidv4(),\n    time: event.time ?? new Date(),\n    subject: event.subject,\n    dataschema: event.dataschema,\n    ...(event.extensionAttributes ?? []),\n  };\n\n  if (event.data instanceof Uint8Array) {\n    if (!event.datacontenttype) {\n      throw new Error(\n        \"a data content type must be provided when sending an event with binary data\"\n      );\n    }\n\n    converted.datacontenttype = event.datacontenttype;\n    converted.dataBase64 = event.data;\n  } else {\n    converted.datacontenttype = event.datacontenttype ?? \"application/json\";\n    converted.data = event.data;\n  }\n\n  return converted;\n}\n"]}
+{"version":3,"file":"eventGridClient.js","sourceRoot":"","sources":["../../src/eventGridClient.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT license.\n\nimport { isTokenCredential, KeyCredential, SASCredential } from \"@azure/core-auth\";\nimport { OperationOptions, CommonClientOptions } from \"@azure/core-client\";\n\nimport { eventGridCredentialPolicy } from \"./eventGridAuthenticationPolicy\";\nimport { DEFAULT_EVENTGRID_SCOPE } from \"./constants\";\nimport {\n  SendCloudEventInput,\n  SendEventGridEventInput,\n  cloudEventReservedPropertyNames,\n} from \"./models\";\nimport { GeneratedClient } from \"./generated/generatedClient\";\nimport {\n  CloudEvent as CloudEventWireModel,\n  EventGridEvent as EventGridEventWireModel,\n} from \"./generated/models\";\nimport { cloudEventDistributedTracingEnricherPolicy } from \"./cloudEventDistrubtedTracingEnricherPolicy\";\nimport { tracingClient } from \"./tracing\";\nimport { v4 as uuidv4 } from \"uuid\";\nimport { TokenCredential } from \"@azure/core-auth\";\nimport { bearerTokenAuthenticationPolicy, tracingPolicyName } from \"@azure/core-rest-pipeline\";\n\n/**\n * Options for the Event Grid Client.\n */\nexport type EventGridPublisherClientOptions = CommonClientOptions;\n\n/**\n * Options for the send events operation.\n */\nexport type SendOptions = OperationOptions;\n\n/**\n * A map of input schema names to shapes of the input for the send method on EventGridPublisherClient.\n */\nexport interface InputSchemaToInputTypeMap {\n  /**\n   * The shape of the input to `send` when the client is configured to send events using the Event Grid schema.\n   */\n  EventGrid: SendEventGridEventInput<unknown>;\n  /**\n   * The shape of the input to `send` when the client is configured to send events using the Cloud Event schema.\n   */\n  CloudEvent: SendCloudEventInput<unknown>;\n  /**\n   * The shape of the input to `send` when the client is configured to send events using a custom schema.\n   */\n\n  Custom: Record<string, unknown>;\n}\n\n/**\n * Allowed schema types, to be used when constructing the EventGridPublisherClient.\n */\nexport type InputSchema = keyof InputSchemaToInputTypeMap;\n\n/**\n * Client class for publishing events to the Event Grid Service.\n */\nexport class EventGridPublisherClient<T extends InputSchema> {\n  /**\n   * The URL to the Event Grid endpoint.\n   */\n  public readonly endpointUrl: string;\n\n  /**\n   * The version of the Even Grid service.\n   */\n  public readonly apiVersion: string;\n\n  /**\n   * The AutoRest generated client for the EventGrid dataplane.\n   */\n  private readonly client: GeneratedClient;\n\n  /**\n   * The schema that will be used when sending events.\n   */\n  private readonly inputSchema: InputSchema;\n\n  /**\n   * Creates an instance of EventGridPublisherClient which sends events using the Event Grid Schema.\n   *\n   * Example usage:\n   * ```ts\n   * import { EventGridPublisherClient, AzureKeyCredential } from \"@azure/eventgrid\";\n   *\n   * const client = new EventGridPublisherClient(\n   *    \"<service endpoint>\",\n   *    \"EventGrid\",\n   *    new AzureKeyCredential(\"<api key>\")\n   * );\n   * ```\n   *\n   * @param endpointUrl - The URL to the Event Grid endpoint, e.g. https://eg-topic.westus2-1.eventgrid.azure.net/api/events.\n   * @param inputSchema - The schema that the Event Grid endpoint is configured to accept. One of \"EventGrid\", \"CloudEvent\", or \"Custom\".\n   * @param credential - Used to authenticate requests to the service.\n   * @param options - Used to configure the Event Grid Client.\n   */\n  constructor(\n    endpointUrl: string,\n    inputSchema: T,\n    credential: KeyCredential | SASCredential | TokenCredential,\n    options: EventGridPublisherClientOptions = {}\n  ) {\n    this.endpointUrl = endpointUrl;\n    this.inputSchema = inputSchema;\n\n    this.client = new GeneratedClient(options);\n\n    const authPolicy = isTokenCredential(credential)\n      ? bearerTokenAuthenticationPolicy({ credential, scopes: DEFAULT_EVENTGRID_SCOPE })\n      : eventGridCredentialPolicy(credential);\n\n    this.client.pipeline.addPolicy(authPolicy);\n    this.client.pipeline.addPolicy(cloudEventDistributedTracingEnricherPolicy(), {\n      afterPolicies: [tracingPolicyName],\n    });\n    this.apiVersion = this.client.apiVersion;\n  }\n\n  /**\n   * Sends events to a topic.\n   *\n   * @param events - The events to send. The events should be in the schema used when constructing the client.\n   * @param options - Options to control the underlying operation.\n   */\n  send(events: InputSchemaToInputTypeMap[T][], options: SendOptions = {}): Promise<void> {\n    return tracingClient.withSpan(\"EventGridPublisherClient.send\", options, (updatedOptions) => {\n      switch (this.inputSchema) {\n        case \"EventGrid\": {\n          return this.client.publishEvents(\n            this.endpointUrl,\n            (events as InputSchemaToInputTypeMap[\"EventGrid\"][]).map(\n              convertEventGridEventToModelType\n            ),\n            updatedOptions\n          );\n        }\n        case \"CloudEvent\": {\n          return this.client.publishCloudEventEvents(\n            this.endpointUrl,\n            (events as InputSchemaToInputTypeMap[\"CloudEvent\"][]).map(convertCloudEventToModelType),\n            updatedOptions\n          );\n        }\n        case \"Custom\": {\n          return this.client.publishCustomEventEvents(\n            this.endpointUrl,\n            events as InputSchemaToInputTypeMap[\"Custom\"][],\n            updatedOptions\n          );\n        }\n        default: {\n          throw new Error(`Unknown input schema type '${this.inputSchema}'`);\n        }\n      }\n    });\n  }\n}\n\n/**\n * @internal\n */\nexport function convertEventGridEventToModelType(\n  event: SendEventGridEventInput<any>\n): EventGridEventWireModel {\n  return {\n    eventType: event.eventType,\n    eventTime: event.eventTime ?? new Date(),\n    id: event.id ?? uuidv4(),\n    subject: event.subject,\n    topic: event.topic,\n    data: event.data,\n    dataVersion: event.dataVersion,\n  };\n}\n\n/**\n * @internal\n */\nexport function convertCloudEventToModelType(event: SendCloudEventInput<any>): CloudEventWireModel {\n  if (event.extensionAttributes) {\n    for (const propName in event.extensionAttributes) {\n      // Per the cloud events spec: \"CloudEvents attribute names MUST consist of lower-case letters ('a' to 'z') or digits ('0' to '9') from the ASCII character set\"\n      // they also can not match an existing defined property name.\n\n      if (\n        !/^[a-z0-9]*$/.test(propName) ||\n        cloudEventReservedPropertyNames.indexOf(propName) !== -1\n      ) {\n        throw new Error(`invalid extension attribute name: ${propName}`);\n      }\n    }\n  }\n\n  const converted: CloudEventWireModel = {\n    specversion: \"1.0\",\n    type: event.type,\n    source: event.source,\n    id: event.id ?? uuidv4(),\n    time: event.time ?? new Date(),\n    subject: event.subject,\n    dataschema: event.dataschema,\n    ...(event.extensionAttributes ?? []),\n  };\n\n  if (event.data instanceof Uint8Array) {\n    if (!event.datacontenttype) {\n      throw new Error(\n        \"a data content type must be provided when sending an event with binary data\"\n      );\n    }\n\n    converted.datacontenttype = event.datacontenttype;\n    converted.dataBase64 = event.data;\n  } else {\n    converted.datacontenttype = event.datacontenttype ?? \"application/json\";\n    converted.data = event.data;\n  }\n\n  return converted;\n}\n"]}

package/dist-esm/src/generated/generatedClientContext.js

@@ -20,7 +20,7 @@ export class GeneratedClientContext extends coreClient.ServiceClient {
         const defaults = {
             requestContentType: "application/json; charset=utf-8"
         };
-        const packageDetails = `azsdk-js-eventgrid/4.9.1`;
+        const packageDetails = `azsdk-js-eventgrid/4.10.0`;
         const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix
             ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
             : `${packageDetails}`;

package/dist-esm/src/generated/generatedClientContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"generatedClientContext.js","sourceRoot":"","sources":["../../../src/generated/generatedClientContext.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAGjD,gBAAgB;AAChB,MAAM,OAAO,sBAAuB,SAAQ,UAAU,CAAC,aAAa;IAGlE;;;OAGG;IACH,YAAY,OAAuC;QACjD,0CAA0C;QAC1C,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,EAAE,CAAC;SACd;QACD,MAAM,QAAQ,GAAkC;YAC9C,kBAAkB,EAAE,iCAAiC;SACtD,CAAC;QAEF,MAAM,cAAc,GAAG,0BAA0B,CAAC;QAClD,MAAM,eAAe,GACnB,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC,eAAe;YAClE,CAAC,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,eAAe,IAAI,cAAc,EAAE;YACjE,CAAC,CAAC,GAAG,cAAc,EAAE,CAAC;QAE1B,MAAM,mBAAmB,iDACpB,QAAQ,GACR,OAAO,KACV,gBAAgB,EAAE;gBAChB,eAAe;aAChB,EACD,OAAO,EAAE,OAAO,CAAC,QAAQ,IAAI,iBAAiB,GAC/C,CAAC;QACF,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAE3B,0CAA0C;QAC1C,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,YAAY,CAAC;IACvD,CAAC;CACF","sourcesContent":["/*\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n *\n * Code generated by Microsoft (R) AutoRest Code Generator.\n * Changes may cause incorrect behavior and will be lost if the code is regenerated.\n */\n\nimport * as coreClient from \"@azure/core-client\";\nimport { GeneratedClientOptionalParams } from \"./models\";\n\n/** @internal */\nexport class GeneratedClientContext extends coreClient.ServiceClient {\n  apiVersion: string;\n\n  /**\n   * Initializes a new instance of the GeneratedClientContext class.\n   * @param options The parameter options\n   */\n  constructor(options?: GeneratedClientOptionalParams) {\n    // Initializing default values for options\n    if (!options) {\n      options = {};\n    }\n    const defaults: GeneratedClientOptionalParams = {\n      requestContentType: \"application/json; charset=utf-8\"\n    };\n\n    const packageDetails = `azsdk-js-eventgrid/4.9.1`;\n    const userAgentPrefix =\n      options.userAgentOptions && options.userAgentOptions.userAgentPrefix\n        ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`\n        : `${packageDetails}`;\n\n    const optionsWithDefaults = {\n      ...defaults,\n      ...options,\n      userAgentOptions: {\n        userAgentPrefix\n      },\n      baseUri: options.endpoint || \"{topicHostname}\"\n    };\n    super(optionsWithDefaults);\n\n    // Assigning values to Constant parameters\n    this.apiVersion = options.apiVersion || \"2018-01-01\";\n  }\n}\n"]}
+{"version":3,"file":"generatedClientContext.js","sourceRoot":"","sources":["../../../src/generated/generatedClientContext.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAGjD,gBAAgB;AAChB,MAAM,OAAO,sBAAuB,SAAQ,UAAU,CAAC,aAAa;IAGlE;;;OAGG;IACH,YAAY,OAAuC;QACjD,0CAA0C;QAC1C,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,EAAE,CAAC;SACd;QACD,MAAM,QAAQ,GAAkC;YAC9C,kBAAkB,EAAE,iCAAiC;SACtD,CAAC;QAEF,MAAM,cAAc,GAAG,2BAA2B,CAAC;QACnD,MAAM,eAAe,GACnB,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC,eAAe;YAClE,CAAC,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,eAAe,IAAI,cAAc,EAAE;YACjE,CAAC,CAAC,GAAG,cAAc,EAAE,CAAC;QAE1B,MAAM,mBAAmB,iDACpB,QAAQ,GACR,OAAO,KACV,gBAAgB,EAAE;gBAChB,eAAe;aAChB,EACD,OAAO,EAAE,OAAO,CAAC,QAAQ,IAAI,iBAAiB,GAC/C,CAAC;QACF,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAE3B,0CAA0C;QAC1C,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,YAAY,CAAC;IACvD,CAAC;CACF","sourcesContent":["/*\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n *\n * Code generated by Microsoft (R) AutoRest Code Generator.\n * Changes may cause incorrect behavior and will be lost if the code is regenerated.\n */\n\nimport * as coreClient from \"@azure/core-client\";\nimport { GeneratedClientOptionalParams } from \"./models\";\n\n/** @internal */\nexport class GeneratedClientContext extends coreClient.ServiceClient {\n  apiVersion: string;\n\n  /**\n   * Initializes a new instance of the GeneratedClientContext class.\n   * @param options The parameter options\n   */\n  constructor(options?: GeneratedClientOptionalParams) {\n    // Initializing default values for options\n    if (!options) {\n      options = {};\n    }\n    const defaults: GeneratedClientOptionalParams = {\n      requestContentType: \"application/json; charset=utf-8\"\n    };\n\n    const packageDetails = `azsdk-js-eventgrid/4.10.0`;\n    const userAgentPrefix =\n      options.userAgentOptions && options.userAgentOptions.userAgentPrefix\n        ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`\n        : `${packageDetails}`;\n\n    const optionsWithDefaults = {\n      ...defaults,\n      ...options,\n      userAgentOptions: {\n        userAgentPrefix\n      },\n      baseUri: options.endpoint || \"{topicHostname}\"\n    };\n    super(optionsWithDefaults);\n\n    // Assigning values to Constant parameters\n    this.apiVersion = options.apiVersion || \"2018-01-01\";\n  }\n}\n"]}

package/dist-esm/src/tracing.js

@@ -1,12 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-import { createSpanFunction } from "@azure/core-tracing";
+import { createTracingClient } from "@azure/core-tracing";
 /**
- * Creates a span using the global tracer.
+ * A tracing client to handle spans.
  * @internal
  */
-export const createSpan = createSpanFunction({
-    packagePrefix: "Azure.Data.EventGrid",
+export const tracingClient = createTracingClient({
     namespace: "Microsoft.Messaging.EventGrid",
+    packageName: "@azure/event-grid",
+    packageVersion: "4.9.0",
 });
 //# sourceMappingURL=tracing.js.map

package/dist-esm/src/tracing.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/tracing.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD;;;GAGG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,kBAAkB,CAAC;IAC3C,aAAa,EAAE,sBAAsB;IACrC,SAAS,EAAE,+BAA+B;CAC3C,CAAC,CAAC","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT license.\n\nimport { createSpanFunction } from \"@azure/core-tracing\";\n\n/**\n * Creates a span using the global tracer.\n * @internal\n */\nexport const createSpan = createSpanFunction({\n  packagePrefix: \"Azure.Data.EventGrid\",\n  namespace: \"Microsoft.Messaging.EventGrid\",\n});\n"]}
+{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/tracing.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,mBAAmB,CAAC;IAC/C,SAAS,EAAE,+BAA+B;IAC1C,WAAW,EAAE,mBAAmB;IAChC,cAAc,EAAE,OAAO;CACxB,CAAC,CAAC","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT license.\n\nimport { createTracingClient } from \"@azure/core-tracing\";\n\n/**\n * A tracing client to handle spans.\n * @internal\n */\nexport const tracingClient = createTracingClient({\n  namespace: \"Microsoft.Messaging.EventGrid\",\n  packageName: \"@azure/event-grid\",\n  packageVersion: \"4.9.0\",\n});\n"]}

package/package.json

@@ -3,7 +3,7 @@
   "sdk-type": "client",
   "author": "Microsoft Corporation",
   "description": "An isomorphic client library for the Azure Event Grid service.",
-  "version": "4.9.1-alpha.20220408.2",
+  "version": "4.10.0-alpha.20220412.2",
   "keywords": [
     "node",
     "azure",
@@ -52,6 +52,10 @@
       {
         "path": "src/generated/generatedClientContext.ts",
         "prefix": "packageDetails"
+      },
+      {
+        "path": "src/tracing.ts",
+        "prefix": "packageVersion"
       }
     ]
   },
@@ -90,7 +94,7 @@
     "@azure/core-auth": "^1.3.0",
     "@azure/core-client": "^1.5.0",
     "@azure/core-rest-pipeline": "^1.1.0",
-    "@azure/core-tracing": "1.0.0-preview.13",
+    "@azure/core-tracing": "^1.0.0",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0",
     "uuid": "^8.3.0"