Fix oshi latest dep test (#4993)

open-telemetry · Jan 3, 2022 · a45aaf3 · a45aaf3
1 parent 83c94e9
commit a45aaf3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/...t/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiMetricsInstaller.java b/...t/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiMetricsInstaller.java
@@ -26,12 +26,21 @@ public void afterAgent(Config config) {
         // Oshi instrumentation will intercept this call and enable SystemMetrics.
         Class<?> oshiSystemInfoClass =
             ClassLoader.getSystemClassLoader().loadClass("oshi.SystemInfo");
-        Method getCurrentPlatformEnumMethod =
-            oshiSystemInfoClass.getMethod("getCurrentPlatformEnum");
+        Method getCurrentPlatformEnumMethod = getCurrentPlatformMethod(oshiSystemInfoClass);
         getCurrentPlatformEnumMethod.invoke(null);
       } catch (Throwable ex) {
         // OK
       }
     }
   }
+
+  private static Method getCurrentPlatformMethod(Class<?> oshiSystemInfoClass)
+      throws NoSuchMethodException {
+    try {
+      return oshiSystemInfoClass.getMethod("getCurrentPlatformEnum");
+    } catch (NoSuchMethodException exception) {
+      // renamed in oshi 6.0.0
+      return oshiSystemInfoClass.getMethod("getCurrentPlatform");
+    }
+  }
 }
diff --git a/.../main/java/io/opentelemetry/javaagent/instrumentation/oshi/SystemInfoInstrumentation.java b/.../main/java/io/opentelemetry/javaagent/instrumentation/oshi/SystemInfoInstrumentation.java
@@ -32,7 +32,10 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   @Override
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
-        isMethod().and(isPublic()).and(isStatic()).and(named("getCurrentPlatformEnum")),
+        isMethod()
+            .and(isPublic())
+            .and(isStatic())
+            .and(named("getCurrentPlatformEnum").or(named("getCurrentPlatform"))),
         this.getClass().getName() + "$GetCurrentPlatformEnumAdvice");
   }