diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 321a7c9..afb17c7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -112,7 +112,7 @@ New files that you contribute should use the standard copyright header: // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/CONTRIBUTING.zh_CN.md b/CONTRIBUTING.zh_CN.md index e045d1d..330fb93 100644 --- a/CONTRIBUTING.zh_CN.md +++ b/CONTRIBUTING.zh_CN.md @@ -102,7 +102,7 @@ tRPC-Cpp 代码仓库中的文件不列出作者姓名,以避免混乱并避 // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/LICENSE b/LICENSE index 06d9e58..fd73835 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ -Copyright (C) 2023 THL A29 Limited, a Tencent company. All rights reserved. The below software in this distribution may have been modified by THL A29 Limited ("Tencent Modifications"). -All Tencent Modifications are Copyright (C) THL A29 Limited. +Copyright (C) 2023 Tencent. All rights reserved. The below software in this distribution may have been modified by Tencent ("Tencent Modifications"). +All Tencent Modifications are Copyright (C) Tencent. cpp-logging-cls is licensed under the Apache License Version 2.0 except for the third-party components listed below. @@ -68,7 +68,7 @@ Other dependencies and licenses: Open Source Software Licensed under the Apache License Version 2.0 and Other Licenses of the Third-Party Components therein: -------------------------------------------------------------------- 1. cls_sdk_cpp -Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved. +Copyright (C) 2015 Tencent, and Milo Yip. All rights reserved. Source code of this software can be obtained from: https://github.com/TencentCloud/tencentcloud-cls-sdk-cpp/archive/refs/tags/1.0.4.tar.gz @@ -169,7 +169,7 @@ DEALINGS IN THE SOFTWARE. Open Source Software Licensed under the Curl License: -The below software in this distribution may have been modified by THL A29 Limited ("Tencent Modifications"). All Tencent Modifications are Copyright (C) 2023 THL A29 Limited. +The below software in this distribution may have been modified by Tencent ("Tencent Modifications"). All Tencent Modifications are Copyright (C) 2023 Tencent. -------------------------------------------------------------------- 1. curl Copyright (C) 1996 - 2021, Daniel Stenberg, , and many diff --git a/README.md b/README.md index 3d08774..c6ddf65 100644 --- a/README.md +++ b/README.md @@ -170,3 +170,9 @@ For server scenarios, users need to call the TrpcApp::RegisterPlugins function i 2. Please note that sending log data to the CLS platform may incur certain costs. For specific cost standards, please refer to the billing instructions in the Tencent Cloud official document [TencentCloud](https://buy.cloud.tencent.com/pricing). 3. To avoid unnecessary costs, please make sure to turn off the CLS plugin when it is no longer needed. You can turn off the plugin by deleting the related configuration of the CLS plugin in the framework configuration file. + +# LICENSE + +[LICENSE](LICENSE) + +The copyright notice pertaining to the Tencent code in this repo was previously in the name of “THL A29 Limited.” That entity has now been de-registered. You should treat all previously distributed copies of the code as if the copyright notice was in the name of “Tencent.” diff --git a/examples/client/client.cc b/examples/client/client.cc index 7adf50e..e60e606 100644 --- a/examples/client/client.cc +++ b/examples/client/client.cc @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/examples/server/greeter_service.cc b/examples/server/greeter_service.cc index c825d4e..d07772d 100644 --- a/examples/server/greeter_service.cc +++ b/examples/server/greeter_service.cc @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/examples/server/greeter_service.h b/examples/server/greeter_service.h index 3759e8f..74f6745 100644 --- a/examples/server/greeter_service.h +++ b/examples/server/greeter_service.h @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/examples/server/helloworld_server.cc b/examples/server/helloworld_server.cc index 07d3ff8..b4bfb4f 100644 --- a/examples/server/helloworld_server.cc +++ b/examples/server/helloworld_server.cc @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/trpc/logging/cls/callback_result.h b/trpc/logging/cls/callback_result.h index 0eca007..90300c9 100644 --- a/trpc/logging/cls/callback_result.h +++ b/trpc/logging/cls/callback_result.h @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/trpc/logging/cls/cls_log.cc b/trpc/logging/cls/cls_log.cc index 3bad8ac..fb065f9 100644 --- a/trpc/logging/cls/cls_log.cc +++ b/trpc/logging/cls/cls_log.cc @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/trpc/logging/cls/cls_log.h b/trpc/logging/cls/cls_log.h index 6d14891..79a3568 100644 --- a/trpc/logging/cls/cls_log.h +++ b/trpc/logging/cls/cls_log.h @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/trpc/logging/cls/cls_log_api.cc b/trpc/logging/cls/cls_log_api.cc index 592bd1f..4edabf0 100644 --- a/trpc/logging/cls/cls_log_api.cc +++ b/trpc/logging/cls/cls_log_api.cc @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/trpc/logging/cls/cls_log_api.h b/trpc/logging/cls/cls_log_api.h index f48a835..0f28e0e 100644 --- a/trpc/logging/cls/cls_log_api.h +++ b/trpc/logging/cls/cls_log_api.h @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/trpc/logging/cls/cls_log_test.cc b/trpc/logging/cls/cls_log_test.cc index 6237d4d..f506679 100644 --- a/trpc/logging/cls/cls_log_test.cc +++ b/trpc/logging/cls/cls_log_test.cc @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/trpc/logging/cls/cls_sink.h b/trpc/logging/cls/cls_sink.h index d315f04..c172bfd 100644 --- a/trpc/logging/cls/cls_sink.h +++ b/trpc/logging/cls/cls_sink.h @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/trpc/logging/cls/cls_sink_test.cc b/trpc/logging/cls/cls_sink_test.cc index 62a05c7..1f73b7c 100644 --- a/trpc/logging/cls/cls_sink_test.cc +++ b/trpc/logging/cls/cls_sink_test.cc @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/trpc/logging/cls/config/cls_log_sink_conf.cc b/trpc/logging/cls/config/cls_log_sink_conf.cc index 06ea619..4d32f1d 100644 --- a/trpc/logging/cls/config/cls_log_sink_conf.cc +++ b/trpc/logging/cls/config/cls_log_sink_conf.cc @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/trpc/logging/cls/config/cls_log_sink_conf.h b/trpc/logging/cls/config/cls_log_sink_conf.h index 99783f5..7997844 100644 --- a/trpc/logging/cls/config/cls_log_sink_conf.h +++ b/trpc/logging/cls/config/cls_log_sink_conf.h @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent, diff --git a/trpc/logging/cls/config/cls_log_sink_conf_parser.h b/trpc/logging/cls/config/cls_log_sink_conf_parser.h index 2f168b9..dd1515b 100644 --- a/trpc/logging/cls/config/cls_log_sink_conf_parser.h +++ b/trpc/logging/cls/config/cls_log_sink_conf_parser.h @@ -2,7 +2,7 @@ // // Tencent is pleased to support the open source community by making tRPC available. // -// Copyright (C) 2023 THL A29 Limited, a Tencent company. +// Copyright (C) 2023 Tencent. // All rights reserved. // // If you have downloaded a copy of the tRPC source code from Tencent,