Skip to content

Commit c259b67

Browse files
robberphexrobberphex
committed
Merge branch 'ot'
2 parents 92f18f9 + 06c592b commit c259b67

File tree

16 files changed

+94
-17
lines changed

16 files changed

+94
-17
lines changed

‎mse-simple-demo/A/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
export REGISTRY=${REGISTRY}
44

55
export appName=spring-cloud-a
6-
export VERSION="${VERSION:-3.0.4}"
6+
export VERSION="${VERSION:-3.0.5}"
77

88
set -e
99

‎mse-simple-demo/A/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>A</artifactId>
8-
<version>3.0.4</version>
8+
<version>3.0.5</version>
99
<packaging>jar</packaging>
1010

1111
<name>A</name>

‎mse-simple-demo/B/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
export REGISTRY=${REGISTRY}
44

55
export appName=spring-cloud-b
6-
export VERSION="${VERSION:-3.0.4}"
6+
export VERSION="${VERSION:-3.0.5}"
77

88
set -e
99

‎mse-simple-demo/B/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>B</artifactId>
8-
<version>3.0.4</version>
8+
<version>3.0.5</version>
99
<packaging>jar</packaging>
1010

1111
<name>B</name>

‎mse-simple-demo/C/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
export REGISTRY=${REGISTRY}
44

55
export appName=spring-cloud-c
6-
export VERSION="${VERSION:-3.0.4}"
6+
export VERSION="${VERSION:-3.0.5}"
77

88
set -e
99

‎mse-simple-demo/C/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>C</artifactId>
8-
<version>3.0.4</version>
8+
<version>3.0.5</version>
99
<packaging>jar</packaging>
1010

1111
<name>C</name>

‎mse-simple-demo/SpringCloudGateway/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
export REGISTRY=${REGISTRY}
33

44
export appName=spring-cloud-gateway
5-
export VERSION="${VERSION:-3.0.4}"
5+
export VERSION="${VERSION:-3.0.5}"
66

77
set -e
88

‎mse-simple-demo/SpringCloudGateway/pom.xml

+25-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.alibabacloud.mse.demo</groupId>
66
<artifactId>SpringCloudGateway</artifactId>
7-
<version>3.0.4</version>
7+
<version>3.0.5</version>
88
<packaging>jar</packaging>
99

1010
<parent>
@@ -22,6 +22,23 @@
2222
</properties>
2323

2424
<dependencies>
25+
<dependency>
26+
<groupId>io.opentelemetry</groupId>
27+
<artifactId>opentelemetry-api</artifactId>
28+
</dependency>
29+
<dependency>
30+
<groupId>io.opentelemetry</groupId>
31+
<artifactId>opentelemetry-sdk-trace</artifactId>
32+
</dependency>
33+
<dependency>
34+
<groupId>io.opentelemetry</groupId>
35+
<artifactId>opentelemetry-sdk</artifactId>
36+
</dependency>
37+
<dependency>
38+
<groupId>io.opentelemetry</groupId>
39+
<artifactId>opentelemetry-exporter-logging</artifactId>
40+
</dependency>
41+
2542
<dependency>
2643
<groupId>com.alibaba.cloud</groupId>
2744
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
@@ -54,6 +71,13 @@
5471

5572
<dependencyManagement>
5673
<dependencies>
74+
<dependency>
75+
<groupId>io.opentelemetry</groupId>
76+
<artifactId>opentelemetry-bom</artifactId>
77+
<version>1.23.0</version>
78+
<type>pom</type>
79+
<scope>import</scope>
80+
</dependency>
5781
<dependency>
5882
<groupId>org.springframework.cloud</groupId>
5983
<artifactId>spring-cloud-dependencies</artifactId>

‎mse-simple-demo/SpringCloudGateway/src/main/java/com/alibabcloud/mse/demo/GrayGatewayFilter.java

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package com.alibabcloud.mse.demo;
2+
3+
import io.opentelemetry.api.baggage.Baggage;
4+
import io.opentelemetry.context.Context;
5+
import io.opentelemetry.context.Scope;
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
8+
import org.springframework.cloud.gateway.filter.GatewayFilterChain;
9+
import org.springframework.cloud.gateway.filter.GlobalFilter;
10+
import org.springframework.core.Ordered;
11+
import org.springframework.stereotype.Component;
12+
import org.springframework.util.MultiValueMap;
13+
import org.springframework.web.server.ServerWebExchange;
14+
import reactor.core.publisher.Mono;
15+
16+
@Component
17+
public class GrayGatewayFilter implements GlobalFilter, Ordered {
18+
private static final Logger log = LoggerFactory.getLogger(GrayGatewayFilter.class);
19+
20+
@Override
21+
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
22+
MultiValueMap<String, String> params = exchange.getRequest().getQueryParams();
23+
Scope baggageScope = null;
24+
try {
25+
if ("12345".equals(params.getFirst("userId"))) {
26+
String tag = "gray";
27+
// 标记流量标签
28+
// key固定为__microservice_tag__
29+
// value为合法json，同时tag为流量的标签结果
30+
Baggage baggage = Baggage.builder()
31+
.put("__microservice_tag__", "[{\"name\":\"" + tag + "\"}]")
32+
.build();
33+
log.info("request with userId: {}, tagged {}", params.getFirst("userId"), tag);
34+
baggageScope = baggage.storeInContext(Context.current()).makeCurrent();
35+
}
36+
return chain.filter(exchange);
37+
} finally {
38+
if (baggageScope != null) {
39+
baggageScope.close();
40+
}
41+
}
42+
}
43+
44+
/**
45+
* 由于正常的业务请求处理也是一个Filter，所以这儿要确保顺序在业务Filter之前
46+
* @return
47+
*/
48+
@Override
49+
public int getOrder() {
50+
return -1;
51+
}
52+
}
53+

‎mse-simple-demo/ZuulGateway/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
export REGISTRY=${REGISTRY}
44

55
export appName=spring-cloud-zuul
6-
export VERSION="${VERSION:-3.0.4}"
6+
export VERSION="${VERSION:-3.0.5}"
77

88
set -e
99

‎mse-simple-demo/ZuulGateway/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>ZuulGateway</artifactId>
8-
<version>3.0.4</version>
8+
<version>3.0.5</version>
99
<packaging>jar</packaging>
1010

1111
<parent>

‎mse-simple-demo/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
# Select the correct warehouse prefix
33
export REGISTRY=${REGISTRY}
4-
export VERSION="${VERSION:-3.0.4}"
4+
export VERSION="${VERSION:-3.0.5}"
55

66
set -e
77

‎mse-simple-demo/helm/mse-simple-demo/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: mse-simple-demo
3-
version: "3.0.4"
4-
appVersion: "3.0.4"
3+
version: "3.0.5"
4+
appVersion: "3.0.5"
55
home: https://mse.console.aliyun.com/
66
keywords:
77
- mse

‎mse-simple-demo/helm/mse-simple-demo/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
registry: registry.cn-hangzhou.aliyuncs.com/mse-governance-demo/
33

44
images:
5-
version: 3.0.4
5+
version: 3.0.5
66

77
mse:
88
namespace: mse-demo

‎mse-simple-demo/mysql/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
export REGISTRY=${REGISTRY}
33

44
export appName=demo-mysql
5-
export VERSION="${VERSION:-3.0.4}"
5+
export VERSION="${VERSION:-3.0.5}"
66

77
set -e
88

‎mse-simple-demo/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<properties>
8-
<all.project.version>3.0.4</all.project.version>
8+
<all.project.version>3.0.5</all.project.version>
99
</properties>
1010

1111

1212
<groupId>com.alibabacloud.mse.demo</groupId>
1313
<artifactId>mse-simple-demo</artifactId>
14-
<version>3.0.4</version>
14+
<version>3.0.5</version>
1515
<modules>
1616
<module>A</module>
1717
<module>B</module>

0 commit comments

Comments
 (0)