From 99e860e770e43bb4afc4d8f0c1ae2ce7443f35f1 Mon Sep 17 00:00:00 2001 From: Jean Bisutti Date: Fri, 15 Nov 2024 16:02:48 +0100 Subject: [PATCH 1/5] Fix native test execution --- .../META-INF/native-image/reflect-config.json | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/resources/META-INF/native-image/reflect-config.json b/smoke-tests-otel-starter/spring-boot-common/src/main/resources/META-INF/native-image/reflect-config.json index ab4757f6961c..5e443ba2c318 100644 --- a/smoke-tests-otel-starter/spring-boot-common/src/main/resources/META-INF/native-image/reflect-config.json +++ b/smoke-tests-otel-starter/spring-boot-common/src/main/resources/META-INF/native-image/reflect-config.json @@ -1244,5 +1244,35 @@ "condition": { "typeReachable": "org.apache.kafka.common.utils.AppInfoParser" } + }, + { + "name": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField", + "fields": [ + { + "name": "producerIndex" + } + ], + "condition": { + "typeReachable": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField" + } + } + , + { + "condition": { + "typeReachable": "io.netty.resolver.dns.DnsServerAddressStreamProviders" + }, + "name": "io.netty.resolver.dns.macos.MacOSDnsServerAddressStreamProvider", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "condition": { + "typeReachable": "io.netty.resolver.dns.DnsServerAddressStreamProviders$1" + }, + "name": "io.netty.resolver.dns.macos.MacOSDnsServerAddressStreamProvider" } ] From 8a4d86eea655d7db8dcab83e82f58501ef3d7b26 Mon Sep 17 00:00:00 2001 From: Jean Bisutti Date: Mon, 18 Nov 2024 12:32:50 +0100 Subject: [PATCH 2/5] reactive reflect config --- .../META-INF/native-image/reflect-config.json | 30 ------------------- .../META-INF/native-image/reflect-config.json | 13 ++++++++ 2 files changed, 13 insertions(+), 30 deletions(-) create mode 100644 smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/resources/META-INF/native-image/reflect-config.json b/smoke-tests-otel-starter/spring-boot-common/src/main/resources/META-INF/native-image/reflect-config.json index 5e443ba2c318..ab4757f6961c 100644 --- a/smoke-tests-otel-starter/spring-boot-common/src/main/resources/META-INF/native-image/reflect-config.json +++ b/smoke-tests-otel-starter/spring-boot-common/src/main/resources/META-INF/native-image/reflect-config.json @@ -1244,35 +1244,5 @@ "condition": { "typeReachable": "org.apache.kafka.common.utils.AppInfoParser" } - }, - { - "name": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField", - "fields": [ - { - "name": "producerIndex" - } - ], - "condition": { - "typeReachable": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField" - } - } - , - { - "condition": { - "typeReachable": "io.netty.resolver.dns.DnsServerAddressStreamProviders" - }, - "name": "io.netty.resolver.dns.macos.MacOSDnsServerAddressStreamProvider", - "methods": [ - { - "name": "", - "parameterTypes": [] - } - ] - }, - { - "condition": { - "typeReachable": "io.netty.resolver.dns.DnsServerAddressStreamProviders$1" - }, - "name": "io.netty.resolver.dns.macos.MacOSDnsServerAddressStreamProvider" } ] diff --git a/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json b/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json new file mode 100644 index 000000000000..d9fa9b24be51 --- /dev/null +++ b/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json @@ -0,0 +1,13 @@ +[ + { + "name": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField", + "fields": [ + { + "name": "producerIndex" + } + ], + "condition": { + "typeReachable": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField" + } + } +] From b16d1e148a9c2934067992f468323d1612b63ed0 Mon Sep 17 00:00:00 2001 From: Jean Bisutti Date: Mon, 18 Nov 2024 14:06:29 +0100 Subject: [PATCH 3/5] Add other hint --- .../META-INF/native-image/reflect-config.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json b/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json index d9fa9b24be51..66925c63c355 100644 --- a/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json +++ b/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json @@ -9,5 +9,16 @@ "condition": { "typeReachable": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField" } + }, + { + "condition": { + "typeReachable": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField" + }, + "name": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField", + "fields": [ + { + "name": "producerLimit" + } + ] } ] From cbcdcf6cc60f171e92f8f2e7ce993401fd1aa40a Mon Sep 17 00:00:00 2001 From: Jean Bisutti Date: Mon, 18 Nov 2024 14:07:55 +0100 Subject: [PATCH 4/5] Condition at first --- .../resources/META-INF/native-image/reflect-config.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json b/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json index 66925c63c355..c59b2f46df2d 100644 --- a/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json +++ b/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json @@ -1,14 +1,14 @@ [ { + "condition": { + "typeReachable": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField" + }, "name": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField", "fields": [ { "name": "producerIndex" } - ], - "condition": { - "typeReachable": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField" - } + ] }, { "condition": { From 866ade40e0cc89998ec50f44d6ca0a3284e39468 Mon Sep 17 00:00:00 2001 From: Jean Bisutti Date: Mon, 18 Nov 2024 14:57:18 +0100 Subject: [PATCH 5/5] Add hint --- .../META-INF/native-image/reflect-config.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json b/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json index c59b2f46df2d..99f247dd6e2b 100644 --- a/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json +++ b/smoke-tests-otel-starter/spring-boot-reactive-common/src/main/resources/META-INF/native-image/reflect-config.json @@ -10,6 +10,17 @@ } ] }, + { + "condition": { + "typeReachable": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField" + }, + "name": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField", + "fields": [ + { + "name": "consumerIndex" + } + ] + }, { "condition": { "typeReachable": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField"