fix base metrics with respect to new version 2.0 style

Author: penehyba

metrics/application-metrics/src/test/java/org/eclipse/microprofile12/metrics/application/ApplicationMetricsTest.java

@@ -67,8 +67,10 @@ public void testBasePrometheusMetrics() throws IOException {
  .get();
  String responseText = response.readEntity(String.class);
  System.out.println("testBasePrometheusMetrics " + responseText);
- assertTrue(responseText.contains("# TYPE application:org_eclipse_microprofile12_metrics_application_user_resource_get_users counter"));
- assertTrue(responseText.contains("# TYPE application:org_eclipse_microprofile12_metrics_application_user_resource_get_user_count gauge"));
+ assertTrue(responseText.contains("# TYPE application:org_eclipse_microprofile12_metrics_application_user_resource_get_users counter")
+ || responseText.contains("# TYPE application_org_eclipse_microprofile12_metrics_application_UserResource_getUsers_total counter"));
+ assertTrue(responseText.contains("# TYPE application:org_eclipse_microprofile12_metrics_application_user_resource_get_user_count gauge")
+ || responseText.contains("# TYPE application_org_eclipse_microprofile12_metrics_application_UserResource_getUserCount gauge"));
  }
 
  @Test

metrics/base-metrics/src/test/java/org/eclipse/microprofile12/metrics/base/BaseMetricsTest.java

@@ -55,10 +55,14 @@ public void testBasePrometheusMetrics() throws IOException {
  .request(TEXT_PLAIN)
  .get();
  String responseText = response.readEntity(String.class);
- assertTrue(responseText.contains("# TYPE base:thread_max_count"));
- assertTrue(responseText.contains("# TYPE base:thread_count"));
- assertTrue(responseText.contains("# TYPE base:cpu_system_load_average"));
- assertTrue(responseText.contains("# TYPE base:jvm_uptime"));
+ assertTrue(responseText.contains("# TYPE base:thread_max_count") 
+ || responseText.contains("# TYPE base_thread_max_count"));
+ assertTrue(responseText.contains("# TYPE base:thread_count") 
+ || responseText.contains("# TYPE base_thread_count"));
+ assertTrue(responseText.contains("# TYPE base:cpu_system_load_average") 
+ || responseText.contains("# TYPE base_cpu_systemLoadAverage"));
+ assertTrue(responseText.contains("# TYPE base:jvm_uptime") 
+ || responseText.contains("# TYPE base_jvm_uptime_seconds"));
  }
 
  @Test