Update observability configurations

NipunaMadhushan · NipunaMadhushan · commit 2ef6aa4b4e38 · 2023-12-13T14:02:11.000+05:30
diff --git a/adservice/docker/Config.toml b/adservice/docker/Config.toml
@@ -3,9 +3,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/adservice/k8s/Config.toml b/adservice/k8s/Config.toml
@@ -3,9 +3,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/cartservice/docker/Config.toml b/cartservice/docker/Config.toml
@@ -2,10 +2,6 @@
 tracingEnabled=true
 tracingProvider="jaeger"
 
-[ballerinax.jaeger] 
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+[ballerinax.jaeger]
+agentHostname="localhost"
+agentPort=4317
diff --git a/cartservice/k8s/Config.toml b/cartservice/k8s/Config.toml
@@ -3,9 +3,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/checkoutservice/docker/Config.toml b/checkoutservice/docker/Config.toml
@@ -10,9 +10,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/checkoutservice/k8s/Config.toml b/checkoutservice/k8s/Config.toml
@@ -16,9 +16,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/client_stubs/docker/Config.toml b/client_stubs/docker/Config.toml
@@ -0,0 +1,14 @@
+catalogHost="catalog"
+cartHost="cart"
+currencyHost="currency"
+shippingHost="shipping"
+paymentHost="payment"
+emailHost="email"
+
+[ballerina.observe]
+tracingEnabled=true
+tracingProvider="jaeger"
+
+[ballerinax.jaeger]
+agentHostname="localhost"
+agentPort=4317
diff --git a/client_stubs/k8s/Config.toml b/client_stubs/k8s/Config.toml
@@ -0,0 +1,20 @@
+catalogHost="catalog-service" 
+cartHost="cart-service" 
+currencyHost="currency-service" 
+shippingHost="shipping-service" 
+paymentHost="payment-service" 
+emailHost="email-service"
+cartTimeout=3.0
+catalogTimeout=3.0
+currencyTimeout=3.0
+shippingTimeout=3.0
+paymentTimeout=3.0
+emailTimeout=3.0
+
+[ballerina.observe]
+tracingEnabled=true
+tracingProvider="jaeger"
+
+[ballerinax.jaeger]
+agentHostname="localhost"
+agentPort=4317
diff --git a/currencyservice/docker/Config.toml b/currencyservice/docker/Config.toml
@@ -3,9 +3,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/currencyservice/k8s/Config.toml b/currencyservice/k8s/Config.toml
@@ -3,9 +3,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/emailservice/ObserveConfig.toml b/emailservice/ObserveConfig.toml
@@ -3,9 +3,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/emailservice/docker/Config.toml b/emailservice/docker/Config.toml
@@ -0,0 +1,14 @@
+catalogHost="catalog"
+cartHost="cart"
+currencyHost="currency"
+shippingHost="shipping"
+paymentHost="payment"
+emailHost="email"
+
+[ballerina.observe]
+tracingEnabled=true
+tracingProvider="jaeger"
+
+[ballerinax.jaeger]
+agentHostname="localhost"
+agentPort=4317
diff --git a/emailservice/k8s/Config.toml b/emailservice/k8s/Config.toml
@@ -3,9 +3,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/frontend/docker/Config.toml b/frontend/docker/Config.toml
@@ -11,9 +11,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/frontend/k8s/Config.toml b/frontend/k8s/Config.toml
@@ -18,9 +18,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/frontend/service.bal b/frontend/service.bal
@@ -64,14 +64,13 @@ service class AuthInterceptor {
     cors: {
         allowOrigins: ["http://localhost:3000"],
         allowCredentials: true
-    },
-    interceptors: [new AuthInterceptor()]
+    }
 }
 @display {
     label: "Frontend",
     id: "frontend"
 }
-service / on new http:Listener(9098) {
+service http:InterceptableService / on new http:Listener(9098) {
 
     function init() {
         log:printInfo("Frontend server started.");
@@ -370,4 +369,8 @@ service / on new http:Listener(9098) {
         return from stubs:CartItem {product_id} in cart.items
             select product_id;
     }
+
+    public function createInterceptors() returns AuthInterceptor {
+        return new AuthInterceptor();
+    }
 }
diff --git a/paymentservice/docker/Config.toml b/paymentservice/docker/Config.toml
@@ -3,9 +3,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/paymentservice/k8s/Config.toml b/paymentservice/k8s/Config.toml
@@ -3,9 +3,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/productcatalogservice/docker/Config.toml b/productcatalogservice/docker/Config.toml
@@ -3,9 +3,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/productcatalogservice/k8s/Config.toml b/productcatalogservice/k8s/Config.toml
@@ -3,9 +3,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/recommendationservice/docker/Config.toml b/recommendationservice/docker/Config.toml
@@ -5,9 +5,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/recommendationservice/k8s/Config.toml b/recommendationservice/k8s/Config.toml
@@ -6,9 +6,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/shippingservice/docker/Config.toml b/shippingservice/docker/Config.toml
@@ -3,9 +3,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317
diff --git a/shippingservice/k8s/Config.toml b/shippingservice/k8s/Config.toml
@@ -3,9 +3,5 @@ tracingEnabled=true
 tracingProvider="jaeger"
 
 [ballerinax.jaeger]
-agentHostname="jaeger"
-agentPort=55680
-samplerType="const"
-samplerParam=1.0
-reporterFlushInterval=2000
-reporterBufferSize=1000
+agentHostname="localhost"
+agentPort=4317

Original file line number	Diff line number	Diff line change
`@@ -64,14 +64,13 @@ service class AuthInterceptor {`
`64`	`64`	`cors: {`
`65`	`65`	`allowOrigins: ["http://localhost:3000"],`
`66`	`66`	`allowCredentials: true`
`67`		`- },`
`68`		`- interceptors: [new AuthInterceptor()]`
	`67`	`+ }`
`69`	`68`	`}`
`70`	`69`	`@display {`
`71`	`70`	`label: "Frontend",`
`72`	`71`	`id: "frontend"`
`73`	`72`	`}`
`74`		`-service / on new http:Listener(9098) {`
	`73`	`+service http:InterceptableService / on new http:Listener(9098) {`
`75`	`74`
`76`	`75`	`function init() {`
`77`	`76`	`log:printInfo("Frontend server started.");`
`@@ -370,4 +369,8 @@ service / on new http:Listener(9098) {`
`370`	`369`	`return from stubs:CartItem {product_id} in cart.items`
`371`	`370`	`select product_id;`
`372`	`371`	`}`
	`372`	`+`
	`373`	`+ public function createInterceptors() returns AuthInterceptor {`
	`374`	`+ return new AuthInterceptor();`
	`375`	`+ }`
`373`	`376`	`}`