Merge pull request #185 from aliyun/3.0.6

robberphex · web-flow · commit 6a4efa8dd41f · 2023-12-25T00:51:46.000-06:00
3.0.6
diff --git a/mse-simple-demo/A/Dockerfile b/mse-simple-demo/A/Dockerfile
@@ -1,13 +1,10 @@
 # syntax=docker/dockerfile:1.4
 
-FROM maven:3-eclipse-temurin-8-alpine as build
+FROM maven:3-eclipse-temurin-8 as build
 
 # copy arthas
 COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
 
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-RUN apk add wget unzip tcpdump ngrep iproute2-ss bind-tools
-
 COPY <<EOF /root/.m2/settings.xml
 <?xml version=\"1.0\"?>
 <settings>
@@ -30,7 +27,7 @@ RUN --mount=type=cache,target=/root/.m2/repository/ \
   mvn clean package --batch-mode
 
 
-FROM eclipse-temurin:8-jdk-alpine
+FROM eclipse-temurin:8-jdk
 
 # copy arthas
 COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
diff --git a/mse-simple-demo/A/build.sh b/mse-simple-demo/A/build.sh
@@ -3,7 +3,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-a
-export VERSION="${VERSION:-3.0.5}"
+export VERSION="${VERSION:-3.0.6}"
 
 set -e
 
diff --git a/mse-simple-demo/A/pom.xml b/mse-simple-demo/A/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>A</artifactId>
-    <version>3.0.5</version>
+    <version>3.0.6</version>
     <packaging>jar</packaging>
 
     <name>A</name>
diff --git a/mse-simple-demo/B/Dockerfile b/mse-simple-demo/B/Dockerfile
@@ -1,9 +1,6 @@
 # syntax=docker/dockerfile:1.4
 
-FROM maven:3-eclipse-temurin-8-alpine as build
-
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-RUN apk add wget unzip tcpdump ngrep iproute2-ss bind-tools
+FROM maven:3-eclipse-temurin-8 as build
 
 COPY <<EOF /root/.m2/settings.xml
 <?xml version=\"1.0\"?>
@@ -26,7 +23,7 @@ COPY ./ ./
 RUN --mount=type=cache,target=/root/.m2/repository/ \
   mvn clean package --batch-mode
 
-FROM eclipse-temurin:8-jdk-alpine
+FROM eclipse-temurin:8-jdk
 
 # copy arthas
 COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
diff --git a/mse-simple-demo/B/build.sh b/mse-simple-demo/B/build.sh
@@ -3,7 +3,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-b
-export VERSION="${VERSION:-3.0.5}"
+export VERSION="${VERSION:-3.0.6}"
 
 set -e
 
diff --git a/mse-simple-demo/B/pom.xml b/mse-simple-demo/B/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>B</artifactId>
-    <version>3.0.5</version>
+    <version>3.0.6</version>
     <packaging>jar</packaging>
 
     <name>B</name>
diff --git a/mse-simple-demo/C/Dockerfile b/mse-simple-demo/C/Dockerfile
@@ -1,8 +1,6 @@
 # syntax=docker/dockerfile:1.4
 
-FROM maven:3-eclipse-temurin-8-alpine as build
-
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+FROM maven:3-eclipse-temurin-8 as build
 
 COPY <<EOF /root/.m2/settings.xml
 <?xml version=\"1.0\"?>
@@ -25,7 +23,7 @@ COPY ./ ./
 RUN --mount=type=cache,target=/root/.m2/repository/ \
   mvn clean package --batch-mode
 
-FROM eclipse-temurin:8-jdk-alpine
+FROM eclipse-temurin:8-jdk
 
 # copy arthas
 COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
diff --git a/mse-simple-demo/C/build.sh b/mse-simple-demo/C/build.sh
@@ -3,7 +3,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-c
-export VERSION="${VERSION:-3.0.5}"
+export VERSION="${VERSION:-3.0.6}"
 
 set -e
 
diff --git a/mse-simple-demo/C/pom.xml b/mse-simple-demo/C/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>C</artifactId>
-    <version>3.0.5</version>
+    <version>3.0.6</version>
     <packaging>jar</packaging>
 
     <name>C</name>
diff --git a/mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/c/CController.java b/mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/c/CController.java
@@ -61,7 +61,17 @@ public String c(HttpServletRequest request) {
         if (throwException) {
             throw new RuntimeException();
         }
-        return "C" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
+        try (Entry entry1 = SphU.entry("HelloWorld-c-1", EntryType.IN)) {
+            log.debug("Hello Sentinel!1");
+            try (Entry entry2 = SphU.entry("H\"elloWorld-c-2", EntryType.IN)) {
+                log.debug("Hello Sentinel!2");
+                return "C" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
+            } catch (BlockException e) {
+                throw new RuntimeException(e);
+            }
+        } catch (BlockException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @GetMapping("/c-zone")
diff --git a/mse-simple-demo/SpringCloudGateway/Dockerfile b/mse-simple-demo/SpringCloudGateway/Dockerfile
@@ -1,12 +1,9 @@
 # syntax=docker/dockerfile:1.4
-FROM maven:3-eclipse-temurin-8-alpine as build
+FROM maven:3-eclipse-temurin-8 as build
 
 # copy arthas
 COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
 
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-RUN apk add wget unzip tcpdump ngrep iproute2-ss bind-tools
-
 COPY <<EOF /root/.m2/settings.xml
 <?xml version=\"1.0\"?>
 <settings>
@@ -29,7 +26,7 @@ RUN --mount=type=cache,target=/root/.m2/repository/ \
   mvn clean package --batch-mode
 
 
-FROM eclipse-temurin:8-jdk-alpine
+FROM eclipse-temurin:8-jdk
 
 
 # copy arthas
diff --git a/mse-simple-demo/SpringCloudGateway/build.sh b/mse-simple-demo/SpringCloudGateway/build.sh
@@ -2,7 +2,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-gateway
-export VERSION="${VERSION:-3.0.5}"
+export VERSION="${VERSION:-3.0.6}"
 
 set -e
 
diff --git a/mse-simple-demo/SpringCloudGateway/pom.xml b/mse-simple-demo/SpringCloudGateway/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>SpringCloudGateway</artifactId>
-    <version>3.0.5</version>
+    <version>3.0.6</version>
     <packaging>jar</packaging>
 
     <parent>
@@ -22,23 +22,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-sdk-trace</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-sdk</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-exporter-logging</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
@@ -71,13 +54,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>io.opentelemetry</groupId>
-                <artifactId>opentelemetry-bom</artifactId>
-                <version>1.23.0</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
diff --git a/mse-simple-demo/SpringCloudGateway/src/main/java/com/alibabcloud/mse/demo/GrayGatewayFilter.java b/mse-simple-demo/SpringCloudGateway/src/main/java/com/alibabcloud/mse/demo/GrayGatewayFilter.java
diff --git a/mse-simple-demo/ZuulGateway/Dockerfile b/mse-simple-demo/ZuulGateway/Dockerfile
@@ -1,8 +1,6 @@
 # syntax=docker/dockerfile:1.4
 
-FROM maven:3-eclipse-temurin-8-alpine as build
-
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+FROM maven:3-eclipse-temurin-8 as build
 
 COPY <<EOF /root/.m2/settings.xml
 <?xml version=\"1.0\"?>
@@ -25,7 +23,7 @@ COPY ./ ./
 RUN --mount=type=cache,target=/root/.m2/repository/ \
   mvn clean package --batch-mode
 
-FROM eclipse-temurin:8-jdk-alpine
+FROM eclipse-temurin:8-jdk
 
 # copy arthas
 COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
diff --git a/mse-simple-demo/ZuulGateway/build.sh b/mse-simple-demo/ZuulGateway/build.sh
@@ -3,7 +3,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=spring-cloud-zuul
-export VERSION="${VERSION:-3.0.5}"
+export VERSION="${VERSION:-3.0.6}"
 
 set -e
 
diff --git a/mse-simple-demo/ZuulGateway/pom.xml b/mse-simple-demo/ZuulGateway/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>ZuulGateway</artifactId>
-    <version>3.0.5</version>
+    <version>3.0.6</version>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/mse-simple-demo/build.sh b/mse-simple-demo/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Select the correct warehouse prefix
 export REGISTRY=${REGISTRY}
-export VERSION="${VERSION:-3.0.5}"
+export VERSION="${VERSION:-3.0.6}"
 
 set -e
 
diff --git a/mse-simple-demo/helm/mse-simple-demo/Chart.yaml b/mse-simple-demo/helm/mse-simple-demo/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: mse-simple-demo
-version: "3.0.5"
-appVersion: "3.0.5"
+version: "3.0.6"
+appVersion: "3.0.6"
 home: https://mse.console.aliyun.com/
 keywords:
   - mse
diff --git a/mse-simple-demo/helm/mse-simple-demo/values.yaml b/mse-simple-demo/helm/mse-simple-demo/values.yaml
@@ -2,7 +2,7 @@
 registry: registry.cn-hangzhou.aliyuncs.com/mse-governance-demo/
 
 images:
-  version: 3.0.5
+  version: 3.0.6
 
 mse:
   namespace: mse-demo
diff --git a/mse-simple-demo/mysql/build.sh b/mse-simple-demo/mysql/build.sh
@@ -2,7 +2,7 @@
 export REGISTRY=${REGISTRY}
 
 export appName=demo-mysql
-export VERSION="${VERSION:-3.0.5}"
+export VERSION="${VERSION:-3.0.6}"
 
 set -e
 
diff --git a/mse-simple-demo/pom.xml b/mse-simple-demo/pom.xml
@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <all.project.version>3.0.5</all.project.version>
+        <all.project.version>3.0.6</all.project.version>
     </properties>
 
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>mse-simple-demo</artifactId>
-    <version>3.0.5</version>
+    <version>3.0.6</version>
     <modules>
         <module>A</module>
         <module>B</module>
