From e2cfbca5b71cd22fd8367d7a24385fd9a82c81cb Mon Sep 17 00:00:00 2001 From: Jeremy Grunert Date: Sat, 8 Nov 2025 00:18:02 +0100 Subject: [PATCH 1/2] fix kotlin-server - add needed micrometer context-propagation dependency - remove unnecessary code and ssl files - add grpc-client as module in settings.gradle --- samples/grpc-server-kotlin/build.gradle | 1 + .../grpc/sample/GrpcServerApplicationTests.kt | 12 ++---------- .../test/resources/application-ssl.properties | 5 ----- .../src/test/resources/test.jks | Bin 2264 -> 0 bytes samples/settings.gradle | 1 + 5 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 samples/grpc-server-kotlin/src/test/resources/application-ssl.properties delete mode 100644 samples/grpc-server-kotlin/src/test/resources/test.jks diff --git a/samples/grpc-server-kotlin/build.gradle b/samples/grpc-server-kotlin/build.gradle index a9d60235..173edbe7 100644 --- a/samples/grpc-server-kotlin/build.gradle +++ b/samples/grpc-server-kotlin/build.gradle @@ -35,6 +35,7 @@ dependencies { implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-actuator' + implementation("io.micrometer:context-propagation:1.2.0") implementation 'io.grpc:grpc-services' implementation "io.grpc:grpc-kotlin-stub:${kotlinStubVersion}" diff --git a/samples/grpc-server-kotlin/src/test/kotlin/org/springframework/grpc/sample/GrpcServerApplicationTests.kt b/samples/grpc-server-kotlin/src/test/kotlin/org/springframework/grpc/sample/GrpcServerApplicationTests.kt index 319c9a32..51614de8 100644 --- a/samples/grpc-server-kotlin/src/test/kotlin/org/springframework/grpc/sample/GrpcServerApplicationTests.kt +++ b/samples/grpc-server-kotlin/src/test/kotlin/org/springframework/grpc/sample/GrpcServerApplicationTests.kt @@ -17,11 +17,12 @@ import org.springframework.test.annotation.DirtiesContext "spring.grpc.server.port=0", "spring.grpc.client.default-channel.address=0.0.0.0:\${local.grpc.port}" ], - useMainMethod = UseMainMethod.ALWAYS ) @DirtiesContext class GrpcServerApplicationTests { + private val log: Log = LogFactory.getLog(this.javaClass) + @Autowired private lateinit var stub: SimpleBlockingStub @@ -39,13 +40,4 @@ class GrpcServerApplicationTests { ) Assertions.assertEquals("Hello ==> Alien", response.getMessage()) } - - companion object { - private val log: Log = LogFactory.getLog(GrpcServerApplicationTests::class.java) - - @JvmStatic - fun main(args: Array) { - SpringApplicationBuilder(GrpcServerApplication::class.java).run() - } - } } diff --git a/samples/grpc-server-kotlin/src/test/resources/application-ssl.properties b/samples/grpc-server-kotlin/src/test/resources/application-ssl.properties deleted file mode 100644 index 50ad5c4c..00000000 --- a/samples/grpc-server-kotlin/src/test/resources/application-ssl.properties +++ /dev/null @@ -1,5 +0,0 @@ -spring.grpc.server.ssl.bundle=ssltest -spring.ssl.bundle.jks.ssltest.keystore.location=classpath:test.jks -spring.ssl.bundle.jks.ssltest.keystore.password=secret -spring.ssl.bundle.jks.ssltest.keystore.type=JKS -spring.ssl.bundle.jks.ssltest.key.password=password \ No newline at end of file diff --git a/samples/grpc-server-kotlin/src/test/resources/test.jks b/samples/grpc-server-kotlin/src/test/resources/test.jks deleted file mode 100644 index 6aa9a28053a591e41453e665e5024e8a8cb78b3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2264 zcmchYX*3iJ7sqE|hQS!q5Mv)4GM2$i#uAFqC`%7x7baWA*i&dRX>3`uq(XS?3XSYp z%38`&ib7E$8j~$cF^}gt?|I+noW8#w?uYxk=iGD8|K9Vzd#pVc0002(2k@T|2@MMI zqxqr2AhQO*TVi`j@((S;e;g;l$#dAA{>vf0kX$R(Qn4oKgGEYjZ5zti2dw?Z6A zh%LuFCNI?9o+Z1duJL-++e#cjO`zlK?u9s030=k_*wD1#-$FbIDRDnA^vo@fm( zzjt(3VJrGOr0iHXSTM|rYN#>RZ@Dp`PwB2zrDQffLvuoR2~V3ReYa0&vU^dXd8isV zsAf*@!8s%xBvHLseXn6f?1kefe(8uAmAbaF$x{Ykzb6c6jdUwY1$y4tFzsj7 zIghr!T#ODfu@Po!a29@kXQ8kY#(LE<0o7?7PQ|eMeY@Equ?R-6*f@Na3o&stDQ=6( zQzDSQhCnS(9Bu9W_~giknP0vECqUsr4_9y_}nEU`cy z4}dApnAip92wMwgzciAFpc3i}+-#Zlq+iF7d1y}d4Qsp8=%l1N8NIs161I`HmkcpQ zY4*CUCFJJf(2!M{`&qQ}3($KeTQ=)mMrBs`DOb;%Of0tC)9he_p~w&CO#DfCgx(%s z{@|D(brX_Gb}ZDLmGej*JgEl0Et>q~kgTXuJg-PwvRjNx8sBbIShxD=xOySzw{;^X zAvrh5HTg>Xq@<{#^!Kg}B?qz@b<{ebD)yaSf&RChBIJQo-?Ahzw@qopSe^e&>^IuU zydM4Y1_C&>k7u|}=; z63R7$H6zat=hNExxEwXu1fQ*ytuEkP!{w{|#6TIEq1#*ck=6_NM*ILF65tmD-O5&R zMI!-MT<3U~t@}(CN4@RlZ~1I>C=!ywF)dNI{VvH;5Y3(Z4jY^%_c&fsm4Q`<1g|qX z&!h29jXjVE3nJnet*L)XL?-8<>qDbVGP%i^NwOZfwWO7?Mr!X7 zl}sG@9S_5}}td}$xrWIYY=e(VVBiv%A+M-{M z!3_^Tc=pV?niT!{D`!{e@W;MvrZ(OER{x7itVAtwE~spPtPtma|J=5dv&_oE!5H#` zdgXJ;+gJ4hI}*9QX9jpL`Gb)yCe%1}t!&O-^sihyZys%%5uF~WhsR_w(q7;vV5d4P zr%ZUA2}kO+L^2ePTgGT9Ua71w<+)poSyjTdLq&xbUn`<6&SpwFp(HRHUyU6J3WZ_! zfztko79+94Tq%mTYj53(RYcL&1~5`I#+w3`(Q|r+P(aT z%?r(^?IWw~19CB&uvXf(f7&BnEE{zwK4piVU`I4j1j?v5d4N<7VUJ8nM`$7S*mfKR z#9-JzPRZ?{M!@L+0N^V)IyeeP2T|^UK|m0QD+Ibs!wEoml^N!YO#vW~j~jraX(0A3 z6Kux?IRLez`O^X;{!4g%BhcRn>^H*qKZ3*|{_YGuz)KCJcu;)DSES5D2tDE`C02YR0R%Vy1T7k|RQ;3g<0icA$AuP0pOvc~jGl zz+NeKv_FT_;GWK&8XlDUv&hv9kxg?@c!bu?83i=YQ$S!K09Y)Glg3Hz?@|)ZCBlVz zP8i}#XZkMoje3I=h&I!!s_m?Qi@1MR`yv7X*yEs47qOs^t^?&=;*IQ!q&)gq_Sx5* z?fhU8Q*PSe*w7y)FH#P!9R^Xw!lTT+zI39L<&8cViaj$A(Z2Cg7!{V?uuyi#vlNCg z40i}2ivw&y&1-&Nh&WMG`&aIt>)(#tKTJ}^@696Kw1-{IzSOTnFF+0@k$o3%ZHS;Q#;t diff --git a/samples/settings.gradle b/samples/settings.gradle index 63a68ea3..a794d86d 100644 --- a/samples/settings.gradle +++ b/samples/settings.gradle @@ -6,6 +6,7 @@ pluginManagement { } } +include 'grpc-client' include 'grpc-reactive' include 'grpc-oauth2' include 'grpc-secure' From 28505e136eaebc7d4b366df939718862ac20aed1 Mon Sep 17 00:00:00 2001 From: Jeremy Grunert Date: Sat, 8 Nov 2025 00:22:16 +0100 Subject: [PATCH 2/2] fix kotlin-server - add needed micrometer context-propagation dependency to pom.xml --- samples/grpc-server-kotlin/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/samples/grpc-server-kotlin/pom.xml b/samples/grpc-server-kotlin/pom.xml index f5e1fa23..c38a022b 100644 --- a/samples/grpc-server-kotlin/pom.xml +++ b/samples/grpc-server-kotlin/pom.xml @@ -68,6 +68,11 @@ org.springframework.boot spring-boot-starter-actuator + + io.micrometer + context-propagation + 1.2.0 +