diff --git a/polaris-agent-build/bin/build_example_docker.sh b/polaris-agent-build/bin/build_example_docker.sh index f70c6c29..3b92619a 100644 --- a/polaris-agent-build/bin/build_example_docker.sh +++ b/polaris-agent-build/bin/build_example_docker.sh @@ -46,38 +46,45 @@ for docker_file in ${docker_files}; do dir_name=${folder_name##*/} - cp Dockerfile Dockerfile-${dir_name} - docker_tag="${version}-java8" - - filename=$(find ./target -maxdepth 1 -name "*.jar" | grep -v "javadoc" | grep -v "sources" | head -n 1) - if [ -z "${filename}" ]; then - echo "jar file not found" - exit 1 - fi - echo "jar file path is ${filename}" - - filename=${filename##*/} - echo "jar sub file path is ${filename}" - if [ `grep -c "java_version" Dockerfile` -gt 0 ] - then - echo "docker repository java8: ${docker_repository}/${repo_name}, tag : ${docker_tag}" - docker buildx build -f Dockerfile-${dir_name} --no-cache -t ${docker_repository}/${repo_name}:${docker_tag} --build-arg file_name=${filename} --build-arg java_version=8 --platform ${platforms} --push ./ - - docker_tag="${version}-java11" - echo "docker repository java11: ${docker_repository}/${repo_name}, tag : ${docker_tag}" - docker buildx build -f Dockerfile-${dir_name} --no-cache -t ${docker_repository}/${repo_name}:${docker_tag} --build-arg file_name=${filename} --build-arg java_version=11 --platform ${platforms} --push ./ - - docker_tag="${version}-java17" - echo "docker repository java17: ${docker_repository}/${repo_name}, tag : ${docker_tag}" - docker buildx build -f Dockerfile-${dir_name} --no-cache -t ${docker_repository}/${repo_name}:${docker_tag} --build-arg file_name=${filename} --build-arg java_version=17 --platform ${platforms} --push ./ - else - docker_tag="${version}-java17" - echo "docker repository java17: ${docker_repository}/${repo_name}, tag : ${docker_tag}" - docker buildx build -f Dockerfile-${dir_name} --no-cache -t ${docker_repository}/${repo_name}:${docker_tag} --build-arg file_name=${filename} --platform ${platforms} --push ./ - fi - - rm -f Dockerfile-${dir_name} - popd + cp Dockerfile Dockerfile-${dir_name} + + filename=$(find ./target -maxdepth 1 -name "*.jar" | grep -v "javadoc" | grep -v "sources" | head -n 1) + if [ -z "${filename}" ]; then + echo "jar file not found" + exit 1 + fi + echo "jar file path is ${filename}" + + version=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" pom.xml) + if [ -z "${version}" ]; then + echo "version not defined, skip" + continue + fi + + filename=${filename##*/} + echo "jar sub file path is ${filename}, version is ${version}" + + if [ `grep -c "java_version" Dockerfile` -gt 0 ] + then + docker_tag="${version}-java8" + echo "docker repository java8: ${docker_repository}/${repo_name}, tag : ${docker_tag}" + docker buildx build -f Dockerfile-${dir_name} --no-cache -t ${docker_repository}/${repo_name}:${docker_tag} --build-arg file_name=${filename} --build-arg java_version=8 --platform ${platforms} --push ./ + + docker_tag="${version}-java11" + echo "docker repository java11: ${docker_repository}/${repo_name}, tag : ${docker_tag}" + docker buildx build -f Dockerfile-${dir_name} --no-cache -t ${docker_repository}/${repo_name}:${docker_tag} --build-arg file_name=${filename} --build-arg java_version=11 --platform ${platforms} --push ./ + + docker_tag="${version}-java17" + echo "docker repository java17: ${docker_repository}/${repo_name}, tag : ${docker_tag}" + docker buildx build -f Dockerfile-${dir_name} --no-cache -t ${docker_repository}/${repo_name}:${docker_tag} --build-arg file_name=${filename} --build-arg java_version=17 --platform ${platforms} --push ./ + else + docker_tag="${version}-java17" + echo "docker repository java17: ${docker_repository}/${repo_name}, tag : ${docker_tag}" + docker buildx build -f Dockerfile-${dir_name} --no-cache -t ${docker_repository}/${repo_name}:${docker_tag} --build-arg file_name=${filename} --platform ${platforms} --push ./ + fi + + rm -f Dockerfile-${dir_name} + popd fi done popd \ No newline at end of file diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/pom.xml b/polaris-agent-examples/spring-cloud-plugins-examples/pom.xml index cb43473e..a58d7295 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/pom.xml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/pom.xml @@ -17,7 +17,7 @@ spring-cloud-2021-examples spring-cloud-2020-examples spring-cloud-hoxton-examples - spring-cloud-2023-examples - + spring-cloud-2023-examples + \ No newline at end of file diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-a/Dockerfile b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-a/Dockerfile index f8284a09..e4da5f69 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-a/Dockerfile +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-a/Dockerfile @@ -1,6 +1,7 @@ FROM alpine:3.19.1 ARG file_name +ARG java_version COPY ./target/${file_name} /app/main.jar @@ -9,7 +10,7 @@ WORKDIR /app RUN sed -i 's!http://dl-cdn.alpinelinux.org/!https://mirrors.tencent.com/!g' /etc/apk/repositories RUN set -eux && \ - apk add openjdk17 && \ + apk add openjdk${java_version} && \ apk add bind-tools && \ apk add busybox-extras && \ apk add findutils && \ diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-a/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-a/deployment.yaml index a8b7a25d..8face3ad 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-a/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-a/deployment.yaml @@ -3,27 +3,26 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app: service-a-2023 - name: service-a-2023 + app: service-a-hoxton + name: service-a-hoxton namespace: default spec: replicas: 1 selector: matchLabels: - app: service-a-2023 + app: service-a-hoxton template: metadata: labels: - app: service-a-2023 + app: service-a-hoxton annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.7.0-RC.0" + polarismesh.cn/javaagentVersion: "1.7.0-RC2" polarismesh.cn/javaagentFrameworkName: "spring-cloud" - polarismesh.cn/javaagentFrameworkVersion: "2023" - polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.namespace\": \"default\", \"spring.cloud.polaris.router.nearby-router.matchLevel\": \"campus\"}" + polarismesh.cn/javaagentFrameworkVersion: "hoxton" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-gray-2023-service-a:1.7.0-RC.0-java17 + - image: polarismesh/polaris-javaagent-demo-sc-gray-hoxton-service-a:1.7.0-java8 imagePullPolicy: Always name: consumer resources: @@ -35,7 +34,7 @@ spec: command: - /bin/bash - -c - - cd /app && java -Dspring.cloud.nacos.config.server-addr=127.0.0.1:8848 -Dspring.cloud.nacos.config.password=nacos -jar main.jar + - cd /app && java -Dserver.port=65203 -jar main.jar lifecycle: preStop: exec: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-a/pom.xml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-a/pom.xml index dff8fe67..34594434 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-a/pom.xml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-a/pom.xml @@ -13,6 +13,7 @@ 2023-service-a Demo Service-A Project For Spring Cloud Alibaba polaris-javaagent-demo-sc-gray-hoxton-service-a + 1.7.0 jar diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-b/Dockerfile b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-b/Dockerfile index f8284a09..e4da5f69 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-b/Dockerfile +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-b/Dockerfile @@ -1,6 +1,7 @@ FROM alpine:3.19.1 ARG file_name +ARG java_version COPY ./target/${file_name} /app/main.jar @@ -9,7 +10,7 @@ WORKDIR /app RUN sed -i 's!http://dl-cdn.alpinelinux.org/!https://mirrors.tencent.com/!g' /etc/apk/repositories RUN set -eux && \ - apk add openjdk17 && \ + apk add openjdk${java_version} && \ apk add bind-tools && \ apk add busybox-extras && \ apk add findutils && \ diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-b/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-b/deployment.yaml index ab008070..1878fcd7 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-b/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-b/deployment.yaml @@ -3,27 +3,26 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app: service-b-2023 - name: service-b-2023 + app: service-b-hoxton + name: service-b-hoxton namespace: default spec: replicas: 1 selector: matchLabels: - app: service-b-2023 + app: service-b-hoxton template: metadata: labels: - app: service-b-2023 + app: service-b-hoxton annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.7.0-RC.0" + polarismesh.cn/javaagentVersion: "1.7.0-RC2" polarismesh.cn/javaagentFrameworkName: "spring-cloud" - polarismesh.cn/javaagentFrameworkVersion: "2023" - polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.namespace\": \"default\", \"spring.cloud.polaris.router.nearby-router.matchLevel\": \"campus\"}" + polarismesh.cn/javaagentFrameworkVersion: "hoxton" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-gray-2023-service-b:1.7.0-RC.0-java17 + - image: polarismesh/polaris-javaagent-demo-sc-gray-hoxton-service-b:1.7.0-java8 imagePullPolicy: Always name: consumer resources: @@ -35,7 +34,7 @@ spec: command: - /bin/bash - -c - - cd /app && java -Dspring.cloud.nacos.config.server-addr=127.0.0.1:8848 -Dspring.cloud.nacos.config.password=nacos -jar main.jar + - cd /app && java -Dserver.port=65202 -jar main.jar lifecycle: preStop: exec: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-b/pom.xml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-b/pom.xml index e49f5a2e..7689a8a4 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-b/pom.xml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-b/pom.xml @@ -14,6 +14,7 @@ Demo Service-B Project For Spring Cloud Alibaba polaris-javaagent-demo-sc-gray-hoxton-service-b jar + 1.7.0 diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-c/Dockerfile b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-c/Dockerfile index f8284a09..e4da5f69 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-c/Dockerfile +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-c/Dockerfile @@ -1,6 +1,7 @@ FROM alpine:3.19.1 ARG file_name +ARG java_version COPY ./target/${file_name} /app/main.jar @@ -9,7 +10,7 @@ WORKDIR /app RUN sed -i 's!http://dl-cdn.alpinelinux.org/!https://mirrors.tencent.com/!g' /etc/apk/repositories RUN set -eux && \ - apk add openjdk17 && \ + apk add openjdk${java_version} && \ apk add bind-tools && \ apk add busybox-extras && \ apk add findutils && \ diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-c/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-c/deployment.yaml index d4a3dd56..ac72f42e 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-c/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-c/deployment.yaml @@ -3,27 +3,26 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app: service-c-2023 - name: service-c-2023 + app: service-c-hoxton + name: service-c-hoxton namespace: default spec: replicas: 1 selector: matchLabels: - app: service-c-2023 + app: service-c-hoxton template: metadata: labels: - app: service-c-2023 + app: service-c-hoxton annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.7.0-RC.0" + polarismesh.cn/javaagentVersion: "1.7.0-RC2" polarismesh.cn/javaagentFrameworkName: "spring-cloud" - polarismesh.cn/javaagentFrameworkVersion: "2023" - polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.namespace\": \"default\", \"spring.cloud.polaris.router.nearby-router.matchLevel\": \"campus\"}" + polarismesh.cn/javaagentFrameworkVersion: "hoxton" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-gray-2023-service-c:1.7.0-RC.0-java17 + - image: polarismesh/polaris-javaagent-demo-sc-gray-hoxton-service-c:1.7.0-java8 imagePullPolicy: Always name: consumer resources: @@ -35,7 +34,7 @@ spec: command: - /bin/bash - -c - - cd /app && java -Dspring.cloud.nacos.config.server-addr=127.0.0.1:8848 -Dspring.cloud.nacos.config.password=nacos -jar main.jar + - cd /app && java -Dserver.port=65201 -jar main.jar lifecycle: preStop: exec: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-c/pom.xml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-c/pom.xml index 3fb15b85..d1f703eb 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-c/pom.xml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-c/pom.xml @@ -14,6 +14,7 @@ Demo Service-C Project For Spring Cloud Alibaba polaris-javaagent-demo-sc-gray-hoxton-service-c jar + 1.7.0 diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/Dockerfile b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/Dockerfile index f8284a09..e4da5f69 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/Dockerfile +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/Dockerfile @@ -1,6 +1,7 @@ FROM alpine:3.19.1 ARG file_name +ARG java_version COPY ./target/${file_name} /app/main.jar @@ -9,7 +10,7 @@ WORKDIR /app RUN sed -i 's!http://dl-cdn.alpinelinux.org/!https://mirrors.tencent.com/!g' /etc/apk/repositories RUN set -eux && \ - apk add openjdk17 && \ + apk add openjdk${java_version} && \ apk add bind-tools && \ apk add busybox-extras && \ apk add findutils && \ diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/deployment.yaml index a9062581..e5e052f2 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/deployment.yaml @@ -3,27 +3,26 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app: sc-gateway-2023 - name: sc-gateway-2023 + app: sc-gateway-hoxton + name: sc-gateway-hoxton namespace: default spec: replicas: 1 selector: matchLabels: - app: sc-gateway-2023 + app: sc-gateway-hoxton template: metadata: labels: - app: sc-gateway-2023 + app: sc-gateway-hoxton annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.7.0-RC.0" + polarismesh.cn/javaagentVersion: "1.7.0-RC2" polarismesh.cn/javaagentFrameworkName: "spring-cloud" - polarismesh.cn/javaagentFrameworkVersion: "2023" - polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.namespace\": \"default\", \"spring.cloud.polaris.router.nearby-router.matchLevel\": \"campus\"}" + polarismesh.cn/javaagentFrameworkVersion: "hoxton" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-gray-2023-service-gateway:1.7.0-RC.0-java17 + - image: polarismesh/polaris-javaagent-demo-sc-gray-hoxton-service-gateway:1.7.0-java8 imagePullPolicy: Always name: consumer resources: @@ -35,7 +34,7 @@ spec: command: - /bin/bash - -c - - cd /app && java -Dspring.cloud.nacos.config.server-addr=127.0.0.1:8848 -Dspring.cloud.nacos.config.password=nacos -jar main.jar + - cd /app && java -Dserver.port=65200 -jar main.jar lifecycle: preStop: exec: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/pom.xml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/pom.xml index 9a472603..486c7a46 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/pom.xml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/pom.xml @@ -11,6 +11,7 @@ hoxton-service-gateway Demo Service-Gateway Project For Spring Cloud Alibaba 2023 jar + 1.7.0 diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/src/main/resources/application.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/src/main/resources/application.yaml index a82e04e5..13b92656 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/src/main/resources/application.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/gray-release-examples/service-gateway/src/main/resources/application.yaml @@ -3,7 +3,7 @@ server: spring: application: - name: service-gateway-hoxton + name: sc-gateway-hoxton cloud: gateway: discovery: @@ -22,7 +22,7 @@ spring: password: 'nacos' config: import: - - nacos:sc-gateway-2023.properties?refreshEnabled=true + - nacos:sc-gateway-hoxton.properties?refreshEnabled=true management: endpoint: health: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/deployment.yaml index 2de2d925..663c632e 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/deployment.yaml @@ -17,13 +17,12 @@ spec: app: hoxton-consumer annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.6.1" + polarismesh.cn/javaagentVersion: "1.7.0-RC2" polarismesh.cn/javaagentFrameworkName: "spring-cloud" polarismesh.cn/javaagentFrameworkVersion: "hoxton" - polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.lossless.enabled\": \"true\", \"spring.cloud.polaris.namespace\": \"default\"}" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-quickstart-hoxton-consumer:1.6.1-java8 + - image: polarismesh/polaris-javaagent-demo-sc-quickstart-hoxton-consumer:1.7.0-java8 imagePullPolicy: Always name: consumer resources: @@ -35,7 +34,7 @@ spec: command: - /bin/bash - -c - - cd /app && java -Dspring.cloud.nacos.discovery.server-addr=10.0.90.37:8848 -Dspring.cloud.nacos.config.server-addr=10.0.90.37:8848 -Dserver.port=11581 -jar main.jar + - cd /app && java -Dserver.port=65002 -jar main.jar lifecycle: preStop: exec: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/pom.xml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/pom.xml index 483a7d8b..fcd53d5e 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/pom.xml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/pom.xml @@ -13,7 +13,7 @@ com.tencent.polaris polaris-javaagent-demo-sc-quickstart-hoxton-consumer jar - 1.6.0 + 1.7.0 hoxton-consumer Demo Consumer Project For Spring Cloud Alibaba diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/src/main/resources/application.properties b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/src/main/resources/application.properties index 04c51aee..12f01521 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/src/main/resources/application.properties +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/src/main/resources/application.properties @@ -1,4 +1,5 @@ server.port=65002 spring.application.name=service-consumer spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 -spring.cloud.nacos.discovery.enabled=true \ No newline at end of file +spring.cloud.nacos.discovery.enabled=false +spring.cloud.nacos.config.enabled=false \ No newline at end of file diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/deployment.yaml index 680a0cdc..c05ed845 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/deployment.yaml @@ -17,13 +17,12 @@ spec: app: hoxton-provider annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.6.1" + polarismesh.cn/javaagentVersion: "1.7.0-RC2" polarismesh.cn/javaagentFrameworkName: "spring-cloud" polarismesh.cn/javaagentFrameworkVersion: "hoxton" - polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.lossless.enabled\": \"true\", \"spring.cloud.polaris.namespace\": \"default\"}" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-quickstart-hoxton-provider:1.6.1-java8 + - image: polarismesh/polaris-javaagent-demo-sc-quickstart-hoxton-provider:1.7.0-java8 imagePullPolicy: Always name: provider resources: @@ -35,7 +34,7 @@ spec: command: - /bin/bash - -c - - cd /app && java -Dspring.cloud.nacos.discovery.server-addr=10.0.90.37:8848 -Dspring.cloud.nacos.config.server-addr=10.0.90.37:8848 -Dserver.port=11580 -jar main.jar + - cd /app && java -Dserver.port=65101 -jar main.jar lifecycle: preStop: exec: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/pom.xml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/pom.xml index 8d366203..3690d775 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/pom.xml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/pom.xml @@ -13,7 +13,7 @@ com.tencent.polaris polaris-javaagent-demo-sc-quickstart-hoxton-provider jar - 1.6.0 + 1.7.0 hoxton-provider Demo Provider Project For Spring Cloud Alibaba diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/src/main/java/cn/polarismesh/agent/examples/alibaba/cloud/cloud/ProviderApplication.java b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/src/main/java/cn/polarismesh/agent/examples/alibaba/cloud/cloud/ProviderApplication.java index dedac899..a765fc6f 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/src/main/java/cn/polarismesh/agent/examples/alibaba/cloud/cloud/ProviderApplication.java +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/src/main/java/cn/polarismesh/agent/examples/alibaba/cloud/cloud/ProviderApplication.java @@ -31,41 +31,6 @@ /** * @author liaochuntao */ -//@SpringBootApplication -//public class ProviderApplication { -// -// public static void main(String[] args) { -// SpringApplication.run(ProviderApplication.class, args); -// } -// -// @RefreshScope -// @RestController -// public static class EchoController { -// -// @Value("${name:}") -// private String name; -// -// private Registration registration; -// -// public EchoController(Registration registration) { -// this.registration = registration; -// } -// -// @GetMapping("/echo/{string}") -// public String echo(@PathVariable String string) { -// String sb = "Hello, I'm provider, receive msg : " -// + string -// + "my metadata : " -// + registration.getMetadata() -// + " name config : " -// + name; -// return sb; -// } -// -// } -// -//} - @EnableDiscoveryClient @SpringBootApplication public class ProviderApplication { @@ -81,21 +46,13 @@ public static class EchoController { @Value("${name:}") private String name; - // private Registration registration; - - // public EchoController(Registration registration) { - // this.registration = registration; - // } - @GetMapping("/echo/{string}") public String echo(@PathVariable String string) { - String sb = "Hello, I'm provider, receive msg : " + return "Hello, I'm provider, receive msg : " + string - + "my metadata : " - // + registration.getMetadata() + + ", my metadata : " + " name config : " + name; - return sb; } } diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/src/main/resources/application.properties b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/src/main/resources/application.properties index d97c89f0..891a42d7 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/src/main/resources/application.properties +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/src/main/resources/application.properties @@ -1,5 +1,5 @@ server.port=65101 -spring.application.name=service-provider-H +spring.application.name=service-provider-quickstart-hotxon spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 spring.cloud.nacos.discovery.enabled=false spring.cloud.nacos.config.enabled=false diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/deployment.yaml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/deployment.yaml index 9badebe5..96a21783 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/deployment.yaml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/deployment.yaml @@ -17,13 +17,12 @@ spec: app: hoxton-scg annotations: polarismesh.cn/javaagent: "true" - polarismesh.cn/javaagentVersion: "1.6.1" + polarismesh.cn/javaagentVersion: "1.7.0-RC2" polarismesh.cn/javaagentFrameworkName: "spring-cloud" polarismesh.cn/javaagentFrameworkVersion: "hoxton" - polarismesh.cn/javaagentConfig: "{\"spring.cloud.polaris.lossless.enabled\": \"true\", \"spring.cloud.polaris.namespace\": \"default\"}" spec: containers: - - image: polarismesh/polaris-javaagent-demo-sc-quickstart-hoxton-scg:1.6.1-java8 + - image: polarismesh/polaris-javaagent-demo-sc-quickstart-hoxton-scg:1.7.0-java8 imagePullPolicy: Always name: consumer resources: @@ -35,7 +34,7 @@ spec: command: - /bin/bash - -c - - cd /app && java -Dspring.cloud.nacos.discovery.server-addr=10.0.90.37:8848 -Dspring.cloud.nacos.config.server-addr=10.0.90.37:8848 -Dserver.port=11582 -jar main.jar + - cd /app && java -Dserver.port=65000 -jar main.jar lifecycle: preStop: exec: diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/pom.xml b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/pom.xml index b1c47175..af5bc113 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/pom.xml +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/pom.xml @@ -13,7 +13,7 @@ com.tencent.polaris polaris-javaagent-demo-sc-quickstart-hoxton-scg jar - 1.6.0 + 1.7.0 hoxton-scg Demo Consumer Project For Spring Cloud Alibaba diff --git a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/src/main/resources/application.properties b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/src/main/resources/application.properties index 7c6f5fe3..d9587e4f 100644 --- a/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/src/main/resources/application.properties +++ b/polaris-agent-examples/spring-cloud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/src/main/resources/application.properties @@ -1,5 +1,6 @@ server.port=65000 -spring.application.name=service-gateway +spring.application.name=service-gateway-quickstart-hoxton spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 -spring.cloud.nacos.discovery.enabled=true +spring.cloud.nacos.discovery.enabled=false spring.cloud.gateway.discovery.locator.enabled=true +spring.cloud.nacos.config.enabled=false \ No newline at end of file diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/RouterBeanInjector.java b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/RouterBeanInjector.java index 057d7d20..4d6e8c53 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/RouterBeanInjector.java +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/inject/RouterBeanInjector.java @@ -19,6 +19,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; +import java.util.Map; import cn.polarismesh.agent.core.common.utils.ClassUtils; import cn.polarismesh.agent.core.common.utils.ReflectionUtils; @@ -31,6 +32,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.core.env.Environment; +import org.springframework.core.io.ClassPathResource; public class RouterBeanInjector implements BeanInjector { @Override @@ -39,6 +41,7 @@ public void onBootstrapStartup(Object configurationParser, Constructor config } @Override + @SuppressWarnings("unchecked") public void onApplicationStartup(Object configurationParser, Constructor configClassCreator, Method processConfigurationClass, BeanDefinitionRegistry registry, Environment environment) { Object routerAutoConfiguration = ReflectionUtils.invokeConstructor(configClassCreator, RouterAutoConfiguration.class, "routerAutoConfiguration"); ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, routerAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); @@ -55,5 +58,22 @@ public void onApplicationStartup(Object configurationParser, Constructor conf ReflectionUtils.invokeMethod(processConfigurationClass, configurationParser, polarisRouterEndpointAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); registry.registerBeanDefinition("polarisRouterEndpointAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( PolarisRouterEndpointAutoConfiguration.class).getBeanDefinition()); + + // make FeignRibbonClientAutoConfiguration later + Map configurationClasses = (Map) ReflectionUtils.getObjectByFieldName(configurationParser, "configurationClasses"); + Object targetConfigClass = null; + for (Object configClass : configurationClasses.keySet()) { + Object resource = ReflectionUtils.getObjectByFieldName(configClass, "resource"); + if (resource instanceof ClassPathResource) { + ClassPathResource classPathResource = (ClassPathResource) resource; + if ("org/springframework/cloud/openfeign/ribbon/FeignRibbonClientAutoConfiguration.class".equals(classPathResource.getPath())) { + targetConfigClass = configurationClasses.remove(configClass); + break; + } + } + } + if (null != targetConfigClass) { + configurationClasses.put(targetConfigClass, targetConfigClass); + } } } diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/ConfigurationParserInterceptor.java b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/ConfigurationParserInterceptor.java index 75ab1cb1..049bf2a5 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/ConfigurationParserInterceptor.java +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/java/cn/polarismesh/agent/plugin/spring/cloud/interceptor/ConfigurationParserInterceptor.java @@ -102,23 +102,6 @@ public void after(Object target, Object[] args, Object result, Throwable throwab beanInjector.onBootstrapStartup(target, constructor, processConfigurationClass, registry, environment); } - // rpc - - - // lossless - - // register -// Object discoveryPropertiesBootstrapAutoConfiguration = ReflectionUtils.invokeConstructor(constructor, DiscoveryPropertiesBootstrapAutoConfiguration.class, "discoveryPropertiesBootstrapAutoConfiguration"); -// ReflectionUtils.invokeMethod(processConfigurationClass, target, discoveryPropertiesBootstrapAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); -// registry.registerBeanDefinition("discoveryPropertiesBootstrapAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( -// DiscoveryPropertiesBootstrapAutoConfiguration.class).getBeanDefinition()); - - // config -// Object polarisConfigBootstrapAutoConfiguration = ReflectionUtils.invokeConstructor(constructor, PolarisConfigBootstrapAutoConfiguration.class, "polarisConfigBootstrapAutoConfiguration"); -// ReflectionUtils.invokeMethod(processConfigurationClass, target, polarisConfigBootstrapAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); -// registry.registerBeanDefinition("polarisConfigBootstrapAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( -// PolarisConfigBootstrapAutoConfiguration.class).getBeanDefinition()); - } else if (isMainBeanDefinition(beanDefinitionHolder)) { Class clazz = ClassUtils.getClazz("org.springframework.context.annotation.ConfigurationClass", null); Constructor constructor = ReflectionUtils.accessibleConstructor(clazz, Class.class, String.class); @@ -131,50 +114,6 @@ public void after(Object target, Object[] args, Object result, Throwable throwab beanInjector.onApplicationStartup(target, constructor, processConfigurationClass, registry, environment); } - - // rpc - - - // lossless - - // loadbalancer - - // router -// Object routerAutoConfiguration = ReflectionUtils.invokeConstructor(constructor, RouterAutoConfiguration.class, "routerAutoConfiguration"); -// ReflectionUtils.invokeMethod(processConfigurationClass, target, routerAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); -// registry.registerBeanDefinition("routerAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( -// RouterAutoConfiguration.class).getBeanDefinition()); -// if (null != ClassUtils.getClazz("feign.RequestInterceptor", -// Thread.currentThread().getContextClassLoader())) { -// Object feignAutoConfiguration = ReflectionUtils.invokeConstructor(constructor, FeignAutoConfiguration.class, "feignAutoConfiguration"); -// ReflectionUtils.invokeMethod(processConfigurationClass, target, feignAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); -// registry.registerBeanDefinition("feignAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( -// FeignAutoConfiguration.class).getBeanDefinition()); -// } - - // registry -// Object discoveryPropertiesAutoConfiguration = ReflectionUtils.invokeConstructor(constructor, DiscoveryPropertiesAutoConfiguration.class, "discoveryPropertiesAutoConfiguration"); -// ReflectionUtils.invokeMethod(processConfigurationClass, target, discoveryPropertiesAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); -// registry.registerBeanDefinition("discoveryPropertiesAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( -// DiscoveryPropertiesAutoConfiguration.class).getBeanDefinition()); -// Object polarisDiscoveryAutoConfiguration = ReflectionUtils.invokeConstructor(constructor, PolarisDiscoveryAutoConfiguration.class, "polarisDiscoveryAutoConfiguration"); -// ReflectionUtils.invokeMethod(processConfigurationClass, target, polarisDiscoveryAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); -// registry.registerBeanDefinition("polarisDiscoveryAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( -// PolarisDiscoveryAutoConfiguration.class).getBeanDefinition()); -// Object polarisDiscoveryRibbonAutoConfiguration = ReflectionUtils.invokeConstructor(constructor, PolarisDiscoveryRibbonAutoConfiguration.class, "polarisDiscoveryRibbonAutoConfiguration"); -// ReflectionUtils.invokeMethod(processConfigurationClass, target, polarisDiscoveryRibbonAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); -// registry.registerBeanDefinition("polarisDiscoveryRibbonAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( -// PolarisDiscoveryRibbonAutoConfiguration.class).getBeanDefinition()); -// Object polarisServiceRegistryAutoConfiguration = ReflectionUtils.invokeConstructor(constructor, PolarisServiceRegistryAutoConfiguration.class, "polarisServiceRegistryAutoConfiguration"); -// ReflectionUtils.invokeMethod(processConfigurationClass, target, polarisServiceRegistryAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); -// registry.registerBeanDefinition("polarisServiceRegistryAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( -// PolarisServiceRegistryAutoConfiguration.class).getBeanDefinition()); - - // config -// Object polarisConfigAutoConfiguration = ReflectionUtils.invokeConstructor(constructor, PolarisConfigAutoConfiguration.class, "polarisConfigAutoConfiguration"); -// ReflectionUtils.invokeMethod(processConfigurationClass, target, polarisConfigAutoConfiguration, Constant.DEFAULT_EXCLUSION_FILTER); -// registry.registerBeanDefinition("polarisConfigAutoConfiguration", BeanDefinitionBuilder.genericBeanDefinition( -// PolarisConfigAutoConfiguration.class).getBeanDefinition()); } } } diff --git a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/default-plugin.conf b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/default-plugin.conf index 8d261187..2a415ad1 100644 --- a/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/default-plugin.conf +++ b/polaris-agent-plugins/spring-cloud-plugins/spring-cloud-hoxton-plugin/src/main/resources/default-plugin.conf @@ -50,7 +50,5 @@ spring.cloud.polaris.stat.path=/metrics spring.cloud.polaris.config.enabled=false # 是否开启配置监听刷新 spring.cloud.polaris.config.auto-refresh=true -# Spring Cloud Tencent 配置刷新机制 -spring.cloud.polaris.config.refresh-type=refresh_context -logging.level.root=DEBUG \ No newline at end of file +logging.level.root=INFO \ No newline at end of file