Merge pull request #88 from gabilang/enable-metrics-tests

Enable disabled metrics tests
ballerina-platform · Sep 7, 2023 · 7938b9b · 7938b9b
2 parents b3bbdc2 + e154c15
commit 7938b9b
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -5,7 +5,7 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.8.0-20230726-145300-b2bdf796"
+distribution-version = "2201.8.0-20230830-220400-8a7556d8"
 
 [[package]]
 org = "ballerina"

diff --git a/build-config/checkstyle/build.gradle b/build-config/checkstyle/build.gradle
@@ -19,7 +19,7 @@ plugins {
     id "de.undercouch.download"
 }
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 task downloadCheckstyleRuleFiles(type: Download) {
     src([

diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@
 
 plugins {
     id "com.github.spotbugs" version "5.0.14"
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
     id "de.undercouch.download" version "5.4.0"
     id "net.researchgate.release" version "2.8.0"
 }

diff --git a/gradle.properties b/gradle.properties
@@ -21,10 +21,10 @@ ballerinaTomlParserVersion=1.2.2
 ballerinaGradlePluginVersion=2.0.1
 puppycrawlCheckstyleVersion=10.12.0
 openTelemetryVersion=1.7.0
-nettyCodecVersion=4.1.77.Final
+nettyCodecVersion=4.1.96.Final
 gsonVersion=2.10.1
 
-observeVersion=1.2.0-20230831-133600-6d16df4
+observeVersion=1.2.0-20230906-133800-1d5124f
 
 # Test Dependency Versions
 testngVersion=7.6.1

diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle
@@ -15,7 +15,7 @@
  *
  */
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 configurations {
     jbalTools {

diff --git a/...ration-tests/src/test/java/io/ballerina/stdlib/observability/metrics/MetricsTestCase.java b/...ration-tests/src/test/java/io/ballerina/stdlib/observability/metrics/MetricsTestCase.java
@@ -331,7 +331,7 @@ private void testFunctionResponseTimeGaugeSnapshotPercentile(long invocationCoun
         }
     }
 
-    @Test(enabled = false)
+    @Test
     public void testMainFunction() throws Exception {
         String fileName = "01_main_function.bal";
 
@@ -355,7 +355,7 @@ public void testMainFunction() throws Exception {
         );
     }
 
-    @Test(enabled = false)
+    @Test
     public void testResourceFunction() throws Exception {
         String fileName = "02_resource_function.bal";
         String serviceName = "/testServiceOne";
@@ -405,7 +405,7 @@ public void testResourceFunction() throws Exception {
         );
     }
 
-    @Test(enabled = false)
+    @Test
     public void testPathsWithEscapeCharacters() throws Exception {
         String fileName = "02_resource_function.bal";
         String serviceName = "/this\\-is\\-service\\-path/still\\-service\\-path";
@@ -440,7 +440,7 @@ public void testPathsWithEscapeCharacters() throws Exception {
         );
     }
 
-    @Test(enabled = false)
+    @Test
     public void testWorkers() throws Exception {
         String fileName = "02_resource_function.bal";
         String serviceName = "/testServiceOne";
@@ -494,7 +494,7 @@ public void testWorkers() throws Exception {
         );
     }
 
-    @Test(enabled = false)
+    @Test
     public void testCustomMetricTags() throws Exception {
         String fileName = "03_custom_metric_tags.bal";
         String serviceName = "/testServiceTwo";

diff --git a/testobserve/native/build.gradle b/testobserve/native/build.gradle
@@ -16,7 +16,7 @@
  */
 
 plugins {
-    id 'java'
+    id 'java-library'
     id 'checkstyle'
     id 'com.github.spotbugs'
     id 'jacoco'
@@ -42,7 +42,7 @@ dependencies {
 }
 
 checkstyle {
-    toolVersion '7.8.2'
+    toolVersion '10.12.1'
     configFile rootProject.file("build-config/checkstyle/build/checkstyle.xml")
     configProperties = ["suppressionFile": file("${rootDir}/build-config/checkstyle/build/suppressions.xml")]
 }

diff --git a/testobserve/tests/build.gradle b/testobserve/tests/build.gradle
@@ -15,7 +15,7 @@
  *
  */
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 configurations {
     jbalTools{