Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable disabled metrics tests #88

Merged
merged 13 commits into from
Sep 7, 2023
Merged

Enable disabled metrics tests #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e562f44
[Automated] Update the native jar versions
gabilang Aug 22, 2023
58f5dd2
[Automated] Update the native jar versions
gabilang Aug 23, 2023
ebe9c7b
[Automated] Update the native jar versions
gabilang Aug 23, 2023
021e188
[Automated] Update the native jar versions
gabilang Aug 23, 2023
86c0419
[Automated] Update the native jar versions
gabilang Aug 24, 2023
b5e87ca
[Automated] Update the native jar versions
gabilang Aug 24, 2023
5e8a2c6
[Automated] Update the native jar versions
gabilang Aug 24, 2023
962c6c6
[Automated] Update the native jar versions
gabilang Aug 24, 2023
04f6bd7
Enable disabled Metrics tests
gabilang Aug 28, 2023
98e07b0
[Automated] Update the native jar versions
gabilang Aug 28, 2023
7044032
Merge branch 'main'
gabilang Sep 7, 2023
7d1195e
Bump ballerina observe version
gabilang Sep 7, 2023
e154c15
[Automated] Update the native jar versions
gabilang Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ballerina/Dependencies.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion build-config/checkstyle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {
id "de.undercouch.download"
}

apply plugin: 'java'
apply plugin: 'java-library'

task downloadCheckstyleRuleFiles(type: Download) {
src([
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

apply plugin: 'java'
apply plugin: 'java-library'

configurations {
jbalTools {
Expand Down
10 changes: 5 additions & 5 deletions ...ration-tests/src/test/java/io/ballerina/stdlib/observability/metrics/MetricsTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ private void testFunctionResponseTimeGaugeSnapshotPercentile(long invocationCoun
}
}

@Test(enabled = false)
@Test
public void testMainFunction() throws Exception {
String fileName = "01_main_function.bal";

Expand All @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions testobserve/native/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

plugins {
id 'java'
id 'java-library'
id 'checkstyle'
id 'com.github.spotbugs'
id 'jacoco'
Expand All @@ -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")]
}
Expand Down
2 changes: 1 addition & 1 deletion testobserve/tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

apply plugin: 'java'
apply plugin: 'java-library'

configurations {
jbalTools{
Expand Down