Commit 3a23f06
committed
Update Ameria to 1.34.1
Fixes #6271 since the current Ameria version is affected by a couple
of bugs (see comment #6271 (comment)).
To support the ameria update update Netty to 4.2.7.
Furthermore, the new armeria version brings in Micrometer 1.16.0
as transitive dependency, which deprecates the io.micrometer.core.lang
annotations - see release notes:
https://github.com/micrometer-metrics/micrometer/releases/tag/v1.16.0.
Signed-off-by: Jannik Brand <jannik.brand@sap.com>1 parent 72a85f5 commit 3a23f06
File tree
3 files changed
+6
-6
lines changed- data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter
3 files changed
+6
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
230 | 230 | | |
231 | 231 | | |
232 | 232 | | |
233 | | - | |
234 | | - | |
| 233 | + | |
| 234 | + | |
235 | 235 | | |
236 | | - | |
237 | | - | |
| 236 | + | |
| 237 | + | |
238 | 238 | | |
239 | 239 | | |
240 | 240 | | |
| |||
data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
24 | 23 | | |
25 | 24 | | |
26 | 25 | | |
27 | 26 | | |
28 | 27 | | |
29 | 28 | | |
30 | 29 | | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| |||
0 commit comments