From d3ae7b786bdf0f6cbaf85e9e89740c64eb2c24e9 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Mon, 18 Nov 2024 14:52:39 +0530 Subject: [PATCH 1/9] Use main branch for github actions --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 08c29c1..432a005 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.caching=true group=io.ballerina version=1.3.1-SNAPSHOT -ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87 +ballerinaLangVersion=2201.11.0-20241117-133400-a3054b77 githubSpotbugsVersion=6.0.18 githubJohnrengelmanShadowVersion=8.1.1 underCouchDownloadVersion=5.4.0 From bcab000cb2242d7f031905a5609f911d6516f942 Mon Sep 17 00:00:00 2001 From: NipunaMadhushan Date: Fri, 22 Nov 2024 10:18:35 +0530 Subject: [PATCH 2/9] Update lang version --- ballerina/Ballerina.toml | 2 +- gradle.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 66bf798..aaa7f02 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -2,7 +2,7 @@ org = "ballerinai" name = "observe" version = "1.3.0" -distribution = "2201.10.0" +distribution = "2201.11.0" [platform.java21] graalvmCompatible = true diff --git a/gradle.properties b/gradle.properties index 432a005..ef57f66 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.caching=true group=io.ballerina version=1.3.1-SNAPSHOT -ballerinaLangVersion=2201.11.0-20241117-133400-a3054b77 +ballerinaLangVersion=2201.11.0-20241121-075100-c4c87cbc githubSpotbugsVersion=6.0.18 githubJohnrengelmanShadowVersion=8.1.1 underCouchDownloadVersion=5.4.0 @@ -28,7 +28,7 @@ openTelemetryVersion=1.7.0 nettyCodecVersion=4.1.100.Final gsonVersion=2.10.1 -observeVersion=1.4.0-20241113-092000-b83ae74 +observeVersion=1.4.0-20241122-101200-19a70b1 # Test Dependency Versions testngVersion=7.6.1 From bd8412c09a2456d4868cd413e8dd05f0af9817e9 Mon Sep 17 00:00:00 2001 From: NipunaMadhushan Date: Fri, 22 Nov 2024 10:19:52 +0530 Subject: [PATCH 3/9] Update lang version --- build-config/resources/Ballerina.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index c2c9ac9..afa762a 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -2,7 +2,7 @@ org = "ballerinai" name = "observe" version = "@toml.version@" -distribution = "2201.10.0" +distribution = "2201.11.0" [platform.java21] graalvmCompatible = true From f51356ba2de616ac66763d2e27e9fdfecd2984e8 Mon Sep 17 00:00:00 2001 From: NipunaMadhushan Date: Fri, 22 Nov 2024 10:31:41 +0530 Subject: [PATCH 4/9] Update minor version --- ballerina/Ballerina.toml | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index aaa7f02..99291a5 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,11 +1,11 @@ [package] org = "ballerinai" name = "observe" -version = "1.3.0" +version = "1.4.0" distribution = "2201.11.0" [platform.java21] graalvmCompatible = true [[platform.java21.dependency]] -path = "../native/build/libs/observe-internal-native-1.3.0.jar" +path = "../native/build/libs/observe-internal-native-1.4.0-SNAPSHOT.jar" diff --git a/gradle.properties b/gradle.properties index ef57f66..a3de505 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ org.gradle.caching=true group=io.ballerina -version=1.3.1-SNAPSHOT +version=1.4.0-SNAPSHOT ballerinaLangVersion=2201.11.0-20241121-075100-c4c87cbc githubSpotbugsVersion=6.0.18 From e2e900702ee406da3da90895ddcd412867465a5e Mon Sep 17 00:00:00 2001 From: NipunaMadhushan Date: Fri, 22 Nov 2024 18:46:36 +0530 Subject: [PATCH 5/9] Update gradle wrapper version --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index a3de505..071b8b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,7 +28,7 @@ openTelemetryVersion=1.7.0 nettyCodecVersion=4.1.100.Final gsonVersion=2.10.1 -observeVersion=1.4.0-20241122-101200-19a70b1 +observeVersion=1.4.0-20241122-184200-c596093 # Test Dependency Versions testngVersion=7.6.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9f4197d..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 7434b46abd24bfde6c0ea276bd1a1528bc9b40f8 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Thu, 28 Nov 2024 13:00:27 +0530 Subject: [PATCH 6/9] Fix blocking webserver thread in tests --- .../listenerendpoint/WebServer.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/testobserve/native/src/main/java/org/ballerina/testobserve/listenerendpoint/WebServer.java b/testobserve/native/src/main/java/org/ballerina/testobserve/listenerendpoint/WebServer.java index ab2e209..bb56655 100644 --- a/testobserve/native/src/main/java/org/ballerina/testobserve/listenerendpoint/WebServer.java +++ b/testobserve/native/src/main/java/org/ballerina/testobserve/listenerendpoint/WebServer.java @@ -245,16 +245,18 @@ protected void channelRead0(ChannelHandlerContext ctx, Object o) { properties.put(ObservabilityConstants.KEY_OBSERVER_CONTEXT, observerContext); Utils.logInfo("Dispatching resource " + resourcePath); ObjectType objectType = (ObjectType) serviceObject.getOriginalType(); - try { - boolean isConcurrentSafe = objectType.isIsolated() && objectType.isIsolated(resourceFunctionName); - StrandMetadata metadata = new StrandMetadata(isConcurrentSafe, properties); - Object result = env.getRuntime().callMethod(serviceObject, resourceFunctionName, metadata, args); - handleResult(ctx, result, resourcePath); - } catch (BError error) { - handleError(ctx, error, resourcePath); - } catch (Throwable cause) { - handleError(ctx, ErrorCreator.createError(cause), resourcePath); - } + Thread.startVirtualThread(() -> { + try { + boolean isConcurrentSafe = objectType.isIsolated() && objectType.isIsolated(resourceFunctionName); + StrandMetadata metadata = new StrandMetadata(isConcurrentSafe, properties); + Object result = env.getRuntime().callMethod(serviceObject, resourceFunctionName, metadata, args); + handleResult(ctx, result, resourcePath); + } catch (BError error) { + handleError(ctx, error, resourcePath); + } catch (Throwable cause) { + handleError(ctx, ErrorCreator.createError(cause), resourcePath); + } + }); } @Override From 03a865c956b26fd825a8dce2d8385f48fbe34095 Mon Sep 17 00:00:00 2001 From: ballerina-bot Date: Wed, 4 Dec 2024 17:32:34 +0530 Subject: [PATCH 7/9] [Automated] Update dependencies --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 071b8b9..abefc4a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.caching=true group=io.ballerina version=1.4.0-SNAPSHOT -ballerinaLangVersion=2201.11.0-20241121-075100-c4c87cbc +ballerinaLangVersion=2201.11.0-20241204-163800-0d1e4836 githubSpotbugsVersion=6.0.18 githubJohnrengelmanShadowVersion=8.1.1 underCouchDownloadVersion=5.4.0 @@ -28,7 +28,7 @@ openTelemetryVersion=1.7.0 nettyCodecVersion=4.1.100.Final gsonVersion=2.10.1 -observeVersion=1.4.0-20241122-184200-c596093 +observeVersion=1.4.0-20241204-172800-8641d51 # Test Dependency Versions testngVersion=7.6.1 From 3092ed2709035f1ef4537208c0a9dc2d0cf154c4 Mon Sep 17 00:00:00 2001 From: ballerina-bot Date: Mon, 9 Dec 2024 17:18:53 +0530 Subject: [PATCH 8/9] [Automated] Update dependencies --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index abefc4a..25eef8a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.caching=true group=io.ballerina version=1.4.0-SNAPSHOT -ballerinaLangVersion=2201.11.0-20241204-163800-0d1e4836 +ballerinaLangVersion=2201.11.0-20241209-162400-0c015833 githubSpotbugsVersion=6.0.18 githubJohnrengelmanShadowVersion=8.1.1 underCouchDownloadVersion=5.4.0 @@ -28,7 +28,7 @@ openTelemetryVersion=1.7.0 nettyCodecVersion=4.1.100.Final gsonVersion=2.10.1 -observeVersion=1.4.0-20241204-172800-8641d51 +observeVersion=1.4.0-20241209-171500-9472db2 # Test Dependency Versions testngVersion=7.6.1 From d2d6c850b9a0bfc087ca426dd1d5eabfc387af27 Mon Sep 17 00:00:00 2001 From: ballerina-bot Date: Wed, 18 Dec 2024 11:21:38 +0530 Subject: [PATCH 9/9] [Automated] Update dependencies --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 25eef8a..bf31616 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.caching=true group=io.ballerina version=1.4.0-SNAPSHOT -ballerinaLangVersion=2201.11.0-20241209-162400-0c015833 +ballerinaLangVersion=2201.11.0-20241218-101200-109f6cc7 githubSpotbugsVersion=6.0.18 githubJohnrengelmanShadowVersion=8.1.1 underCouchDownloadVersion=5.4.0 @@ -28,7 +28,7 @@ openTelemetryVersion=1.7.0 nettyCodecVersion=4.1.100.Final gsonVersion=2.10.1 -observeVersion=1.4.0-20241209-171500-9472db2 +observeVersion=1.4.0-20241218-111700-4d29d40 # Test Dependency Versions testngVersion=7.6.1