Merge pull request #10 from cloudhubs/fix-booking-test

Fix booking test

docker-compose.override.telemetry.yml

@@ -8,7 +8,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsnewgateway
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=GATEWAY_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${GATEWAY_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-order-service:
  build:
  target: telemetry
@@ -18,7 +18,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsorderservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_ORDER_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_ORDER_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-food-service:
  build:
  target: telemetry
@@ -28,7 +28,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsfoodservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_FOOD_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_FOOD_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-cancel-service:
  build:
  target: telemetry
@@ -38,7 +38,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tscancelservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_CANCEL_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_CANCEL_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-admin-service:
  build:
  target: telemetry
@@ -48,7 +48,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsadminservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_ADMIN_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_ADMIN_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-assurance-service:
  build:
  target: telemetry
@@ -58,7 +58,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsassuranceservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_ASSURANCE_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_ASSURANCE_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-auth-service:
  build:
  target: telemetry
@@ -68,7 +68,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsauthservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_AUTH_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_AUTH_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-config-service:
  build:
  target: telemetry
@@ -78,7 +78,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsconfigservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_CONFIG_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_CONFIG_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-consign-service:
  build:
  target: telemetry
@@ -88,7 +88,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsconsignservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_CONSIGN_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_CONSIGN_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-contacts-service:
  build:
  target: telemetry
@@ -98,7 +98,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tscontactsservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_CONTACTS_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_CONTACTS_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-delivery-service:
  build:
  target: telemetry
@@ -108,7 +108,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsdeliveryservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_DELIVERY_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_DELIVERY_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-notification-service:
  build:
  target: telemetry
@@ -118,7 +118,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsnotificationservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_NOTIFICATION_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_NOTIFICATION_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-order-related-service:
  build:
  target: telemetry
@@ -128,7 +128,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsorderrelatedservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_ORDER_RELATED_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_ORDER_RELATED_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-preserve-service:
  build:
  target: telemetry
@@ -138,7 +138,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tspreserveservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_PRESERVE_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_PRESERVE_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-price-service:
  build:
  target: telemetry
@@ -148,7 +148,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tspriceservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_PRICE_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_PRICE_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-rebook-service:
  build:
  target: telemetry
@@ -158,7 +158,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsrebookservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_REBOOK_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_REBOOK_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-route-service:
  build:
  target: telemetry
@@ -168,7 +168,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsrouteservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_ROUTE_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_ROUTE_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-security-service:
  build:
  target: telemetry
@@ -178,7 +178,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tssecurityservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_SECURITY_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_SECURITY_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-station-service:
  build:
  target: telemetry
@@ -188,7 +188,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsstationservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_STATION_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_STATION_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-travel-service:
  build:
  target: telemetry
@@ -198,7 +198,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tstravelservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_TRAVEL_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_TRAVEL_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  ts-user-service:
  build:
  target: telemetry
@@ -208,7 +208,7 @@ services:
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_LOGS_EXPORTER=otlp
  - OTEL_SERVICE_NAME=tsuserservice
- - OTEL_INSTRUMENTATION_METHODS_INCLUDE=TS_USER_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE
+ - OTEL_INSTRUMENTATION_METHODS_INCLUDE=${TS_USER_SERVICE_OTEL_INSTRUMENTATION_METHODS_INCLUDE}
  # ********************
  # Telemetry Components
  # ********************

ts-admin-service/src/main/java/com/cloudhubs/trainticket/adminservice/service/impl/ServiceResolverImpl.java

@@ -28,17 +28,17 @@ public String getServiceUrl(String serviceName) {
  serviceMap.put("ts-order-other-service", "ts-preserve-service");
  serviceMap.put("ts-basic-service", "ts-notification-service");
  serviceMap.put("ts-admin-travel-service", "ts-rebook-service");
- serviceMap.put("ts-food-service", "ts-contacts-service");
+ serviceMap.put("ts-food-service", "ts-food-service");
  serviceMap.put("ts-train-food-service", "ts-delivery-service");
  serviceMap.put("ts-user-service", "ts-user-service");
  serviceMap.put("ts-admin-route-service", "ts-route-service");
  serviceMap.put("ts-preserve-other-service", "ts-order-service");
  serviceMap.put("ts-route-service", "ts-route-service");
  serviceMap.put("ts-wait-order-service", "ts-rebook-service");
  serviceMap.put("ts-travel-plan-service", "ts-order-service");
- serviceMap.put("ts-seat-service", "ts-order-service");
+ serviceMap.put("ts-seat-service", "ts-travel-service");
  serviceMap.put("ts-config-service", "ts-security-service");
- serviceMap.put("ts-security-service", "ts-config-service");
+ serviceMap.put("ts-security-service", "ts-security-service");
  serviceMap.put("ts-verification-code-service", "ts-config-service");
  serviceMap.put("ts-admin-user-service", "ts-delivery-service");
  serviceMap.put("ts-contacts-service", "ts-contacts-service");
@@ -56,8 +56,8 @@ public String getServiceUrl(String serviceName) {
  serviceMap.put("ts-price-service", "ts-price-service");
  serviceMap.put("ts-admin-basic-info-service", "ts-admin-service");
  serviceMap.put("ts-inside-payment-service", "ts-delivery-service");
- serviceMap.put("ts-station-food-service", "ts-delivery-service");
- serviceMap.put("ts-consign-service", "ts-config-service");
+ serviceMap.put("ts-station-food-service", "ts-food-service");
+ serviceMap.put("ts-consign-service", "ts-consign-service");
  serviceMap.put("ts-payment-service", "ts-config-service");
 
  return "http://ts-new-gateway:8888/"+ serviceMap.get(serviceName) /*+ environment.getProperty("local.server.port")*/;