diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3f8cd61..0ce93b1 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 70aab88..1e77d96 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 5b22d45..cc6c148 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2023 THL A29 Limited, a Tencent company. All rights reserved. +Copyright (C) 2023 Tencent. All rights reserved. cpp-tracing-jaeger is licensed under the Apache License Version 2.0 except for the third-party components listed below. diff --git a/README.md b/README.md index 2c99896..36f9c97 100644 --- a/README.md +++ b/README.md @@ -197,3 +197,9 @@ if (span) { ## Notice * In the proxy mode, it is necessary to invoke the framework's `MakeClientContext` interface to construct the `ClientContext` based on the `ServerContext`. Otherwise, the call relationship between the server and client will be lost, and a complete call chain cannot be formed. + +# 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 e91d34c..a887599 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/proxy/forward_server.cc b/examples/proxy/forward_server.cc index 27d4591..4b226a8 100644 --- a/examples/proxy/forward_server.cc +++ b/examples/proxy/forward_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/examples/proxy/forward_service.cc b/examples/proxy/forward_service.cc index c3f53b6..cd3c887 100644 --- a/examples/proxy/forward_service.cc +++ b/examples/proxy/forward_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/proxy/forward_service.h b/examples/proxy/forward_service.h index 5a3d467..3c9cc4f 100644 --- a/examples/proxy/forward_service.h +++ b/examples/proxy/forward_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/greeter_service.cc b/examples/server/greeter_service.cc index 09ea8d0..9036077 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 be599b3..916af89 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 841adba..aa59251 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/tracing/jaeger/jaeger_client_filter.cc b/trpc/tracing/jaeger/jaeger_client_filter.cc index c92084a..78d49bb 100644 --- a/trpc/tracing/jaeger/jaeger_client_filter.cc +++ b/trpc/tracing/jaeger/jaeger_client_filter.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/tracing/jaeger/jaeger_client_filter.h b/trpc/tracing/jaeger/jaeger_client_filter.h index b198cf6..f9ac166 100644 --- a/trpc/tracing/jaeger/jaeger_client_filter.h +++ b/trpc/tracing/jaeger/jaeger_client_filter.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/tracing/jaeger/jaeger_client_filter_test.cc b/trpc/tracing/jaeger/jaeger_client_filter_test.cc index 9eadf00..7b522f4 100644 --- a/trpc/tracing/jaeger/jaeger_client_filter_test.cc +++ b/trpc/tracing/jaeger/jaeger_client_filter_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/tracing/jaeger/jaeger_common.cc b/trpc/tracing/jaeger/jaeger_common.cc index 09fccf8..8c0e1c6 100644 --- a/trpc/tracing/jaeger/jaeger_common.cc +++ b/trpc/tracing/jaeger/jaeger_common.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/tracing/jaeger/jaeger_common.h b/trpc/tracing/jaeger/jaeger_common.h index ba5a017..0bbd5b5 100644 --- a/trpc/tracing/jaeger/jaeger_common.h +++ b/trpc/tracing/jaeger/jaeger_common.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/tracing/jaeger/jaeger_common_test.cc b/trpc/tracing/jaeger/jaeger_common_test.cc index e49a122..b19d52b 100644 --- a/trpc/tracing/jaeger/jaeger_common_test.cc +++ b/trpc/tracing/jaeger/jaeger_common_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/tracing/jaeger/jaeger_server_filter.cc b/trpc/tracing/jaeger/jaeger_server_filter.cc index e569594..d1925bd 100644 --- a/trpc/tracing/jaeger/jaeger_server_filter.cc +++ b/trpc/tracing/jaeger/jaeger_server_filter.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/tracing/jaeger/jaeger_server_filter.h b/trpc/tracing/jaeger/jaeger_server_filter.h index b389621..026b3d7 100644 --- a/trpc/tracing/jaeger/jaeger_server_filter.h +++ b/trpc/tracing/jaeger/jaeger_server_filter.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/tracing/jaeger/jaeger_server_filter_test.cc b/trpc/tracing/jaeger/jaeger_server_filter_test.cc index d4a3c52..4658cc8 100644 --- a/trpc/tracing/jaeger/jaeger_server_filter_test.cc +++ b/trpc/tracing/jaeger/jaeger_server_filter_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/tracing/jaeger/jaeger_text_map_carrier.cc b/trpc/tracing/jaeger/jaeger_text_map_carrier.cc index 3c4e528..4675c1c 100644 --- a/trpc/tracing/jaeger/jaeger_text_map_carrier.cc +++ b/trpc/tracing/jaeger/jaeger_text_map_carrier.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/tracing/jaeger/jaeger_text_map_carrier.h b/trpc/tracing/jaeger/jaeger_text_map_carrier.h index ca6ad52..b3ff1e3 100644 --- a/trpc/tracing/jaeger/jaeger_text_map_carrier.h +++ b/trpc/tracing/jaeger/jaeger_text_map_carrier.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/tracing/jaeger/jaeger_text_map_carrier_test.cc b/trpc/tracing/jaeger/jaeger_text_map_carrier_test.cc index f6a7854..0c47844 100644 --- a/trpc/tracing/jaeger/jaeger_text_map_carrier_test.cc +++ b/trpc/tracing/jaeger/jaeger_text_map_carrier_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/tracing/jaeger/jaeger_tracing.cc b/trpc/tracing/jaeger/jaeger_tracing.cc index ad5d7ca..df91628 100644 --- a/trpc/tracing/jaeger/jaeger_tracing.cc +++ b/trpc/tracing/jaeger/jaeger_tracing.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/tracing/jaeger/jaeger_tracing.h b/trpc/tracing/jaeger/jaeger_tracing.h index e4b6b49..fff79fc 100644 --- a/trpc/tracing/jaeger/jaeger_tracing.h +++ b/trpc/tracing/jaeger/jaeger_tracing.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/tracing/jaeger/jaeger_tracing_api.cc b/trpc/tracing/jaeger/jaeger_tracing_api.cc index e217bc8..a175c24 100644 --- a/trpc/tracing/jaeger/jaeger_tracing_api.cc +++ b/trpc/tracing/jaeger/jaeger_tracing_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/tracing/jaeger/jaeger_tracing_api.h b/trpc/tracing/jaeger/jaeger_tracing_api.h index cb4dabc..93bf6a1 100644 --- a/trpc/tracing/jaeger/jaeger_tracing_api.h +++ b/trpc/tracing/jaeger/jaeger_tracing_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/tracing/jaeger/jaeger_tracing_api_test.cc b/trpc/tracing/jaeger/jaeger_tracing_api_test.cc index 7d904d6..982f402 100644 --- a/trpc/tracing/jaeger/jaeger_tracing_api_test.cc +++ b/trpc/tracing/jaeger/jaeger_tracing_api_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/tracing/jaeger/jaeger_tracing_conf.cc b/trpc/tracing/jaeger/jaeger_tracing_conf.cc index a86783d..4aacb3d 100644 --- a/trpc/tracing/jaeger/jaeger_tracing_conf.cc +++ b/trpc/tracing/jaeger/jaeger_tracing_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/tracing/jaeger/jaeger_tracing_conf.h b/trpc/tracing/jaeger/jaeger_tracing_conf.h index c597cdb..a7315e7 100644 --- a/trpc/tracing/jaeger/jaeger_tracing_conf.h +++ b/trpc/tracing/jaeger/jaeger_tracing_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/tracing/jaeger/jaeger_tracing_conf_parser.h b/trpc/tracing/jaeger/jaeger_tracing_conf_parser.h index bfd332d..a0aaf64 100644 --- a/trpc/tracing/jaeger/jaeger_tracing_conf_parser.h +++ b/trpc/tracing/jaeger/jaeger_tracing_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, diff --git a/trpc/tracing/jaeger/jaeger_tracing_conf_test.cc b/trpc/tracing/jaeger/jaeger_tracing_conf_test.cc index 3cb7c84..7783f56 100644 --- a/trpc/tracing/jaeger/jaeger_tracing_conf_test.cc +++ b/trpc/tracing/jaeger/jaeger_tracing_conf_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/tracing/jaeger/jaeger_tracing_test.cc b/trpc/tracing/jaeger/jaeger_tracing_test.cc index e2f8cff..210c4a5 100644 --- a/trpc/tracing/jaeger/jaeger_tracing_test.cc +++ b/trpc/tracing/jaeger/jaeger_tracing_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,