Merge branch 'metrics-logs' into java21

ballerina-platform · Dec 20, 2024 · 51eae4e · 51eae4e
2 parents e7d3ad3 + be9da2c
commit 51eae4e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,11 +1,11 @@
 [package]
 org = "ballerinai"
 name = "observe"
-version = "1.3.0"
-distribution = "2201.10.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/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

diff --git 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-20241219-143200-53f6d83e
 githubSpotbugsVersion=6.0.18

diff --git 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

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
@@ -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