Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/eventhub/event-hubs/src/batchingPartitionChannel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {
EventHubProducerClient,
OperationOptions
} from "./index";
import { AwaitableQueue } from "./impl/awaitableQueue";
import { isDefined, isObjectWithProperties } from "./util/typeGuards";
import { AbortSignalLike } from "@azure/abort-controller";
import { AwaitableQueue } from "./impl/awaitableQueue";
import { getPromiseParts } from "./util/getPromiseParts";
import { logger } from "./log";

Expand Down
26 changes: 13 additions & 13 deletions sdk/eventhub/event-hubs/src/connectionContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,35 @@
/* eslint-disable @typescript-eslint/no-namespace */
/* eslint-disable no-inner-declarations */

import { logger, logErrorStackTrace } from "./log";
import { getRuntimeInfo } from "./util/runtimeInfo";
import { packageJsonInfo } from "./util/constants";
import {
EventHubConnectionStringProperties,
parseEventHubConnectionString
} from "./util/connectionStringUtils";
import { EventHubReceiver } from "./eventHubReceiver";
import { EventHubSender } from "./eventHubSender";
import { Connection, ConnectionEvents, Dictionary, EventContext, OnAmqpEvent } from "rhea-promise";
import {
ConnectionConfig,
ConnectionContextBase,
Constants,
CreateConnectionContextBaseParameters,
ConnectionConfig,
SasTokenProvider,
createSasTokenProvider
} from "@azure/core-amqp";
import {
TokenCredential,
EventHubConnectionStringProperties,
parseEventHubConnectionString
} from "./util/connectionStringUtils";
import { ManagementClient, ManagementClientOptions } from "./managementClient";
import {
NamedKeyCredential,
SASCredential,
TokenCredential,
isNamedKeyCredential,
isSASCredential
} from "@azure/core-auth";
import { ManagementClient, ManagementClientOptions } from "./managementClient";
import { logErrorStackTrace, logger } from "./log";
import { EventHubClientOptions } from "./models/public";
import { Connection, ConnectionEvents, Dictionary, EventContext, OnAmqpEvent } from "rhea-promise";
import { EventHubConnectionConfig } from "./eventhubConnectionConfig";
import { EventHubReceiver } from "./eventHubReceiver";
import { EventHubSender } from "./eventHubSender";
import { getRuntimeInfo } from "./util/runtimeInfo";
import { isCredential } from "./util/typeGuards";
import { packageJsonInfo } from "./util/constants";

/**
* @internal
Expand Down
6 changes: 3 additions & 3 deletions sdk/eventhub/event-hubs/src/dataTransformer.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import { message } from "rhea-promise";
import isBuffer from "is-buffer";
import { Buffer } from "buffer";
import { logErrorStackTrace, logger } from "./log";
import { Buffer } from "buffer";
import isBuffer from "is-buffer";
import { message } from "rhea-promise";

/**
* The allowed AMQP message body types.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import { EventData, isAmqpAnnotatedMessage } from "../eventData";
import {
extractSpanContextFromTraceParentHeader,
getTraceParentHeader,
isSpanContextValid
} from "@azure/core-tracing";
import { SpanContext } from "@azure/core-tracing";
import { AmqpAnnotatedMessage } from "@azure/core-amqp";
import { EventData, isAmqpAnnotatedMessage } from "../eventData";
import { OperationOptions } from "../util/operationOptions";
import { SpanContext } from "@azure/core-tracing";
import { createMessageSpan } from "./tracing";

/**
Expand Down
20 changes: 10 additions & 10 deletions sdk/eventhub/event-hubs/src/diagnostics/tracing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
// Licensed under the MIT license.

import {
createSpanFunction,
Span,
SpanContext,
SpanKind,
SpanOptions,
context,
createSpanFunction,
setSpan,
setSpanContext,
Span,
SpanKind,
context
setSpanContext
} from "@azure/core-tracing";
import { TryAddOptions } from "../eventDataBatch";
import { EventHubConnectionConfig } from "../eventhubConnectionConfig";
import { OperationOptions } from "../util/operationOptions";
import { TryAddOptions } from "../eventDataBatch";

const _createSpan = createSpanFunction({
namespace: "Microsoft.EventHub",
Expand Down Expand Up @@ -86,8 +86,8 @@ export function convertTryAddOptionsForCompatibility(tryAddOptions: TryAddOption
}

function takeSomeOptionsFromSomewhere(someOptionsPassedIntoTheirFunction) {
batch.tryAddMessage(message, {

batch.tryAddMessage(message, {
// "runtime" blend of options from some other part of their app
...someOptionsPassedIntoTheirFunction, // parentSpan comes along for the ride...

Expand All @@ -102,9 +102,9 @@ export function convertTryAddOptionsForCompatibility(tryAddOptions: TryAddOption

And now they've accidentally been opted into the legacy code path even though they think
they're using the modern code path.

This does kick the can down the road a bit - at some point we will be putting them in this
situation where things looked okay but their spans are becoming unparented but we can
situation where things looked okay but their spans are becoming unparented but we can
try to announce this (and other changes related to tracing) in our next big rev.
*/

Expand Down
4 changes: 2 additions & 2 deletions sdk/eventhub/event-hubs/src/eventData.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import { DeliveryAnnotations, Message as RheaMessage, MessageAnnotations } from "rhea-promise";
import { AmqpAnnotatedMessage, Constants } from "@azure/core-amqp";
import { isDefined, isObjectWithProperties, objectHasProperty } from "./util/typeGuards";
import { BodyTypes, defaultDataTransformer } from "./dataTransformer";
import { DeliveryAnnotations, MessageAnnotations, Message as RheaMessage } from "rhea-promise";
import { isDefined, isObjectWithProperties, objectHasProperty } from "./util/typeGuards";

/**
* Describes the delivery annotations.
Expand Down
12 changes: 6 additions & 6 deletions sdk/eventhub/event-hubs/src/eventDataBatch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// Licensed under the MIT license.

import { EventData, toRheaMessage } from "./eventData";
import { ConnectionContext } from "./connectionContext";
import { MessageAnnotations, message, Message as RheaMessage } from "rhea-promise";
import { throwTypeErrorIfParameterMissing } from "./util/error";
import { AmqpAnnotatedMessage } from "@azure/core-amqp";
import { MessageAnnotations, Message as RheaMessage, message } from "rhea-promise";
import { Span, SpanContext } from "@azure/core-tracing";
import { instrumentEventData } from "./diagnostics/instrumentEventData";
import { convertTryAddOptionsForCompatibility } from "./diagnostics/tracing";
import { isDefined, isObjectWithProperties } from "./util/typeGuards";
import { AmqpAnnotatedMessage } from "@azure/core-amqp";
import { ConnectionContext } from "./connectionContext";
import { OperationTracingOptions } from "@azure/core-tracing";
import { convertTryAddOptionsForCompatibility } from "./diagnostics/tracing";
import { instrumentEventData } from "./diagnostics/instrumentEventData";
import { throwTypeErrorIfParameterMissing } from "./util/error";

/**
* The amount of bytes to reserve as overhead for a small message.
Expand Down
12 changes: 6 additions & 6 deletions sdk/eventhub/event-hubs/src/eventHubBufferedProducerClient.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import { AbortController } from "@azure/abort-controller";
import { AmqpAnnotatedMessage } from "@azure/core-amqp";
import { NamedKeyCredential, SASCredential, TokenCredential } from "@azure/core-auth";
import { BatchingPartitionChannel } from "./batchingPartitionChannel";
import { PartitionAssigner } from "./impl/partitionAssigner";
import { EventData, EventHubProducerClient, OperationOptions } from "./index";
import { EventHubProperties, PartitionProperties } from "./managementClient";
import {
EventHubClientOptions,
GetEventHubPropertiesOptions,
GetPartitionIdsOptions,
GetPartitionPropertiesOptions,
SendBatchOptions
} from "./models/public";
import { EventHubProperties, PartitionProperties } from "./managementClient";
import { NamedKeyCredential, SASCredential, TokenCredential } from "@azure/core-auth";
import { isCredential, isDefined } from "./util/typeGuards";
import { AbortController } from "@azure/abort-controller";
import { AmqpAnnotatedMessage } from "@azure/core-amqp";
import { BatchingPartitionChannel } from "./batchingPartitionChannel";
import { PartitionAssigner } from "./impl/partitionAssigner";

/**
* Contains the events that were successfully sent to the Event Hub,
Expand Down
23 changes: 11 additions & 12 deletions sdk/eventhub/event-hubs/src/eventHubConsumerClient.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import { CheckpointStore, EventProcessor, FullEventProcessorOptions } from "./eventProcessor";
import { ConnectionContext, createConnectionContext } from "./connectionContext";
import {
EventHubConsumerClientOptions,
Expand All @@ -9,26 +10,24 @@ import {
GetPartitionPropertiesOptions,
LoadBalancingOptions
} from "./models/public";
import { InMemoryCheckpointStore } from "./inMemoryCheckpointStore";
import { CheckpointStore, EventProcessor, FullEventProcessorOptions } from "./eventProcessor";
import { Constants } from "@azure/core-amqp";
import { logger } from "./log";

import { EventHubProperties, PartitionProperties } from "./managementClient";
import { NamedKeyCredential, SASCredential, TokenCredential } from "@azure/core-auth";
import {
SubscribeOptions,
Subscription,
SubscriptionEventHandlers
} from "./eventHubConsumerClientModels";
import { TokenCredential, NamedKeyCredential, SASCredential } from "@azure/core-auth";
import { EventHubProperties, PartitionProperties } from "./managementClient";
import { PartitionGate } from "./impl/partitionGate";
import { v4 as uuid } from "uuid";
import { validateEventPositions } from "./eventPosition";
import { BalancedLoadBalancingStrategy } from "./loadBalancerStrategies/balancedStrategy";
import { Constants } from "@azure/core-amqp";
import { GreedyLoadBalancingStrategy } from "./loadBalancerStrategies/greedyStrategy";
import { InMemoryCheckpointStore } from "./inMemoryCheckpointStore";
import { LoadBalancingStrategy } from "./loadBalancerStrategies/loadBalancingStrategy";
import { PartitionGate } from "./impl/partitionGate";
import { UnbalancedLoadBalancingStrategy } from "./loadBalancerStrategies/unbalancedStrategy";
import { GreedyLoadBalancingStrategy } from "./loadBalancerStrategies/greedyStrategy";
import { BalancedLoadBalancingStrategy } from "./loadBalancerStrategies/balancedStrategy";
import { isCredential } from "./util/typeGuards";
import { logger } from "./log";
import { v4 as uuid } from "uuid";
import { validateEventPositions } from "./eventPosition";

const defaultConsumerClientOptions: Required<Pick<
FullEventProcessorOptions,
Expand Down
8 changes: 4 additions & 4 deletions sdk/eventhub/event-hubs/src/eventHubConsumerClientModels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// Licensed under the MIT license.

import { CloseReason } from "./models/public";
import { ReceivedEventData } from "./eventData";
import { LastEnqueuedEventProperties } from "./eventHubReceiver";
import { EventPosition } from "./eventPosition";
import { OperationTracingOptions } from "@azure/core-tracing";
import { LastEnqueuedEventProperties } from "./eventHubReceiver";
import { MessagingError } from "@azure/core-amqp";
import { OperationTracingOptions } from "@azure/core-tracing";
import { ReceivedEventData } from "./eventData";

/**
* @internal
Expand Down Expand Up @@ -184,7 +184,7 @@ export interface SubscribeOptions {
* Indicates whether or not the consumer should request information on the last enqueued event on its
* associated partition, and track that information as events are received.

* When information about the partition's last enqueued event is being tracked, each event received
* When information about the partition's last enqueued event is being tracked, each event received
* from the Event Hubs service will carry metadata about the partition that it otherwise would not. This results in a small amount of
* additional network bandwidth consumption that is generally a favorable trade-off when considered
* against periodically making requests for partition properties using the Event Hub client.
Expand Down
20 changes: 10 additions & 10 deletions sdk/eventhub/event-hubs/src/eventHubProducerClient.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import { AmqpAnnotatedMessage } from "@azure/core-amqp";
import { NamedKeyCredential, SASCredential, TokenCredential } from "@azure/core-auth";
import { SpanStatusCode, Link, Span, SpanContext, SpanKind } from "@azure/core-tracing";
import { ConnectionContext, createConnectionContext } from "./connectionContext";
import { instrumentEventData } from "./diagnostics/instrumentEventData";
import { EventData } from "./eventData";
import { EventDataBatch, EventDataBatchImpl, isEventDataBatch } from "./eventDataBatch";
import { EventHubSender } from "./eventHubSender";
import { logErrorStackTrace, logger } from "./log";
import { EventHubProperties, PartitionProperties } from "./managementClient";
import {
CreateBatchOptions,
EventHubClientOptions,
Expand All @@ -19,10 +10,19 @@ import {
GetPartitionPropertiesOptions,
SendBatchOptions
} from "./models/public";
import { throwErrorIfConnectionClosed, throwTypeErrorIfParameterMissing } from "./util/error";
import { EventDataBatch, EventDataBatchImpl, isEventDataBatch } from "./eventDataBatch";
import { EventHubProperties, PartitionProperties } from "./managementClient";
import { Link, Span, SpanContext, SpanKind, SpanStatusCode } from "@azure/core-tracing";
import { NamedKeyCredential, SASCredential, TokenCredential } from "@azure/core-auth";
import { isCredential, isDefined } from "./util/typeGuards";
import { logErrorStackTrace, logger } from "./log";
import { throwErrorIfConnectionClosed, throwTypeErrorIfParameterMissing } from "./util/error";
import { AmqpAnnotatedMessage } from "@azure/core-amqp";
import { EventData } from "./eventData";
import { EventHubSender } from "./eventHubSender";
import { OperationOptions } from "./util/operationOptions";
import { createEventHubSpan } from "./diagnostics/tracing";
import { instrumentEventData } from "./diagnostics/instrumentEventData";

/**
* The `EventHubProducerClient` class is used to send events to an Event Hub.
Expand Down
28 changes: 14 additions & 14 deletions sdk/eventhub/event-hubs/src/eventHubReceiver.ts
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import { logErrorStackTrace, logger } from "./log";
import {
EventContext,
OnAmqpEvent,
Receiver,
ReceiverOptions as RheaReceiverOptions,
types
} from "rhea-promise";
import { AbortError, AbortSignalLike } from "@azure/abort-controller";
import {
Constants,
MessagingError,
delay,
translate,
RetryConfig,
RetryOperationType,
StandardAbortMessage,
delay,
retry,
StandardAbortMessage
translate
} from "@azure/core-amqp";
import {
EventContext,
OnAmqpEvent,
Receiver,
ReceiverOptions as RheaReceiverOptions,
types
} from "rhea-promise";
import { EventDataInternal, ReceivedEventData, fromRheaMessage } from "./eventData";
import { EventHubConsumerOptions } from "./models/private";
import { EventPosition, getEventPositionFilter } from "./eventPosition";
import { logErrorStackTrace, logger } from "./log";
import { ConnectionContext } from "./connectionContext";
import { EventHubConsumerOptions } from "./models/private";
import { LinkEntity } from "./linkEntity";
import { EventPosition, getEventPositionFilter } from "./eventPosition";
import { AbortError, AbortSignalLike } from "@azure/abort-controller";
import { getRetryAttemptTimeoutInMs } from "./util/retries";

/**
Expand Down
16 changes: 8 additions & 8 deletions sdk/eventhub/event-hubs/src/eventHubSender.ts
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import { v4 as uuid } from "uuid";
import { logErrorStackTrace, logger } from "./log";
import {
AmqpError,
AwaitableSender,
AwaitableSenderOptions,
EventContext,
OnAmqpEvent,
message,
Message as RheaMessage
Message as RheaMessage,
message
} from "rhea-promise";
import {
delay,
ErrorNameConditionMapper,
RetryConfig,
RetryOperationType,
RetryOptions,
defaultCancellableLock,
delay,
retry,
translate
} from "@azure/core-amqp";
import { EventData, toRheaMessage } from "./eventData";
import { EventDataBatch, isEventDataBatch } from "./eventDataBatch";
import { logErrorStackTrace, logger } from "./log";
import { AbortSignalLike } from "@azure/abort-controller";
import { ConnectionContext } from "./connectionContext";
import { LinkEntity } from "./linkEntity";
import { EventHubProducerOptions } from "./models/private";
import { LinkEntity } from "./linkEntity";
import { SendOptions } from "./models/public";
import { getRetryAttemptTimeoutInMs } from "./util/retries";
import { AbortSignalLike } from "@azure/abort-controller";
import { EventDataBatch, isEventDataBatch } from "./eventDataBatch";
import { v4 as uuid } from "uuid";

/**
* Describes the EventHubSender that will send event data to EventHub.
Expand Down
Loading