feat:add swagger report switch.

Tencent · Sep 26, 2023 · a3ac535 · a3ac535
1 parent e79aa90
commit a3ac535
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,3 +7,4 @@
 - [refactor:optimize the order and condition matching of service registration automatic configuration.](https://github.com/Tencent/spring-cloud-tencent/pull/1131)
 - [feat:support service contract reporting.](https://github.com/Tencent/spring-cloud-tencent/pull/1141)
 - [feat: support log path configuration parameters,](https://github.com/Tencent/spring-cloud-tencent/pull/1142)
+- [feat:add swagger report switch.](https://github.com/Tencent/spring-cloud-tencent/pull/1150)
diff --git a/...is-contract/src/main/java/com/tencent/cloud/polaris/contract/PolarisContractReporter.java b/...is-contract/src/main/java/com/tencent/cloud/polaris/contract/PolarisContractReporter.java
@@ -24,6 +24,7 @@
 
 import com.tencent.cloud.common.util.JacksonUtils;
 import com.tencent.cloud.polaris.PolarisDiscoveryProperties;
+import com.tencent.cloud.polaris.contract.config.PolarisContractProperties;
 import com.tencent.polaris.api.core.ProviderAPI;
 import com.tencent.polaris.api.plugin.server.InterfaceDescriptor;
 import com.tencent.polaris.api.plugin.server.ReportServiceContractRequest;
@@ -55,62 +56,64 @@ public class PolarisContractReporter implements ApplicationListener<ApplicationR
 
 	private final org.springdoc.webmvc.api.MultipleOpenApiResource multipleOpenApiWebMvcResource;
 	private final org.springdoc.webflux.api.MultipleOpenApiResource multipleOpenApiWebFluxResource;
-	private final String groupName;
+	private final PolarisContractProperties polarisContractProperties;
 
 	private final ProviderAPI providerAPI;
 
 	private final PolarisDiscoveryProperties polarisDiscoveryProperties;
 
 	public PolarisContractReporter(org.springdoc.webmvc.api.MultipleOpenApiResource multipleOpenApiWebMvcResource,
 			org.springdoc.webflux.api.MultipleOpenApiResource multipleOpenApiWebFluxResource,
-			String groupName, ProviderAPI providerAPI,
+			PolarisContractProperties polarisContractProperties, ProviderAPI providerAPI,
 			PolarisDiscoveryProperties polarisDiscoveryProperties) {
 		this.multipleOpenApiWebMvcResource = multipleOpenApiWebMvcResource;
 		this.multipleOpenApiWebFluxResource = multipleOpenApiWebFluxResource;
-		this.groupName = groupName;
+		this.polarisContractProperties = polarisContractProperties;
 		this.providerAPI = providerAPI;
 		this.polarisDiscoveryProperties = polarisDiscoveryProperties;
 	}
 
 	@Override
 	public void onApplicationEvent(@NonNull ApplicationReadyEvent applicationReadyEvent) {
-		try {
-			AbstractOpenApiResource openApiResource = null;
-			if (multipleOpenApiWebMvcResource != null) {
-				openApiResource = OpenApiWebMvcUtil.getOpenApiResourceOrThrow(multipleOpenApiWebMvcResource, groupName);
-			}
-			else if (multipleOpenApiWebFluxResource != null) {
-				openApiResource = OpenApiWebFluxUtil.getOpenApiResourceOrThrow(multipleOpenApiWebFluxResource, groupName);
-			}
-			OpenAPI openAPI = null;
-			if (openApiResource != null) {
-				openAPI = AbstractOpenApiResourceUtil.getOpenApi(openApiResource);
-			}
-			if (openAPI != null) {
-				ReportServiceContractRequest request = new ReportServiceContractRequest();
-				request.setName(polarisDiscoveryProperties.getService());
-				request.setNamespace(polarisDiscoveryProperties.getNamespace());
-				request.setService(polarisDiscoveryProperties.getService());
-				request.setProtocol("http");
-				request.setVersion(polarisDiscoveryProperties.getVersion());
-				List<InterfaceDescriptor> interfaceDescriptorList = getInterfaceDescriptorFromSwagger(openAPI);
-				request.setInterfaceDescriptors(interfaceDescriptorList);
-				ReportServiceContractResponse response = providerAPI.reportServiceContract(request);
-				LOG.info("Service contract [Namespace: {}. Name: {}. Service: {}. Protocol:{}. Version: {}. API counter: {}] is reported.",
-						request.getNamespace(), request.getName(), request.getService(), request.getProtocol(),
-						request.getVersion(), request.getInterfaceDescriptors().size());
-				if (LOG.isDebugEnabled()) {
-					String jsonValue = JacksonUtils.serialize2Json(openAPI);
-					LOG.debug("OpenApi json data: {}", jsonValue);
+		if (polarisContractProperties.isReportEnabled()) {
+			try {
+				AbstractOpenApiResource openApiResource = null;
+				if (multipleOpenApiWebMvcResource != null) {
+					openApiResource = OpenApiWebMvcUtil.getOpenApiResourceOrThrow(multipleOpenApiWebMvcResource, polarisContractProperties.getGroup());
+				}
+				else if (multipleOpenApiWebFluxResource != null) {
+					openApiResource = OpenApiWebFluxUtil.getOpenApiResourceOrThrow(multipleOpenApiWebFluxResource, polarisContractProperties.getGroup());
+				}
+				OpenAPI openAPI = null;
+				if (openApiResource != null) {
+					openAPI = AbstractOpenApiResourceUtil.getOpenApi(openApiResource);
+				}
+				if (openAPI != null) {
+					ReportServiceContractRequest request = new ReportServiceContractRequest();
+					request.setName(polarisDiscoveryProperties.getService());
+					request.setNamespace(polarisDiscoveryProperties.getNamespace());
+					request.setService(polarisDiscoveryProperties.getService());
+					request.setProtocol("http");
+					request.setVersion(polarisDiscoveryProperties.getVersion());
+					List<InterfaceDescriptor> interfaceDescriptorList = getInterfaceDescriptorFromSwagger(openAPI);
+					request.setInterfaceDescriptors(interfaceDescriptorList);
+					ReportServiceContractResponse response = providerAPI.reportServiceContract(request);
+					LOG.info("Service contract [Namespace: {}. Name: {}. Service: {}. Protocol:{}. Version: {}. API counter: {}] is reported.",
+							request.getNamespace(), request.getName(), request.getService(), request.getProtocol(),
+							request.getVersion(), request.getInterfaceDescriptors().size());
+					if (LOG.isDebugEnabled()) {
+						String jsonValue = JacksonUtils.serialize2Json(openAPI);
+						LOG.debug("OpenApi json data: {}", jsonValue);
+					}
+				}
+				else {
+					LOG.warn("OpenAPI or json is null, group:{}", polarisContractProperties.getGroup());
 				}
 			}
-			else {
-				LOG.warn("OpenAPI or json is null, group:{}", groupName);
+			catch (Throwable t) {
+				LOG.error("Report contract failed.", t);
 			}
 		}
-		catch (Throwable t) {
-			LOG.error("Report contract failed.", t);
-		}
 	}
 
 	private List<InterfaceDescriptor> getInterfaceDescriptorFromSwagger(OpenAPI openAPI) {

diff --git a/...-contract/src/main/java/com/tencent/cloud/polaris/contract/config/ContractProperties.java b/...-contract/src/main/java/com/tencent/cloud/polaris/contract/config/ContractProperties.java
@@ -47,4 +47,8 @@ public interface ContractProperties {
 	boolean isExposure();
 
 	void setExposure(boolean exposure);
+
+	boolean isReportEnabled();
+
+	void setReportEnabled(boolean reportEnabled);
 }
diff --git a/...ct/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java b/...ct/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java
@@ -21,6 +21,7 @@
 
 import javax.annotation.Nullable;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -53,6 +54,9 @@ public class PolarisContractProperties implements ContractProperties {
 
 	private boolean exposure = true;
 
+	@Value("${spring.cloud.polaris.contract.report.enabled:true}")
+	private boolean reportEnabled = true;
+
 	public PolarisContractProperties(@Nullable ExtendedContractProperties extendContractProperties) {
 		this.extendContractProperties = extendContractProperties;
 	}
@@ -134,4 +138,14 @@ public boolean isExposure() {
 	public void setExposure(boolean exposure) {
 		this.exposure = exposure;
 	}
+
+	@Override
+	public boolean isReportEnabled() {
+		return reportEnabled;
+	}
+
+	@Override
+	public void setReportEnabled(boolean reportEnabled) {
+		this.reportEnabled = reportEnabled;
+	}
 }
diff --git a/.../main/java/com/tencent/cloud/polaris/contract/config/PolarisSwaggerAutoConfiguration.java b/.../main/java/com/tencent/cloud/polaris/contract/config/PolarisSwaggerAutoConfiguration.java
@@ -100,7 +100,7 @@ public PolarisContractReporter polarisContractReporter(
 			PolarisContractProperties polarisContractProperties, PolarisSDKContextManager polarisSDKContextManager,
 			PolarisDiscoveryProperties polarisDiscoveryProperties) {
 		return new PolarisContractReporter(multipleOpenApiWebMvcResource, multipleOpenApiWebFluxResource,
-				polarisContractProperties.getGroup(), polarisSDKContextManager.getProviderAPI(), polarisDiscoveryProperties);
+				polarisContractProperties, polarisSDKContextManager.getProviderAPI(), polarisDiscoveryProperties);
 	}
 
 	@Bean

diff --git a/...olaris-contract/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...olaris-contract/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -35,6 +35,12 @@
       "type": "java.lang.Boolean",
       "defaultValue": "true",
       "description": "Enable polaris contract exposure or not."
+    },
+    {
+      "name": "spring.cloud.polaris.contract.report.enabled",
+      "type": "java.lang.Boolean",
+      "defaultValue": "true",
+      "description": "Enable polaris contract report or not."
     }
   ]
 }
diff --git a/...mples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml b/...mples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml
@@ -24,6 +24,8 @@ spring:
         health-check-url: /discovery/service/caller/healthCheck
       contract:
         exposure: true
+        report:
+          enabled: true
       stat:
         enabled: true
         port: 28081