Update observability configurations

.github/workflows/daily-build.yml

@@ -4,6 +4,9 @@ on:
  schedule:
  - cron: '0 */12 * * *'
 
+env:
+ BALLERINA_VERSION: 2201.8.4 # Update this with the latest Ballerina version
+
 jobs:
  build:
  if: github.repository_owner == 'ballerina-guides'
@@ -23,7 +26,7 @@ jobs:
  - uses: ballerina-platform/setup-ballerina@v1
  name: Install Ballerina
  with:
- version: 2201.2.3
+ version: ${{ env.BALLERINA_VERSION }}
  - name: Pack gRPC Stub Module
  working-directory: "client_stubs"
  run: bal pack

.github/workflows/pull-request.yml

@@ -6,6 +6,9 @@ on:
  branches-ignore:
  - master
 
+env:
+ BALLERINA_VERSION: 2201.8.4 # Update this with the latest Ballerina version
+
 jobs:
  build:
  if: github.repository_owner == 'ballerina-guides'
@@ -25,7 +28,7 @@ jobs:
  - uses: ballerina-platform/setup-ballerina@v1
  name: Install Ballerina
  with:
- version: 2201.2.3
+ version: ${{ env.BALLERINA_VERSION }}
  - name: Pack gRPC Stub Module
  working-directory: "client_stubs"
  run: bal pack

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

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

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

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

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

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

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

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

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

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

docker-compose.yml

@@ -6,7 +6,7 @@ services:
  ports:
  - 16686:16686
  - 13133:13133
- - 55680:55680
+ - 4317:4317
  ads:
  image: wso2inc/ads-service:v0.1.0
  volumes:

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

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

emailservice/email_service.bal

@@ -43,14 +43,16 @@ service "EmailService" on new grpc:Listener(9097) {
  private final gmail:Client gmailClient;
 
  function init() returns error? {
- self.gmailClient = check new ({
- auth: {
- refreshUrl: gmail:REFRESH_URL,
- refreshToken: gmailConfig.refreshToken,
- clientId: gmailConfig.clientId,
- clientSecret: gmailConfig.clientSecret
+ self.gmailClient = check new gmail:Client(
+ config = {
+ auth: {
+ refreshToken: gmailConfig.refreshToken,
+ clientId: gmailConfig.clientId,
+ clientSecret: gmailConfig.clientSecret
+ }
  }
- });
+ );
+
  log:printInfo("Email service gRPC server started.");
  }
 
@@ -62,12 +64,11 @@ service "EmailService" on new grpc:Listener(9097) {
  log:printInfo(string `Received a request to send order confirmation email to ${request.email}.`);
 
  gmail:MessageRequest messageRequest = {
- recipient: request.email,
+ to: [request.email],
  subject: "Your Confirmation Email",
- messageBody: (check getConfirmationHtml(request.'order)).toString(),
- contentType: gmail:TEXT_HTML
+ bodyInHtml: (check getConfirmationHtml(request.'order)).toString()
  };
- gmail:Message|error sendMessageResponse = self.gmailClient->sendMessage(messageRequest);
+ gmail:Message|error sendMessageResponse = check self.gmailClient->/users/[request.email]/messages/send.post(messageRequest);
  if sendMessageResponse is error {
  log:printError("An error occurred when sending the order confirmation email ", sendMessageResponse);
  return sendMessageResponse;

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

frontend/README.md

@@ -31,11 +31,13 @@ AuthInterceptor authInterceptor = new;
  cors: {
  allowOrigins: ["http://localhost:3000"],
  allowCredentials: true
- },
- interceptors: [new AuthInterceptor()]
+ }
 }
-service / on new http:Listener (9098) {
+service http:InterceptableService / on new http:Listener (9098) {
 
+ public function createInterceptors() returns AuthInterceptor {
+ return authInterceptor;
+ }
 }
 ```
 

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

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

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();
+ }
 }

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

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

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

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

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

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