sentinel HTTP_METHOD_SPECIFY

spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml

@@ -43,10 +43,10 @@
         <!--<groupId>com.alibaba.csp</groupId>-->
         <!--<artifactId>sentinel-datasource-apollo</artifactId>-->
         <!--</dependency>-->
-        <dependency>
+        <!--<dependency>-->
-        <groupId>com.alibaba.csp</groupId>
+        <!--<groupId>com.alibaba.csp</groupId>-->
-        <artifactId>sentinel-datasource-redis</artifactId>
+        <!--<artifactId>sentinel-datasource-redis</artifactId>-->
-        </dependency>
+        <!--</dependency>-->
         <!-- define in spring-boot-autoconfigure module -->
         <!--<dependency>-->
         <!--<groupId>com.fasterxml.jackson.dataformat</groupId>-->

spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/resources/application.properties

@@ -3,6 +3,7 @@ server.port=18083
 management.endpoints.web.exposure.include=*
 spring.cloud.sentinel.transport.dashboard=localhost:8080
 spring.cloud.sentinel.eager=true
+#spring.cloud.sentinel.http-method-specify=false
 
 spring.cloud.sentinel.datasource.ds1.file.file=classpath: flowrule.json
 spring.cloud.sentinel.datasource.ds1.file.data-type=json

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java

@@ -16,6 +16,7 @@
 
 package com.alibaba.cloud.sentinel.datasource.converter;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -27,17 +28,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.StringUtils;
 
-import com.alibaba.cloud.sentinel.datasource.RuleType;
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
 import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
-import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
 import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
-import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleUtil;
 import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
 import com.alibaba.csp.sentinel.slots.system.SystemRule;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -88,56 +85,33 @@ public abstract class SentinelConverter<T extends Object>
 			List sourceArray = objectMapper.readValue(source,
 					new TypeReference<List<HashMap>>() {
 					});
-			sourceArray.stream().forEach(obj -> {
+			for (Object obj : sourceArray) {
-
 				String item = null;
 				try {
 					item = objectMapper.writeValueAsString(obj);
-				}
-				catch (JsonProcessingException e) {
-					// won't be happen
-				}
-
 					Optional.ofNullable(convertRule(item))
 							.ifPresent(convertRule -> ruleCollection.add(convertRule));
-			});
+				}
-
+				catch (IOException e) {
-			if (ruleCollection.size() != sourceArray.size()) {
+					log.error("sentinel rule convert error: " + e.getMessage(), e);
-				throw new IllegalArgumentException("convert " + ruleCollection.size()
+					throw new IllegalArgumentException(
-						+ " rules but there are " + sourceArray.size()
+							"sentinel rule convert error: " + e.getMessage(), e);
-						+ " rules from datasource. RuleClass: "
+				}
-						+ ruleClass.getSimpleName());
 			}
 		}
 		catch (Exception e) {
+			if (e instanceof RuntimeException) {
+				throw (RuntimeException) e;
+			}
+			else {
 				throw new RuntimeException("convert error: " + e.getMessage(), e);
 			}
+		}
 		return ruleCollection;
 	}
 
-	private Object convertRule(String ruleStr) {
+	private Object convertRule(String ruleStr) throws IOException {
-		try {
+		return objectMapper.readValue(ruleStr, ruleClass);
-			final Object rule = objectMapper.readValue(ruleStr, ruleClass);
-			RuleType ruleType = RuleType.getByClass(ruleClass).get();
-			switch (ruleType) {
-			case FLOW:
-				if (!FlowRuleUtil.isValidRule((FlowRule) rule)) {
-					return null;
-				}
-				break;
-			case DEGRADE:
-				if (!DegradeRuleManager.isValidRule((DegradeRule) rule)) {
-					return null;
-				}
-			default:
-				break;
-			}
-			return rule;
-		}
-		catch (Exception e) {
-			// ignore
-		}
-		return null;
 	}
 
 }

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelProperties.java

@@ -89,6 +89,11 @@ public class SentinelProperties {
 	 */
 	private Log log = new Log();
 
+	/**
+	 * Add HTTP method prefix for Sentinel Resource.
+	 */
+	private Boolean httpMethodSpecify = false;
+
 	public boolean isEager() {
 		return eager;
 	}
@@ -161,6 +166,14 @@ public class SentinelProperties {
 		this.log = log;
 	}
 
+	public Boolean getHttpMethodSpecify() {
+		return httpMethodSpecify;
+	}
+
+	public void setHttpMethodSpecify(Boolean httpMethodSpecify) {
+		this.httpMethodSpecify = httpMethodSpecify;
+	}
+
 	public static class Flow {
 
 		/**

spring-cloud-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/SentinelWebAutoConfiguration.java

@@ -91,6 +91,8 @@ public class SentinelWebAutoConfiguration {
 		Filter filter = new CommonFilter();
 		registration.setFilter(filter);
 		registration.setOrder(filterConfig.getOrder());
+		registration.addInitParameter("HTTP_METHOD_SPECIFY",
+				String.valueOf(properties.getHttpMethodSpecify()));
 		log.info(
 				"[Sentinel Starter] register Sentinel CommonFilter with urlPatterns: {}.",
 				filterConfig.getUrlPatterns());