Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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


Expand Down Expand Up @@ -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, <daniel@haxx.se>, and many
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.”
2 changes: 1 addition & 1 deletion examples/client/client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion examples/server/greeter_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion examples/server/greeter_service.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion examples/server/helloworld_server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion trpc/logging/cls/callback_result.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion trpc/logging/cls/cls_log.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion trpc/logging/cls/cls_log.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion trpc/logging/cls/cls_log_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion trpc/logging/cls/cls_log_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion trpc/logging/cls/cls_log_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion trpc/logging/cls/cls_sink.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion trpc/logging/cls/cls_sink_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion trpc/logging/cls/config/cls_log_sink_conf.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion trpc/logging/cls/config/cls_log_sink_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion trpc/logging/cls/config/cls_log_sink_conf_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading