Skip to content

Commit e04f66c

Browse files
committed
Adding Configuration to Event Aggregation Variables
1 parent ac118b7 commit e04f66c

File tree

3 files changed

+35
-11
lines changed

3 files changed

+35
-11
lines changed

docker-compose.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,17 @@ services:
3131
ROCKSDB_BLOCK_SIZE: ${ROCKSDB_BLOCK_SIZE:?error}
3232
ROCKSDB_N_MEMTABLES: ${ROCKSDB_N_MEMTABLES:?error}
3333
ROCKSDB_MEMTABLE_SIZE: ${ROCKSDB_MEMTABLE_SIZE:?error}
34+
ENABLE_AGGREGATE_INTERSECTION_REFERENCE_ALIGNMENT_EVENTS: ${ENABLE_AGGREGATE_INTERSECTION_REFERENCE_ALIGNMENT_EVENTS}
35+
ENABLE_AGGREGATE_SIGNAL_GROUP_ALIGNMENT_EVENTS: ${ENABLE_AGGREGATE_SIGNAL_GROUP_ALIGNMENT_EVENTS}
36+
ENABLE_AGGREGATE_SIGNAL_STATE_CONFLICT_EVENTS: ${ENABLE_AGGREGATE_SIGNAL_STATE_CONFLICT_EVENTS}
37+
ENABLE_AGGREGATE_MAP_MINIMUM_DATA_EVENTS: ${ENABLE_AGGREGATE_MAP_MINIMUM_DATA_EVENTS}
38+
ENABLE_AGGREGATE_SPAT_TIME_CHANGE_DETAILS_EVENTS: ${ENABLE_AGGREGATE_SPAT_TIME_CHANGE_DETAILS_EVENTS}
39+
ENABLE_AGGREGATE_SPAT_MINIMUM_DATA_EVENTS: ${ENABLE_AGGREGATE_SPAT_MINIMUM_DATA_EVENTS}
40+
ENABLE_AGGREGATE_MAP_MESSAGE_COUNT_PROGRESSION: ${ENABLE_AGGREGATE_MAP_MESSAGE_COUNT_PROGRESSION}
41+
ENABLE_AGGREGATE_SPAT_MESSAGE_COUNT_PROGRESSION: ${ENABLE_AGGREGATE_SPAT_MESSAGE_COUNT_PROGRESSION}
42+
ENABLE_AGGREGATE_BSM_MESSAGE_COUNT_PROGRESSION: ${ENABLE_AGGREGATE_BSM_MESSAGE_COUNT_PROGRESSION}
43+
ENABLE_AGGREGATE_EVENT_STATE_PROGRESSION: ${ENABLE_AGGREGATE_EVENT_STATE_PROGRESSION}
44+
3445
healthcheck:
3546
test: ["CMD", "java", "-version"]
3647
interval: 10s

jpo-conflictmonitor/src/main/resources/application.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,9 @@ map.spat.message.assessment:
286286
signalGroupAlignmentNotificationAggTopicName: topic.CmSignalGroupAlignmentNotificationAggregation
287287
signalStateConflictNotificationTopicName: topic.CmSignalStateConflictNotification
288288
signalStateConflictNotificationAggTopicName: topic.CmSignalStateConflictNotificationAggregation
289-
aggregateIntersectionReferenceAlignmentEvents: true
290-
aggregateSignalGroupAlignmentEvents: true
291-
aggregateSignalStateConflictEvents: true
289+
aggregateIntersectionReferenceAlignmentEvents: ${ENABLE_AGGREGATE_INTERSECTION_REFERENCE_ALIGNMENT_EVENTS:false}
290+
aggregateSignalGroupAlignmentEvents: ${ENABLE_AGGREGATE_SIGNAL_GROUP_ALIGNMENT_EVENTS:false}
291+
aggregateSignalStateConflictEvents: ${ENABLE_AGGREGATE_SIGNAL_STATE_CONFLICT_EVENTS:false}
292292

293293

294294
# MAP Time Change Details
@@ -311,7 +311,7 @@ map.validation:
311311
lowerBound: 9
312312
upperBound: 11
313313
debug: false
314-
aggregateMinimumDataEvents: true
314+
aggregateMinimumDataEvents: ${ENABLE_AGGREGATE_MAP_MINIMUM_DATA_EVENTS:false}
315315

316316

317317

@@ -418,7 +418,7 @@ spat.time.change.details:
418418
spatTimeChangeDetailsStateStoreName: spat-time-change-detail-state-store
419419
spatTimeChangeDetailsNotificationTopicName: topic.CmSpatTimeChangeDetailsNotification
420420
jitterBufferSize: 50
421-
aggregateEvents: true
421+
aggregateEvents: ${ENABLE_AGGREGATE_SPAT_TIME_CHANGE_DETAILS_EVENTS:false}
422422
aggNotificationTopicName: topic.CmSpatTimeChangeDetailsNotificationAggregation
423423

424424
# SPAT Validation
@@ -433,7 +433,7 @@ spat.validation:
433433
lowerBound: 90
434434
upperBound: 110
435435
debug: false
436-
aggregateMinimumDataEvents: true
436+
aggregateMinimumDataEvents: ${ENABLE_AGGREGATE_SPAT_MINIMUM_DATA_EVENTS:false}
437437

438438

439439
# Intersection Reference Alignment Notification
@@ -475,7 +475,7 @@ map.message.count.progression:
475475
latestMapStateStoreName: latestMapStateStore
476476
bufferTimeMs: 5000
477477
bufferGracePeriodMs: 800
478-
aggregateEvents: true
478+
aggregateEvents: ${ENABLE_AGGREGATE_MAP_MESSAGE_COUNT_PROGRESSION:false}
479479

480480
# SPAT Message Count Progression
481481
spat.message.count.progression:
@@ -487,7 +487,7 @@ spat.message.count.progression:
487487
latestSpatStateStoreName: latestSpatStateStore
488488
bufferTimeMs: 500
489489
bufferGracePeriodMs: 50
490-
aggregateEvents: true
490+
aggregateEvents: ${ENABLE_AGGREGATE_SPAT_MESSAGE_COUNT_PROGRESSION:false}
491491

492492
# BSM Message Count Progression
493493
bsm.message.count.progression:
@@ -499,7 +499,7 @@ bsm.message.count.progression:
499499
latestBsmStateStoreName: latestBsmStateStore
500500
bufferTimeMs: 500
501501
bufferGracePeriodMs: 50
502-
aggregateEvents: true
502+
aggregateEvents: ${ENABLE_AGGREGATE_BSM_MESSAGE_COUNT_PROGRESSION:false}
503503

504504
# Config parameters
505505
config:
@@ -544,7 +544,7 @@ event.state.progression:
544544
latestTransitionStoreName: latestTransitionStateStore
545545
bufferTimeMs: 1000
546546
bufferGracePeriodMs: 100
547-
aggregateEvents: true
547+
aggregateEvents: ${ENABLE_AGGREGATE_EVENT_STATE_PROGRESSION:false}
548548
illegalSpatTransitionList:
549549
- { stateA: STOP_THEN_PROCEED, stateB: PERMISSIVE_CLEARANCE }
550550
- { stateA: STOP_THEN_PROCEED, stateB: PROTECTED_CLEARANCE }

sample.env

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,17 @@ ROCKSDB_INDEX_FILTER_BLOCK_RATIO=0.1
8888
ROCKSDB_TOTAL_MEMTABLE_MEMORY=67108864
8989
ROCKSDB_BLOCK_SIZE=4096
9090
ROCKSDB_N_MEMTABLES=2
91-
ROCKSDB_MEMTABLE_SIZE=16777216
91+
ROCKSDB_MEMTABLE_SIZE=16777216
92+
93+
94+
# Set these to true to enable event aggregation for a given even topic. Note - this will disable regular event generation for that message type.
95+
ENABLE_AGGREGATE_INTERSECTION_REFERENCE_ALIGNMENT_EVENTS=false
96+
ENABLE_AGGREGATE_SIGNAL_GROUP_ALIGNMENT_EVENTS=false
97+
ENABLE_AGGREGATE_SIGNAL_STATE_CONFLICT_EVENTS=false
98+
ENABLE_AGGREGATE_MAP_MINIMUM_DATA_EVENTS=false
99+
ENABLE_AGGREGATE_SPAT_TIME_CHANGE_DETAILS_EVENTS=false
100+
ENABLE_AGGREGATE_SPAT_MINIMUM_DATA_EVENTS=false
101+
ENABLE_AGGREGATE_MAP_MESSAGE_COUNT_PROGRESSION=false
102+
ENABLE_AGGREGATE_SPAT_MESSAGE_COUNT_PROGRESSION=false
103+
ENABLE_AGGREGATE_BSM_MESSAGE_COUNT_PROGRESSION=false
104+
ENABLE_AGGREGATE_EVENT_STATE_PROGRESSION=false

0 commit comments

Comments
 (0)