Skip to content

Commit 8b44b2a

Browse files
woksinwoksin
authored
Merge pull request #29 from dolittle/remove-execution-context-manager
Remove execution context manager
2 parents 538b090 + 92f9d4e commit 8b44b2a

31 files changed

Lines changed: 280 additions & 425 deletions

‎Samples/Basic/index.ts‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,29 @@ const client = Client
2121
.forMicroservice('7a6155dd-9109-4488-8f6f-c57fe4b65bfb', microservice => {
2222
microservice.withVersion(Version.first);
2323
})
24-
.withEventStore(eventStore => {
25-
eventStore.withFilters(filterBuilder => {
26-
filterBuilder.createPrivateFilter('79e12ab3-2751-47e1-b959-d898dc4d6ee8', fb => {
27-
fb
28-
.handle((event: any, context: EventContext) => {
29-
return new Promise((resolve, reject) => {
30-
console.log('Filtering event', event);
31-
});
24+
.withFilters(filterBuilder =>
25+
filterBuilder
26+
.createPrivateFilter('79e12ab3-2751-47e1-b959-d898dc4d6ee8', fb =>
27+
fb.handle((event: any, context: EventContext) => {
28+
return new Promise((resolve, reject) => {
29+
console.log('Filtering event', event);
3230
});
33-
});
34-
filterBuilder.createPublicFilter('2c087657-b318-40b1-ae92-a400de44e507', fb => {
35-
fb
36-
.handle((event: any, context: EventContext) => {
37-
return new PartitionedFilterResult(true, PartitionId.unspecified);
38-
});
39-
});
40-
});
41-
})
31+
})
32+
)
33+
.createPublicFilter('2c087657-b318-40b1-ae92-a400de44e507', fb =>
34+
fb.handle((event: any, context: EventContext) => {
35+
return new PartitionedFilterResult(true, PartitionId.unspecified);
36+
})
37+
)
38+
)
4239
.build();
4340

4441

45-
client.executionContextManager.forTenant('900893e7-c4cc-4873-8032-884e965e4b97');
46-
47-
4842
const event = new MyEvent();
4943
event.anInteger = 42;
5044
event.aString = 'Forty two';
5145

52-
client.eventStore.commitPublic(event, 'd8cb7301-4bec-4451-a72b-2db53c6dc05d');
46+
client
47+
.eventStore
48+
.forTenant('900893e7-c4cc-4873-8032-884e965e4b97')
49+
.commitPublic(event, 'd8cb7301-4bec-4451-a72b-2db53c6dc05d');

‎Samples/Container/index.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ const client = Client
1616
.withLogging(_ => _.useWinston(_ => _.level = 'debug'))
1717
.build();
1818

19-
client.executionContextManager.forTenant('900893e7-c4cc-4873-8032-884e965e4b97');
20-
2119
const event = new MyEvent();
2220
event.anInteger = 42;
2321
event.aString = 'Forty two';
24-
client.eventStore.commit(event, 'd8cb7301-4bec-4451-a72b-2db53c6dc05d');
22+
client
23+
.eventStore
24+
.forTenant('900893e7-c4cc-4873-8032-884e965e4b97')
25+
.commit(event, 'd8cb7301-4bec-4451-a72b-2db53c6dc05d');

‎Samples/EventHorizon/index.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ const client = Client
3232
})
3333
.build();
3434

35-
client.executionContextManager.forTenant('900893e7-c4cc-4873-8032-884e965e4b97');
36-
3735
const event = new MyEvent();
3836
event.anInteger = 42;
3937
event.aString = 'Forty two';
4038

41-
client.eventStore.commitPublic(event, 'd8cb7301-4bec-4451-a72b-2db53c6dc05d');
39+
client
40+
.eventStore
41+
.forTenant('900893e7-c4cc-4873-8032-884e965e4b97')
42+
.commitPublic(event, 'd8cb7301-4bec-4451-a72b-2db53c6dc05d');

‎Source/eventHorizon/EventHorizons.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import { Guid } from '@dolittle/rudiments';
55
import { Logger } from 'winston';
66
import * as grpc from 'grpc';
7-
import { IExecutionContextManager } from '@dolittle/sdk.execution';
7+
import { ExecutionContext } from '@dolittle/sdk.execution';
88
import { callContexts, failures, guids } from '@dolittle/sdk.protobuf';
99
import { SubscriptionsClient } from '@dolittle/runtime.contracts/Runtime/EventHorizon/Subscriptions_grpc_pb';
1010
import { Subscription as PbSubscription, SubscriptionResponse as PbSubscriptionResponse } from '@dolittle/runtime.contracts/Runtime/EventHorizon/Subscriptions_pb';
@@ -25,14 +25,14 @@ export class EventHorizons implements IEventHorizons {
2525
/**
2626
* Initializes a new instance of {@link EventHorizons}.
2727
* @param {SubscriptionsClient} subscriptionsClient The runtime client for working with subscriptions.
28-
* @param {IExecutionContextManager} executionContextManager For Managing execution context.
28+
* @param {ExecutionContext} executionContext The execution context.
2929
* @param {TenantWithSubscriptions[]} tenantSubscriptions Tenant subscriptions to connect.
3030
* @param {SubscriptionCallbacks} callbacks Callbacks for handling responses of subscribing.
3131
* @param {Logger} logger Logger for logging;
3232
*/
3333
constructor(
3434
private _subscriptionsClient: SubscriptionsClient,
35-
private _executionContextManager: IExecutionContextManager,
35+
private _executionContext: ExecutionContext,
3636
readonly subscriptions: TenantWithSubscriptions[],
3737
readonly callbacks: SubscriptionCallbacks,
3838
private _logger: Logger) {
@@ -56,11 +56,11 @@ export class EventHorizons implements IEventHorizons {
5656
const consumerTenant = tenantWithSubscriptions.tenant;
5757

5858
for (const subscription of tenantWithSubscriptions.subscriptions) {
59-
this._executionContextManager.forTenant(consumerTenant);
59+
const executionContext = this._executionContext.forTenant(consumerTenant.value);
6060

6161
this._logger.debug(`Subscribing to events from ${subscription.partition} in ${subscription.stream} of ${subscription.tenant} in ${subscription.microservice} for ${consumerTenant} into ${subscription.scope}`);
6262

63-
const callContext = callContexts.toProtobuf(this._executionContextManager.current);
63+
const callContext = callContexts.toProtobuf(executionContext);
6464
callContext.setHeadid(guids.toProtobuf(Guid.create()));
6565

6666
const pbSubscription = new PbSubscription();

‎Source/eventHorizon/EventHorizonsBuilder.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Dolittle. All rights reserved.
22
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
33

4-
import { TenantId, IExecutionContextManager } from '@dolittle/sdk.execution';
4+
import { TenantId, ExecutionContext } from '@dolittle/sdk.execution';
55

66
import { SubscriptionsClient } from '@dolittle/runtime.contracts/Runtime/EventHorizon/Subscriptions_grpc_pb';
77
import { Logger } from 'winston';
@@ -70,15 +70,15 @@ export class EventHorizonsBuilder {
7070
/**
7171
* Build all configured {@link TenantSubscriptions}
7272
* @param {SubscriptionsClient} subscriptionsClient The runtime client for working with subscriptions.
73-
* @param {IExecutionContextManager} executionContextManager For Managing execution context.
73+
* @param {ExecutionContext} executionContext The execution context.
7474
* @param {Logger} logger Logger for logging;
7575
* @returns {TenantSubscriptions[]}
7676
*/
77-
build(subscriptionsClient: SubscriptionsClient, executionContextManager: IExecutionContextManager, logger: Logger): IEventHorizons {
77+
build(subscriptionsClient: SubscriptionsClient, executionContext: ExecutionContext, logger: Logger): IEventHorizons {
7878
const tenantSubscriptions = this._tenantSubscriptionsBuilders.map(_ => _.build());
7979
return new EventHorizons(
8080
subscriptionsClient,
81-
executionContextManager,
81+
executionContext,
8282
tenantSubscriptions,
8383
this.callbacks,
8484
logger);

‎Source/events.filtering/EventFiltersBuilder.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
import { Logger } from 'winston';
55

6+
import { Guid } from '@dolittle/rudiments';
7+
68
import { IArtifacts } from '@dolittle/sdk.artifacts';
7-
import { IExecutionContextManager } from '@dolittle/sdk.execution';
9+
import { ExecutionContext } from '@dolittle/sdk.execution';
810
import { Cancellation } from '@dolittle/sdk.resilience';
911

1012
import { FiltersClient } from '@dolittle/runtime.contracts/Runtime/Events.Processing/Filters_grpc_pb';
@@ -13,7 +15,6 @@ import { FilterId } from './FilterId';
1315
import { Filters } from './Filters';
1416
import { IFilters } from './IFilters';
1517
import { PublicEventFilterBuilder } from './PublicEventFilterBuilder';
16-
import { Guid } from '@dolittle/rudiments';
1718
import { PrivateEventFilterBuilder } from './PrivateEventFilterBuilder';
1819

1920

@@ -63,18 +64,18 @@ export class EventFiltersBuilder {
6364
*/
6465
build(
6566
client: FiltersClient,
66-
executionContextManager: IExecutionContextManager,
67+
executionContext: ExecutionContext,
6768
artifacts: IArtifacts,
6869
logger: Logger,
6970
cancellation: Cancellation): IFilters {
7071
const filters = new Filters(logger);
7172

7273
for (const privateFilterBuilder of this._privateFilterBuilders) {
73-
const filterProcessor = privateFilterBuilder.build(client, executionContextManager, artifacts, logger);
74+
const filterProcessor = privateFilterBuilder.build(client, executionContext, artifacts, logger);
7475
filters.register(filterProcessor, cancellation);
7576
}
7677
for (const publicFilterBuilder of this._publicFilterBuilders) {
77-
const filterProcessor = publicFilterBuilder.build(client, executionContextManager, artifacts, logger);
78+
const filterProcessor = publicFilterBuilder.build(client, executionContext, artifacts, logger);
7879
filters.register(filterProcessor, cancellation);
7980
}
8081

‎Source/events.filtering/Internal/EventFilterProcessor.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Logger } from 'winston';
66
import { Guid } from '@dolittle/rudiments';
77
import { IArtifacts } from '@dolittle/sdk.artifacts';
88
import { EventContext, ScopeId } from '@dolittle/sdk.events';
9-
import { IExecutionContextManager } from '@dolittle/sdk.execution';
9+
import { ExecutionContext } from '@dolittle/sdk.execution';
1010
import { guids } from '@dolittle/sdk.protobuf';
1111
import { Cancellation } from '@dolittle/sdk.resilience';
1212
import { IReverseCallClient, ReverseCallClient, reactiveDuplex } from '@dolittle/sdk.services';
@@ -25,7 +25,7 @@ export class EventFilterProcessor extends FilterEventProcessor<FilterRegistratio
2525
private _scopeId: ScopeId,
2626
private _callback: FilterEventCallback,
2727
private _client: FiltersClient,
28-
private _executionContextManager: IExecutionContextManager,
28+
private _executionContext: ExecutionContext,
2929
artifacts: IArtifacts,
3030
logger: Logger
3131
) {
@@ -39,7 +39,11 @@ export class EventFilterProcessor extends FilterEventProcessor<FilterRegistratio
3939
return registerArguments;
4040
}
4141

42-
protected createClient(registerArguments: FilterRegistrationRequest, callback: (request: FilterEventRequest) => Promise<FilterResponse>, pingTimeout: number, cancellation: Cancellation): IReverseCallClient<FilterRegistrationResponse> {
42+
protected createClient(
43+
registerArguments: FilterRegistrationRequest,
44+
callback: (request: FilterEventRequest, executionContext: ExecutionContext) => Promise<FilterResponse>,
45+
pingTimeout: number,
46+
cancellation: Cancellation): IReverseCallClient<FilterRegistrationResponse> {
4347
return new ReverseCallClient<FilterClientToRuntimeMessage, FilterRuntimeToClientMessage, FilterRegistrationRequest, FilterRegistrationResponse, FilterEventRequest, FilterResponse> (
4448
(requests, cancellation) => reactiveDuplex(this._client, this._client.connect, requests, cancellation),
4549
FilterClientToRuntimeMessage,
@@ -52,7 +56,7 @@ export class EventFilterProcessor extends FilterEventProcessor<FilterRegistratio
5256
(response, context) => response.setCallcontext(context),
5357
(message) => message.getPing(),
5458
(message, pong) => message.setPong(pong),
55-
this._executionContextManager,
59+
this._executionContext,
5660
registerArguments,
5761
pingTimeout,
5862
callback,

‎Source/events.filtering/Internal/FilterEventProcessor.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { IArtifacts } from '@dolittle/sdk.artifacts';
88
import { EventContext, EventSourceId } from '@dolittle/sdk.events';
99
import { EventProcessor } from '@dolittle/sdk.events.processing';
1010
import { MissingEventInformation } from '@dolittle/sdk.events.handling';
11+
import { ExecutionContext } from '@dolittle/sdk.execution';
1112
import { guids, executionContexts, artifacts } from '@dolittle/sdk.protobuf';
1213

1314
import { Failure } from '@dolittle/runtime.contracts/Fundamentals/Protobuf/Failure_pb';
@@ -35,7 +36,7 @@ export abstract class FilterEventProcessor<TRegisterArguments, TResponse> extend
3536
return request.getRetryprocessingstate();
3637
}
3738

38-
protected async handle(request: FilterEventRequest): Promise<TResponse> {
39+
protected async handle(request: FilterEventRequest, executionContext: ExecutionContext): Promise<TResponse> {
3940
if (!request.getEvent()) {
4041
throw new MissingEventInformation('no event in FilterEventRequest');
4142
}
@@ -61,8 +62,7 @@ export abstract class FilterEventProcessor<TRegisterArguments, TResponse> extend
6162
pbSequenceNumber,
6263
EventSourceId.from(guids.toSDK(pbEventSourceId)),
6364
DateTime.fromJSDate(pbOccurred.toDate()),
64-
executionContexts.toSDK(pbExecutionContext)
65-
);
65+
executionContext);
6666

6767
let event = JSON.parse(pbEvent.getContent());
6868

‎Source/events.filtering/Internal/PartitionedEventFilterProcessor.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Logger } from 'winston';
66
import { Guid } from '@dolittle/rudiments';
77
import { IArtifacts } from '@dolittle/sdk.artifacts';
88
import { EventContext, ScopeId } from '@dolittle/sdk.events';
9-
import { IExecutionContextManager } from '@dolittle/sdk.execution';
9+
import { ExecutionContext } from '@dolittle/sdk.execution';
1010
import { guids } from '@dolittle/sdk.protobuf';
1111
import { Cancellation } from '@dolittle/sdk.resilience';
1212
import { IReverseCallClient, ReverseCallClient, reactiveDuplex } from '@dolittle/sdk.services';
@@ -26,7 +26,7 @@ export class PartitionedEventFilterProcessor extends FilterEventProcessor<Partit
2626
private _scopeId: ScopeId,
2727
private _callback: PartitionedFilterEventCallback,
2828
private _client: FiltersClient,
29-
private _executionContextManager: IExecutionContextManager,
29+
private _executionContext: ExecutionContext,
3030
artifacts: IArtifacts,
3131
logger: Logger
3232
) {
@@ -40,7 +40,11 @@ export class PartitionedEventFilterProcessor extends FilterEventProcessor<Partit
4040
return registerArguments;
4141
}
4242

43-
protected createClient(registerArguments: PartitionedFilterRegistrationRequest, callback: (request: FilterEventRequest) => Promise<PartitionedFilterResponse>, pingTimeout: number, cancellation: Cancellation): IReverseCallClient<FilterRegistrationResponse> {
43+
protected createClient(
44+
registerArguments: PartitionedFilterRegistrationRequest,
45+
callback: (request: FilterEventRequest, executionContext: ExecutionContext) => Promise<PartitionedFilterResponse>,
46+
pingTimeout: number,
47+
cancellation: Cancellation): IReverseCallClient<FilterRegistrationResponse> {
4448
return new ReverseCallClient<PartitionedFilterClientToRuntimeMessage, FilterRuntimeToClientMessage, PartitionedFilterRegistrationRequest, FilterRegistrationResponse, FilterEventRequest, PartitionedFilterResponse> (
4549
(requests, cancellation) => reactiveDuplex(this._client, this._client.connectPartitioned, requests, cancellation),
4650
PartitionedFilterClientToRuntimeMessage,
@@ -53,7 +57,7 @@ export class PartitionedEventFilterProcessor extends FilterEventProcessor<Partit
5357
(response, context) => response.setCallcontext(context),
5458
(message) => message.getPing(),
5559
(message, pong) => message.setPong(pong),
56-
this._executionContextManager,
60+
this._executionContext,
5761
registerArguments,
5862
pingTimeout,
5963
callback,

‎Source/events.filtering/Internal/PublicEventFilterProcessor.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Logger } from 'winston';
66
import { Guid } from '@dolittle/rudiments';
77
import { IArtifacts } from '@dolittle/sdk.artifacts';
88
import { EventContext } from '@dolittle/sdk.events';
9-
import { IExecutionContextManager } from '@dolittle/sdk.execution';
9+
import { ExecutionContext } from '@dolittle/sdk.execution';
1010
import { guids } from '@dolittle/sdk.protobuf';
1111
import { Cancellation } from '@dolittle/sdk.resilience';
1212
import { IReverseCallClient, ReverseCallClient, reactiveDuplex } from '@dolittle/sdk.services';
@@ -26,7 +26,7 @@ export class PublicEventFilterProcessor extends FilterEventProcessor<PublicFilte
2626
filterId: FilterId,
2727
private _callback: PartitionedFilterEventCallback,
2828
private _client: FiltersClient,
29-
private _executionContextManager: IExecutionContextManager,
29+
private _executionContext: ExecutionContext,
3030
artifacts: IArtifacts,
3131
logger: Logger
3232
) {
@@ -39,7 +39,11 @@ export class PublicEventFilterProcessor extends FilterEventProcessor<PublicFilte
3939
return registerArguments;
4040
}
4141

42-
protected createClient(registerArguments: PublicFilterRegistrationRequest, callback: (request: FilterEventRequest) => Promise<PartitionedFilterResponse>, pingTimeout: number, cancellation: Cancellation): IReverseCallClient<FilterRegistrationResponse> {
42+
protected createClient(
43+
registerArguments: PublicFilterRegistrationRequest,
44+
callback: (request: FilterEventRequest, executionContext: ExecutionContext) => Promise<PartitionedFilterResponse>,
45+
pingTimeout: number,
46+
cancellation: Cancellation): IReverseCallClient<FilterRegistrationResponse> {
4347
return new ReverseCallClient<PublicFilterClientToRuntimeMessage, FilterRuntimeToClientMessage, PublicFilterRegistrationRequest, FilterRegistrationResponse, FilterEventRequest, PartitionedFilterResponse> (
4448
(requests, cancellation) => reactiveDuplex(this._client, this._client.connectPublic, requests, cancellation),
4549
PublicFilterClientToRuntimeMessage,
@@ -52,7 +56,7 @@ export class PublicEventFilterProcessor extends FilterEventProcessor<PublicFilte
5256
(response, context) => response.setCallcontext(context),
5357
(message) => message.getPing(),
5458
(message, pong) => message.setPong(pong),
55-
this._executionContextManager,
59+
this._executionContext,
5660
registerArguments,
5761
pingTimeout,
5862
callback,

0 commit comments

Comments
 (0)