Commit 67c6e5a
committed
[da-vinci][server][controller][router][fc][tc][test]: Close async OTel
instruments properly with a uniform lifecycle
Stats classes that own ASYNC_GAUGE / ASYNC_COUNTER wrappers previously had
no consistent way to deregister the SDK-side callbacks at shutdown, so the
OTel SDK kept polling deleted stores and dropped instruments. This change
introduces a single close pattern and applies it uniformly across every
stats class that owns metric wrappers.
Lifecycle primitives (venice-client-common):
- CompositeCloseable: idempotent LIFO registry of Closeables.
- AbstractStatsCloseable: base providing the statsCloseables field and a
default close() that drains it.
- MetricEntityStateUtils.closeQuietly / closeAndClear.
- MetricEntityState* and AsyncMetricEntityState* factories now take a
CompositeCloseable so each wrapper self-registers and gets closed
(and async callbacks deregistered) when its owner shuts down.
Uniform adoption across stats and owner classes:
- AbstractVeniceAggVersionedStats extends AbstractStatsCloseable; close()
unregisters the metadata listener then drains the registry.
- Per-store PerStoreEntry inner classes (AggVersionedDIVStats,
AggVersionedDaVinciRecordTransformerStats, ServerMetadataServiceStats,
NativeMetadataRepositoryStats, BackupVersionOptimizationServiceStats)
extend AbstractStatsCloseable so handleStoreDeleted closes the per-store
wrappers and deregisters their SDK callbacks.
- AbstractVeniceService-based owners (HelixParticipation, KafkaStoreIngestion,
AggKafkaConsumer, AdaptiveThrottlerSignal, StoreBuffer, HeartbeatMonitoring)
hold their own statsCloseables and drain it from stopInner / clear /
shutdown.
- VeniceServer, HelixVeniceClusterResources, PartitionedProducerExecutor,
NativeMetadataRepository, ErrorPartitionResetTask, DaVinciBackend, and
the two VeniceChangelogConsumer* classes extend AbstractStatsCloseable.
Simplifications discovered while standardizing:
- Drop the StoreDataChangedListener pattern from
BackupVersionOptimizationServiceStats and ServerMetadataServiceStats
(sync COUNTERs don't need SDK-callback deregistration).
- Revert StoreVersionOtelStats to its original Map<String,
AtomicReference<VersionInfo>> design; handleStoreDeleted resets to
NON_EXISTING. Delete the now-unused StoreDataChangedListenerRegistration.
- Remove the volatile boolean closed flags (4 classes) — bounded
post-close leak is acceptable and matches sibling classes.
Helper consolidation:
- OpenTelemetryMetricsSetup.buildStoreDimensionsMap(baseDims, storeName)
replaces 5 private helpers plus 3 inline patterns and sanitizes the
store name consistently.
- MetricsRepositoryUtils.createOtelEnabledRepository /
createOtelDisabledRepository replace OTel test-setup boilerplate across
~13 test classes.1 parent 510b37f commit 67c6e5a
149 files changed
Lines changed: 3601 additions & 1388 deletions
File tree
- clients
- da-vinci-client/src
- main/java/com/linkedin/davinci
- consumer
- stats
- helix
- kafka/consumer
- repository
- stats
- ingestion
- heartbeat
- test/java/com/linkedin/davinci/stats
- ingestion/heartbeat
- venice-client/src/main/java/com/linkedin/venice/fastclient
- meta
- stats
- venice-producer/src/main/java/com/linkedin/venice/producer
- venice-thin-client/src/main/java/com/linkedin/venice/client
- stats
- store
- internal
- venice-client-common/src
- main/java/com/linkedin/venice
- stats
- metrics
- routing
- utils/metrics
- test/java/com/linkedin/venice/stats
- metrics
- venice-common/src/main/java/com/linkedin/venice
- meta
- stats
- venice-test-common/src/jmh/java/com/linkedin/venice/benchmark
- services
- venice-controller/src/main/java/com/linkedin/venice/controller
- kafka
- consumer
- lingeringjob
- server
- stats
- systemstore
- venice-router/src/main/java/com/linkedin/venice/router
- api
- routing/helix
- stats
- venice-server/src
- main/java/com/linkedin/venice
- cleaner
- listener
- server
- stats
- test/java/com/linkedin/venice/stats
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 20 additions & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
| 68 | + | |
68 | 69 | | |
69 | 70 | | |
70 | 71 | | |
71 | 72 | | |
72 | 73 | | |
73 | | - | |
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
| |||
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
103 | | - | |
| 103 | + | |
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
| |||
189 | 189 | | |
190 | 190 | | |
191 | 191 | | |
192 | | - | |
193 | | - | |
194 | | - | |
195 | | - | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | | - | |
200 | | - | |
201 | | - | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
202 | 204 | | |
203 | 205 | | |
204 | 206 | | |
| |||
298 | 300 | | |
299 | 301 | | |
300 | 302 | | |
301 | | - | |
302 | | - | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
303 | 308 | | |
304 | 309 | | |
305 | 310 | | |
| |||
434 | 439 | | |
435 | 440 | | |
436 | 441 | | |
437 | | - | |
438 | | - | |
439 | | - | |
| 442 | + | |
440 | 443 | | |
441 | 444 | | |
442 | 445 | | |
| |||
Lines changed: 10 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
| |||
64 | 65 | | |
65 | 66 | | |
66 | 67 | | |
67 | | - | |
| 68 | + | |
68 | 69 | | |
69 | 70 | | |
70 | 71 | | |
| |||
184 | 185 | | |
185 | 186 | | |
186 | 187 | | |
187 | | - | |
188 | | - | |
189 | | - | |
190 | | - | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
191 | 193 | | |
192 | 194 | | |
193 | 195 | | |
| |||
439 | 441 | | |
440 | 442 | | |
441 | 443 | | |
| 444 | + | |
442 | 445 | | |
443 | 446 | | |
444 | 447 | | |
445 | 448 | | |
446 | 449 | | |
447 | 450 | | |
| 451 | + | |
| 452 | + | |
448 | 453 | | |
449 | 454 | | |
450 | 455 | | |
| |||
Lines changed: 22 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
| 60 | + | |
60 | 61 | | |
61 | 62 | | |
62 | 63 | | |
| |||
102 | 103 | | |
103 | 104 | | |
104 | 105 | | |
105 | | - | |
| 106 | + | |
106 | 107 | | |
107 | 108 | | |
108 | 109 | | |
| |||
250 | 251 | | |
251 | 252 | | |
252 | 253 | | |
253 | | - | |
254 | | - | |
255 | | - | |
256 | | - | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
257 | 259 | | |
258 | 260 | | |
259 | 261 | | |
| |||
1169 | 1171 | | |
1170 | 1172 | | |
1171 | 1173 | | |
1172 | | - | |
1173 | | - | |
1174 | | - | |
1175 | | - | |
1176 | | - | |
1177 | | - | |
1178 | | - | |
1179 | | - | |
1180 | | - | |
| 1174 | + | |
| 1175 | + | |
| 1176 | + | |
| 1177 | + | |
| 1178 | + | |
| 1179 | + | |
| 1180 | + | |
| 1181 | + | |
| 1182 | + | |
| 1183 | + | |
1181 | 1184 | | |
1182 | | - | |
1183 | | - | |
| 1185 | + | |
| 1186 | + | |
| 1187 | + | |
| 1188 | + | |
| 1189 | + | |
1184 | 1190 | | |
1185 | 1191 | | |
1186 | 1192 | | |
| |||
Lines changed: 20 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | | - | |
| 77 | + | |
| 78 | + | |
78 | 79 | | |
79 | 80 | | |
80 | 81 | | |
| |||
83 | 84 | | |
84 | 85 | | |
85 | 86 | | |
86 | | - | |
| 87 | + | |
| 88 | + | |
87 | 89 | | |
88 | 90 | | |
89 | 91 | | |
| |||
92 | 94 | | |
93 | 95 | | |
94 | 96 | | |
95 | | - | |
| 97 | + | |
| 98 | + | |
96 | 99 | | |
97 | 100 | | |
98 | 101 | | |
| |||
101 | 104 | | |
102 | 105 | | |
103 | 106 | | |
104 | | - | |
| 107 | + | |
| 108 | + | |
105 | 109 | | |
106 | 110 | | |
107 | 111 | | |
| |||
110 | 114 | | |
111 | 115 | | |
112 | 116 | | |
113 | | - | |
| 117 | + | |
| 118 | + | |
114 | 119 | | |
115 | 120 | | |
116 | 121 | | |
| |||
119 | 124 | | |
120 | 125 | | |
121 | 126 | | |
122 | | - | |
| 127 | + | |
| 128 | + | |
123 | 129 | | |
124 | 130 | | |
125 | 131 | | |
| |||
128 | 134 | | |
129 | 135 | | |
130 | 136 | | |
131 | | - | |
| 137 | + | |
| 138 | + | |
132 | 139 | | |
133 | 140 | | |
134 | 141 | | |
| |||
137 | 144 | | |
138 | 145 | | |
139 | 146 | | |
140 | | - | |
| 147 | + | |
| 148 | + | |
141 | 149 | | |
142 | 150 | | |
143 | 151 | | |
| |||
146 | 154 | | |
147 | 155 | | |
148 | 156 | | |
149 | | - | |
| 157 | + | |
| 158 | + | |
150 | 159 | | |
151 | 160 | | |
152 | 161 | | |
| |||
155 | 164 | | |
156 | 165 | | |
157 | 166 | | |
158 | | - | |
| 167 | + | |
| 168 | + | |
159 | 169 | | |
160 | 170 | | |
161 | 171 | | |
| |||
Lines changed: 14 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| 37 | + | |
37 | 38 | | |
38 | 39 | | |
39 | 40 | | |
| |||
90 | 91 | | |
91 | 92 | | |
92 | 93 | | |
| 94 | + | |
| 95 | + | |
93 | 96 | | |
94 | 97 | | |
95 | 98 | | |
| |||
193 | 196 | | |
194 | 197 | | |
195 | 198 | | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | | - | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
200 | 204 | | |
201 | 205 | | |
202 | 206 | | |
203 | 207 | | |
204 | 208 | | |
205 | 209 | | |
206 | | - | |
207 | | - | |
208 | | - | |
209 | | - | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
210 | 215 | | |
211 | 216 | | |
212 | 217 | | |
| |||
301 | 306 | | |
302 | 307 | | |
303 | 308 | | |
| 309 | + | |
304 | 310 | | |
305 | 311 | | |
306 | 312 | | |
| |||
Lines changed: 6 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
49 | 50 | | |
50 | 51 | | |
51 | 52 | | |
| 53 | + | |
| 54 | + | |
52 | 55 | | |
53 | 56 | | |
54 | 57 | | |
| |||
63 | 66 | | |
64 | 67 | | |
65 | 68 | | |
66 | | - | |
67 | | - | |
| 69 | + | |
| 70 | + | |
68 | 71 | | |
69 | 72 | | |
70 | 73 | | |
| |||
171 | 174 | | |
172 | 175 | | |
173 | 176 | | |
| 177 | + | |
174 | 178 | | |
175 | 179 | | |
176 | 180 | | |
| |||
0 commit comments