Fix oshi library tests on arm mac (open-telemetry#11301)

laurit · web-flow · commit bc48984714f9 · 2024-05-09T08:11:55.000-07:00
diff --git a/instrumentation/oshi/library/build.gradle.kts b/instrumentation/oshi/library/build.gradle.kts
@@ -1,9 +1,13 @@
 plugins {
   id("otel.library-instrumentation")
+  id("com.google.osdetector")
 }
 
+// 5.5.0 is the first version that works on arm mac
+val oshiVersion = if (osdetector.os == "osx" && osdetector.arch == "aarch_64") "5.5.0" else "5.3.1"
+
 dependencies {
-  library("com.github.oshi:oshi-core:5.3.1")
+  library("com.github.oshi:oshi-core:$oshiVersion")
 
   testImplementation(project(":instrumentation:oshi:testing"))
 }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,13 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("otel.library-instrumentation")`
	`3`	`+ id("com.google.osdetector")`
`3`	`4`	`}`
`4`	`5`
	`6`	`+// 5.5.0 is the first version that works on arm mac`
	`7`	`+val oshiVersion = if (osdetector.os == "osx" && osdetector.arch == "aarch_64") "5.5.0" else "5.3.1"`
	`8`	`+`
`5`	`9`	`dependencies {`
`6`		`- library("com.github.oshi:oshi-core:5.3.1")`
	`10`	`+ library("com.github.oshi:oshi-core:$oshiVersion")`
`7`	`11`
`8`	`12`	`testImplementation(project(":instrumentation:oshi:testing"))`
`9`	`13`	`}`