diff --git a/deployment/kubernetes-manifests/quickstart-k8s/charts/mysql/values.yaml b/deployment/kubernetes-manifests/quickstart-k8s/charts/mysql/values.yaml index 070beaa35a..7a211bad5a 100644 --- a/deployment/kubernetes-manifests/quickstart-k8s/charts/mysql/values.yaml +++ b/deployment/kubernetes-manifests/quickstart-k8s/charts/mysql/values.yaml @@ -40,9 +40,12 @@ mysql: ## connect to a MySQL 8 instance. args: [] + ## bind address should be set to 0.0.0.0 + ## see https://github.com/FudanSELab/train-ticket/issues/252#issuecomment-2188390298 configFiles: node.cnf: | [mysqld] + bind-address = 0.0.0.0 default_storage_engine=InnoDB max_connections=65535 diff --git a/hack/deploy/gen-mysql-secret.sh b/hack/deploy/gen-mysql-secret.sh index 03136d7ba3..e795df44b9 100755 --- a/hack/deploy/gen-mysql-secret.sh +++ b/hack/deploy/gen-mysql-secret.sh @@ -68,7 +68,7 @@ function update_tt_dp_cm { cp $dp_sample_yaml $dp_yaml - if [ "$(uname)"="Darwin" ]; then + if [ "$(uname)" = "Darwin" ]; then sed -i "" "s/nacos/${nacosCM}/g" $dp_yaml sed -i "" "s/rabbitmq/${rabbitmqCM}/g" $dp_yaml else diff --git a/otel_java_agent_download.sh b/otel_java_agent_download.sh new file mode 100644 index 0000000000..f22b5ebdc0 --- /dev/null +++ b/otel_java_agent_download.sh @@ -0,0 +1,5 @@ +wget https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar +wget https://github.com/alibabacloud-observability/opentelemetry-best-practice/raw/refs/heads/main/opentelemetry-javaagent-extension/ot-java-agent-extension-1.28.0.jar + +mv opentelemetry-javaagent.jar ./ts-gateway-service/ +mv ot-java-agent-extension-1.28.0.jar ./ts-gateway-service/ diff --git a/ts-gateway-service/Dockerfile b/ts-gateway-service/Dockerfile index 3468588f25..b227739da2 100644 --- a/ts-gateway-service/Dockerfile +++ b/ts-gateway-service/Dockerfile @@ -2,7 +2,11 @@ FROM java:8-jre RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone -ADD ./target/ts-gateway-service-1.0.jar /app/ -CMD ["java", "-Xmx1024m", "-jar", "/app/ts-gateway-service-1.0.jar"] +ADD ./target/ts-gateway-service-1.0.jar \ + ./opentelemetry-javaagent.jar \ + ./ot-java-agent-extension-1.28.0.jar \ + /app/ -EXPOSE 18888 +CMD ["java", "-Xmx1024m", "-javaagent:/app/opentelemetry-javaagent.jar", "-Dotel.javaagent.extensions=/app/ot-java-agent-extension-1.28.0.jar", "-jar", "/app/ts-gateway-service-1.0.jar"] + +EXPOSE 18888 diff --git a/ts-gateway-service/pom.xml b/ts-gateway-service/pom.xml index 5593608a7f..e06ef83ac8 100644 --- a/ts-gateway-service/pom.xml +++ b/ts-gateway-service/pom.xml @@ -41,6 +41,20 @@ com.alibaba.csp sentinel-spring-cloud-gateway-adapter + + + io.opentelemetry.javaagent + opentelemetry-javaagent + 1.28.0 + compile + + + + io.opentelemetry + opentelemetry-sdk + 1.45.0 + + diff --git a/ts-gateway-service/src/main/java/gateway/TestController.java b/ts-gateway-service/src/main/java/gateway/TestController.java new file mode 100644 index 0000000000..9ca23e0dc5 --- /dev/null +++ b/ts-gateway-service/src/main/java/gateway/TestController.java @@ -0,0 +1,14 @@ +package gateway; + +import javax.servlet.http.HttpServletResponse; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class TestController { + + @GetMapping("/api/v1/gateway/test") + public String testEndpoint() { + return "OK"; + } +} \ No newline at end of file