Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hoxton 2.0.0.0 #1458

Merged
merged 20 commits into from
Nov 19, 2024
Merged

Conversation

shedfreewu
Copy link
Collaborator

PR Type

Describe what this PR does for and how you did.

hoxton 2.0.0.0

Adding the issue link (#xxx) if possible.

Note

Checklist

  • Add information of this PR to CHANGELOG.md in root of project.
  • Add documentation in javadoc or comment below the PR if necessary.

Checklist (Optional)

  • Will pull request to branch of 2023.
  • Will pull request to branch of 2022.
  • Will pull request to branch of 2021.
  • Will pull request to branch of 2020.
  • Will pull request to branch of hoxton.

herodotus-ecosystem and others added 16 commits February 21, 2024 10:58
…eaker (Tencent#1361)

* fix: memory not released while using wildcard api call with circuitbreaker enabled

* fix: change version 1.13.3-Hoxton.SR12-SNAPSHOT

* fix: update polaris verion to 1.15.9 release

* Update CHANGELOG.md
* fix: memory not released while using wildcard api call with circuitbreaker enabled

* fix: change version 1.13.3-Hoxton.SR12-SNAPSHOT

* fix: update polaris verion to 1.15.9 release

* Update CHANGELOG.md

* release: 1.13.3-Hoxton.SR12
* fix: fix PolarisCircuitBreakerConfiguration not clear when gateway invoked by wildcard apis

* Update CHANGELOG.md

* fix: restore PolarisCircuitBreakerUtils and use ThreadPoolUtils.waitAndStopThreadPools instead

* fix: 修复命名不一致问题

* fix: CHANGE VERSION TO 1.13.4-Hoxton.SR12-SNAPSHOT
…1435)

feat:add admin http handler. (Tencent#1448)
feat:support concurrency rate limit. (Tencent#1454)
…0.0.0

# Conflicts:
#	CHANGELOG.md
#	pom.xml
#	spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/config/MetadataTransferAutoConfiguration.java
#	spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataReactiveFilter.java
#	spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilter.java
#	spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignEnhancedPlugin.java
#	spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataRestTemplateEnhancedPlugin.java
#	spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataScgEnhancedPlugin.java
#	spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataWebClientEnhancedPlugin.java
#	spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMetadataZuulEnhancedPlugin.java
#	spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/provider/ReactiveMetadataProvider.java
#	spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/provider/ServletMetadataProvider.java
#	spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMetadataZuulFilterTest.java
#	spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/provider/MetadataProviderTest.java
#	spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignCircuitBreakerInvocationHandler.java
#	spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisCircuitBreakerFeignIntegrationTest.java
#	spring-cloud-starter-tencent-polaris-router/pom.xml
#	spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/RouterConfigModifier.java
#	spring-cloud-starter-tencent-polaris-router/src/main/resources/META-INF/spring.factories
#	spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/config/properties/PolarisNearByRouterPropertiesTest.java
#	spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/constant/OrderConstant.java
#	spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContext.java
#	spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContextHolder.java
#	spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/ExpressionLabelUtils.java
#	spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/expresstion/SpringWebExpressionLabelUtils.java
#	spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/MetadataContextHolderTest.java
#	spring-cloud-tencent-coverage/pom.xml
#	spring-cloud-tencent-dependencies/pom.xml
#	spring-cloud-tencent-examples/lossless-example/lossless-callee-service/pom.xml
#	spring-cloud-tencent-examples/lossless-example/lossless-callee-service/src/main/resources/bootstrap.yml
#	spring-cloud-tencent-examples/lossless-example/lossless-nacos-callee-service/pom.xml
#	spring-cloud-tencent-examples/lossless-example/lossless-nacos-callee-service/src/main/resources/bootstrap.yml
#	spring-cloud-tencent-examples/lossless-example/pom.xml
#	spring-cloud-tencent-examples/pom.xml
#	spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/java/com/tencent/cloud/quickstart/callee/QuickstartCalleeController.java
#	spring-cloud-tencent-plugin-starters/pom.xml
#	spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/config/NacosDiscoveryAdapterAutoConfiguration.java
#	spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/src/main/java/com/tencent/cloud/plugin/discovery/adapter/transformer/NacosRegistrationTransformer.java
#	spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-threadlocal-plugin/src/test/java/com/tencent/cloud/plugin/threadlocal/TaskExecutorWrapperTest.java
#	spring-cloud-tencent-plugin-starters/spring-cloud-tencent-lossless-plugin/pom.xml
#	spring-cloud-tencent-plugin-starters/spring-cloud-tencent-lossless-plugin/src/main/java/com/tencent/cloud/plugin/lossless/LosslessRegistryAspect.java
#	spring-cloud-tencent-plugin-starters/spring-cloud-tencent-lossless-plugin/src/main/java/com/tencent/cloud/plugin/lossless/config/LosslessConfigModifier.java
#	spring-cloud-tencent-plugin-starters/spring-cloud-tencent-lossless-plugin/src/main/java/com/tencent/cloud/plugin/lossless/config/LosslessProperties.java
#	spring-cloud-tencent-plugin-starters/spring-cloud-tencent-lossless-plugin/src/main/java/com/tencent/cloud/plugin/lossless/config/LosslessPropertiesAutoConfiguration.java
#	spring-cloud-tencent-plugin-starters/spring-cloud-tencent-lossless-plugin/src/main/resources/META-INF/additional-spring-configuration-metadata.json
#	spring-cloud-tencent-polaris-context/pom.xml
#	spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PolarisSDKContextManager.java
#	spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancer.java
#	spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/plugin/PluginOrderConstant.java
#	spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/transformer/PolarisInstanceTransformer.java
Copy link

codecov bot commented Nov 7, 2024

Codecov Report

Attention: Patch coverage is 40.06410% with 935 lines in your changes missing coverage. Please review.

Project coverage is 65.65%. Comparing base (a0400ff) to head (0b375cb).
Report is 3 commits behind head on hoxton.

Files with missing lines Patch % Lines
...laris/extend/consul/ConsulDiscoveryProperties.java 25.00% 164 Missing and 1 partial ⚠️
...ncent/cloud/common/util/inet/PolarisInetUtils.java 48.66% 61 Missing and 16 partials ⚠️
...ud/polaris/contract/tsf/TsfApiMetadataGrapher.java 0.00% 52 Missing ⚠️
...loud/polaris/contract/PolarisContractReporter.java 0.00% 46 Missing ⚠️
...oud/polaris/extend/consul/ConsulDiscoveryUtil.java 23.72% 40 Missing and 5 partials ⚠️
...fig/watch/TsfConsulConfigRefreshEventListener.java 0.00% 44 Missing ⚠️
...d/polaris/config/tsf/encrypt/EncryptAlgorithm.java 0.00% 42 Missing ⚠️
.../java/org/springframework/tsf/core/entity/Tag.java 0.00% 31 Missing ⚠️
...n/java/com/tencent/cloud/common/util/GzipUtil.java 0.00% 26 Missing ⚠️
...g/springframework/tsf/core/context/TsfContext.java 0.00% 25 Missing ⚠️
... and 64 more
Additional details and impacted files
@@             Coverage Diff              @@
##             hoxton    #1458      +/-   ##
============================================
- Coverage     72.61%   65.65%   -6.96%     
- Complexity        0        2       +2     
============================================
  Files           292      340      +48     
  Lines          6639     7877    +1238     
  Branches        806      928     +122     
============================================
+ Hits           4821     5172     +351     
- Misses         1414     2256     +842     
- Partials        404      449      +45     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.


🚨 Try these New Features:

Copy link
Collaborator

@SkyeBeFreeman SkyeBeFreeman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

是否有代码需要合入主分支(2022)?

pom.xml Outdated Show resolved Hide resolved
@SkyeBeFreeman SkyeBeFreeman merged commit 84a98de into Tencent:hoxton Nov 19, 2024
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants