Merge 2.4.0 to master #12385

KomachiSion · 2024-07-19T06:04:41Z

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

XXXXX

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

* For #10374, Support listener to get changed instances * Update AbstractNamingChangeListener,NamingChaneEventTest * Update InstancesDiffTest * Rename NamingChangeEventTest

* For #10374, Define selectors and related components * Add unit test * Update NamingSelectorWrapperTest * Update selectors and related components * Update NamingSelectorWrapper

* Select clusters using the selector * Add Event Cache * Update NacosNamingService,InstancesChangeNotifier

* Add default selectors * add tests * Update SubscribeSelector_ITCase * add unsubscribe test * Removes some methods for NamingSelectorFactor * Update SelectorManager

* 修复openApi publishConfigCas失效 * 修复openApi publishConfigCas失效 * fix unit test * add publish cas

- CVE-2024-22257 Upgrade Spring Security to 5.7.12. - Use spring-framework-bom as dependencyManagement. Closes #11904

* Update request reflect-config.json add deletion graalvm reflect config * Update response reflect-config.json add deletion graalvm reflect config

… not resolved correctly when deleting an empty service instance (#11955) * Fixed an issue where the maximum number of anti-fragile plug-ins implemented by default in Nacos is one more than the actual number of connections. * bug fix : 修改删除空服务实例时，服务名和分组名没有正确解析的问题

…ogger adapter. (#11964) * Add NacosLoggingAdapter * Refactor Logback Logging adapter to Nacos logging adapter. * Refactor log4j2 Logging adapter to Nacos logging adapter. * Remove useless abstract class * Add and Adapt log4j2 impl to SPI. * Remove useless method in NacosLogbackConfigurator * Fix IT ClassNotFound problem

* Update LocalSimpleCountRateCounter.java fixbug * Update LocalSimpleCountRateCounter.java bugfix * fix：默认的nacos反脆弱插件的问题 * fix：默认的nacos反脆弱插件的问题 * fix：默认的nacos反脆弱插件的问题 * fix：默认的nacos反脆弱插件的问题 * fix：默认的nacos反脆弱插件的问题,调整为tryAdd * fix：默认的nacos反脆弱插件的问题,调整为tryAdd * 调整测试方式，保障流水线成功 * 重构PageHandlerAdapterFactory,这里将handlerAdapters，handlerAdapterMap设置为unmodifiable * 重构PageHandlerAdapterFactory,这里将handlerAdapters，handlerAdapterMap设置为unmodifiable * fix: 10639, 调整encrypted_data_key 为varchar(1024)

…() in ConfigChangeRequest (#11971) * Fixed an issue where the maximum number of anti-fragile plug-ins implemented by default in Nacos is one more than the actual number of connections. * bug fix : 修改删除空服务实例时，服务名和分组名没有正确解析的问题 * Update ConfigChangeAspect.java 修改configChangeRequest.setArg()的key为serviceType * Update ConfigChangeAspect.java * Update ConfigChangeRequest.java

…tanceIdGenerator初始化流程 (#11995) * [ISSUE #11994] fix: Initialize EnvUtil's variable environment in HttpRequestInstanceBuilderTest * refactor: Optimize the initialization process of SnowFlakeInstanceIdGenerator * refactor: optimize the initialization process of SnowFlakeInstanceIdGenerator.

…11996) * Move some basic logging classes into common module. * Move logback 12 version adapter to single module. * For checkstyle. * Enhance logger adapter pom. * Refactor the adapter initialization logic to avoid spi loader error. * Move log4j2 logger adapter to single module. * Fix the ut cover and create useless dir.

* Remove log4j dependencies from nacos-client. * Fix logback listener don't add to context. * Fix can't adapter low version logback below 1.1.10. * For checkstyle.

* add junit5 in compatible mode * add junit5 jupiter and mockito jupiter

* Remove default password * admin role check fix * remove tmp admin

…NACOS_MEMORY (#12014) * use DISABLE_NACOS_DEFAULT_MEMORY_SETTING * use CUSTOM_NACOS_MEMORY * Code optimization * remove unuse * startup.cmd support CUSTOM_NACOS_MEMORY environment variable --------- Co-authored-by: caoyanan <caoyanan@growingio.com>

* #12046 console-ui should not offer encryptedDataKey field to API * #12046 when containing encryptedDataKey,it should not execute encryption in v2 API (same as the v1 API)

…ntLimit is less than 0. (#12073) * Fixed an issue where the maximum number of anti-fragile plug-ins implemented by default in Nacos is one more than the actual number of connections. * bug fix : 修改删除空服务实例时，服务名和分组名没有正确解析的问题 * Update ConfigChangeAspect.java 修改configChangeRequest.setArg()的key为serviceType * Update ConfigChangeAspect.java * Update ConfigChangeRequest.java * Update NacosConnectionControlManager.java Add logic to not impose any limit when totalCountLimit equals -1. * Update NacosConnectionControlManager.java * Update NacosConnectionControlManagerTest.java Add unit test cases when LimitCount is less than 0 * Update NacosConnectionControlManager.java Modify comment

….（mysql-schema.sql） (#12206)

…2253)

* upgrade module naocs-test from junit4 to junit5 * fix test/core-test * fix some test * fix ci

…ler of the naming module. (#12236)

* Fix exception code error.(#10925) * [Unit test]Add RpcServerSslContextRefresherHolder unit tests. * [Unit test]Fix bug.

* clean junit4 * clean junit4 * clean some test dep; fix scope * fix test compile

* fix disk failover datasource not keep status * fix style * fix DiskFailoverDataSource

* prometheus http sd: fix invalid label names * Update PrometheusUtils.java

…12220) * [ISSUE #12219] 修复nacos-client中config的ServerListManager解析endpoint失败问题 * [ISSUE #12219] 修复nacos-client中config的ServerListManager解析endpoint失败问题

…se, the time-related field values need to be set using the time obtained from the database's built-in time function. (#12244)

* Add RequestContext and RequestContextHolder. * build RequestContext when request start. * Refactor ClientAttributesFilter with RequestContext. * InstanceController get client ip from request context. * SubscribeServiceRequestHandler get app from requestcontext. * config http api support use request context get user, app and source ip. * Rename nacos request context filter. * Unified naming request get source ip by request context. * For checkstyle.

… core module to comply with checkstyle. (#12335) * Fix exception code error.(#10925) * [IT]Adjust integration tests for ability, base, and client modules in the core module to comply with checkstyle. * [IT]Optimize the class naming.

…ough the IP dimension in the ListeningQuery (#12315)

…irements. (#12368)

…uration instead of logback-nacos.xml's packagingData configuration (#12360)

…re module to comply with checkstyle. (#12350)

…ply with checkstyle. (#12349) * Fix exception code error.(#10925) * [IT]Adjust integration tests for ability, base, and client modules in the core module to comply with checkstyle. * [IT]Optimize the class naming. * [IT]Adjust integration tests for common modules in the core module to comply with checkstyle.

… openAPI namespaceId. (#12336) fix(#12333): fixed auth Plugin resource parser can't parser v2 config openAPI namespaceId.

* Upgrade grpc to 1.64.1 * add grpc-util compile scope. * add grpc-testing

* Close derby ops api default. * Fix unit test.

* add new property to support agent situation. * for checkstyle. * Upgrade cheery pick ut to junit5. * add ignored lefthook.yml. * add ignored lefthook.yml.

ldyedu and others added 30 commits August 7, 2023 09:29

[ISSUE #10374] Support listener to get changed instances (#10905)

c026d2f

* For #10374, Support listener to get changed instances * Update AbstractNamingChangeListener,NamingChaneEventTest * Update InstancesDiffTest * Rename NamingChangeEventTest

[ISSUE #10374] Define selectors and related components (#10954)

cc34b6c

* For #10374, Define selectors and related components * Add unit test * Update NamingSelectorWrapperTest * Update selectors and related components * Update NamingSelectorWrapper

[ISSUE #10374] Select clusters using the selector (#10995)

4ad98d8

* Select clusters using the selector * Add Event Cache * Update NacosNamingService,InstancesChangeNotifier

[ISSUE #10374] Add default selectors (#11142)

263e223

* Add default selectors * add tests * Update SubscribeSelector_ITCase * add unsubscribe test * Removes some methods for NamingSelectorFactor * Update SelectorManager

For #10374, format code using Nacos Style (#11438)

7fdbc63

[ISSUE #11847] Feature: add console-ui publish config cas (#11927)

d4126ba

* 修复openApi publishConfigCas失效 * 修复openApi publishConfigCas失效 * fix unit test * add publish cas

fix: vulnerability (#11914)

d179e47

- CVE-2024-22257 Upgrade Spring Security to 5.7.12. - Use spring-framework-bom as dependencyManagement. Closes #11904

issue:11943（保存导入用户） (#11945)

5c14159

fix Navigator clipboard api needs a secure context (https) (#11942)

fb59708

[ISSUE #11902] Fix request and response reflect-config.json (#11940)

9b2cc66

* Update request reflect-config.json add deletion graalvm reflect config * Update response reflect-config.json add deletion graalvm reflect config

fix: CVE-2024-22262 Upgrade Spring to 5.3.34 (#11980) (#12003)

17dea53

clean code remove unused dependency javatuple (#11976)

de10c07

[ISSUE#11956] Fix logging module old bugs (#12011)

da3e88b

* Remove log4j dependencies from nacos-client. * Fix logback listener don't add to context. * Fix can't adapter low version logback below 1.1.10. * For checkstyle.

fix client log config (#12040)

b016e79

[WIP] add junit jupiter (#12024)

b2e506d

* add junit5 in compatible mode * add junit5 jupiter and mockito jupiter

[ISSUE #11957] Remove default password (#11991)

70ad2eb

* Remove default password * admin role check fix * remove tmp admin

[ISSUE #11926] The abnormal exit mechanism does not take effect (#12045)

8d6f87e

Depend nacos logback adapter directly. (#12059)

ed64d1f

[ISSUE #12046] fix console-ui bug when using encryption-plugin (#12061)

7c461fd

* #12046 console-ui should not offer encryptedDataKey field to API * #12046 when containing encryptedDataKey,it should not execute encryption in v2 API (same as the v1 API)

[issue 12062]bugfix (#12086)

b047a90

fix #11984 (#12091)

47dd078

module address upgrade junit4 to junit5 (#12084)

4e2bcb9

HMYDK and others added 29 commits June 17, 2024 14:26

Add total record count display in pagination (TotalRender). (#12203)

e192e25

Add an id primary key column to both the roles and permissions tables…

5d87196

….（mysql-schema.sql） (#12206)

add endpoint cluster name for config & naming server list manager (#1…

63dc87a

…2253)

[ISSUE #12227] upgrade module test from junit4 to junit5 (#12251)

3b2f787

* upgrade module naocs-test from junit4 to junit5 * fix test/core-test * fix some test * fix ci

[#12235]Fix the incorrect logging format in the ResponseExceptionHand…

27da090

…ler of the naming module. (#12236)

[ISSUE #12246] 配置列表和服务列表的总数显示国际化 (#12276)

29c28bd

fix nacos client dependencies tree without grpc package (#12266)

8575e84

Add RpcServerSslContextRefresherHolder unit tests. (#12281)

108f510

* Fix exception code error.(#10925) * [Unit test]Add RpcServerSslContextRefresherHolder unit tests. * [Unit test]Fix bug.

[ISSUE #12016] upgrade to junit5 and remove junit4 (#12280)

8034da8

* clean junit4 * clean junit4 * clean some test dep; fix scope * fix test compile

[ISSUE #12207] fix disk failover datasource not keep status (#12188)

b8d13e0

* fix disk failover datasource not keep status * fix style * fix DiskFailoverDataSource

[ISSUE #12196] FIX prometheus http sd invalid label names (#12239)

92a3d17

* prometheus http sd: fix invalid label names * Update PrometheusUtils.java

[ISSUE #12219] 修复nacos-client中config的ServerListManager解析endpoint失败问题 (#…

9716243

…12220) * [ISSUE #12219] 修复nacos-client中config的ServerListManager解析endpoint失败问题 * [ISSUE #12219] 修复nacos-client中config的ServerListManager解析endpoint失败问题

add some UT for default auth plugin (#12318)

e8e8cd2

fix(#12231): When inserting and updating configurations in the databa…

8aba80d

…se, the time-related field values need to be set using the time obtained from the database's built-in time function. (#12244)

fix unexpect exception from NetworkInterface.ifUp (#12325)

2aa9fc5

[ISSUE #12282]Fix the issue where monitoring data cannot be found thr…

6c05ad5

…ough the IP dimension in the ListeningQuery (#12315)

[IT]Adjust core module auth integration tests to meet checkstyle requ…

9d0a48d

…irements. (#12368)

feat(#12355): Record the cost of ConfigDump in Prometheus. (#12356)

47d913d

Remove the accessToken from the URL. (#12353)

a6047fa

fix [ISSUE #12323] , using the project's logback packagingData config…

8664a1a

…uration instead of logback-nacos.xml's packagingData configuration (#12360)

[IT]Adjust integration tests for cluster,code,smoke modules in the co…

c717538

…re module to comply with checkstyle. (#12350)

fix(#12333): fixed auth Plugin resource parser can't parser v2 config…

1879c81

… openAPI namespaceId. (#12336) fix(#12333): fixed auth Plugin resource parser can't parser v2 config openAPI namespaceId.

Upgrade grpc to 1.64.2 (#12369)

fc5e502

* Upgrade grpc to 1.64.1 * add grpc-util compile scope. * add grpc-testing

Close derby ops api default. (#12372)

ed7bd03

* Close derby ops api default. * Fix unit test.

Develop support ram info switch (#12382)

ad83ff0

* add new property to support agent situation. * for checkstyle. * Upgrade cheery pick ut to junit5. * add ignored lefthook.yml. * add ignored lefthook.yml.

Upgrade to 2.4.0 (#12384)

4e77625

KomachiSion merged commit 974edfe into master Jul 19, 2024
14 of 15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 2.4.0 to master #12385

Merge 2.4.0 to master #12385

KomachiSion commented Jul 19, 2024

Merge 2.4.0 to master #12385

Merge 2.4.0 to master #12385

Conversation

KomachiSion commented Jul 19, 2024

What is the purpose of the change

Brief changelog

Verifying this change