Merge pull request #1456 from NipunaMadhushan/add-observability-tags

Add `protocol` to observability tags
ballerina-platform · Nov 6, 2024 · 15e6b26 · 15e6b26
2 parents 022b6f7 + 1086875
commit 15e6b26
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "websocket"
-version = "2.12.0"
+version = "2.12.1"
 authors = ["Ballerina"]
 keywords = ["ws", "network", "bi-directional", "streaming", "service", "client"]
 repository = "https://github.com/ballerina-platform/module-ballerina-websocket"
@@ -15,8 +15,8 @@ graalvmCompatible = true
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "websocket-native"
-version = "2.12.0"
-path = "../native/build/libs/websocket-native-2.12.0.jar"
+version = "2.12.1"
+path = "../native/build/libs/websocket-native-2.12.1-SNAPSHOT.jar"
 
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
@@ -85,5 +85,5 @@ version = "4.1.108.Final"
 path = "./lib/netty-handler-proxy-4.1.108.Final.jar"
 
 [[platform.java17.dependency]]
-path = "../test-utils/build/libs/websocket-test-utils-2.12.0.jar"
+path = "../test-utils/build/libs/websocket-test-utils-2.12.1-SNAPSHOT.jar"
 scope = "testOnly"
diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml
@@ -3,4 +3,4 @@ id = "websocket-compiler-plugin"
 class = "io.ballerina.stdlib.websocket.plugin.WebSocketCompilerPlugin"
 
 [[dependency]]
-path = "../compiler-plugin/build/libs/websocket-compiler-plugin-2.12.0.jar"
+path = "../compiler-plugin/build/libs/websocket-compiler-plugin-2.12.1-SNAPSHOT.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -5,7 +5,7 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.10.0"
+distribution-version = "2201.10.2"
 
 [[package]]
 org = "ballerina"
@@ -67,7 +67,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.12.0"
+version = "2.12.2"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "cache"},
@@ -246,7 +246,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "mime"
-version = "2.10.0"
+version = "2.10.1"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -332,7 +332,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "websocket"
-version = "2.12.0"
+version = "2.12.1"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "constraint"},

diff --git a/...e/src/main/java/io/ballerina/stdlib/websocket/observability/WebSocketObserverContext.java b/...e/src/main/java/io/ballerina/stdlib/websocket/observability/WebSocketObserverContext.java
@@ -30,6 +30,7 @@
 
 public class WebSocketObserverContext extends ObserverContext {
 
+    private static final String PROTOCOL = "ws";
     private String connectionId = WebSocketObservabilityConstants.UNKNOWN;
     private String servicePathOrClientUrl = WebSocketObservabilityConstants.UNKNOWN;
 
@@ -54,6 +55,7 @@ public void setTags(WebSocketConnectionInfo connectionInfo) {
         String clientOrServerContext = WebSocketObservabilityUtil.getClientOrServerContext(connectionInfo);
         addTag(WebSocketObservabilityConstants.TAG_CONTEXT, clientOrServerContext);
         addTag(WebSocketObservabilityConstants.TAG_SERVICE, servicePathOrClientUrl);
+        addTag(ObservabilityConstants.TAG_KEY_PROTOCOL, PROTOCOL);
     }
 
     String getConnectionId() {