-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14247 from zmstone/241119-ga-tns-m1-logging-metadata
241119 ga multi-tenancy m1 logging metadata
- Loading branch information
Showing
9 changed files
with
225 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| %%-------------------------------------------------------------------- | ||
| %% Copyright (c) 2024 EMQ Technologies Co., Ltd. All Rights Reserved. | ||
| %% | ||
| %% Licensed under the Apache License, Version 2.0 (the "License"); | ||
| %% you may not use this file except in compliance with the License. | ||
| %% You may obtain a copy of the License at | ||
| %% | ||
| %% http://www.apache.org/licenses/LICENSE-2.0 | ||
| %% | ||
| %% Unless required by applicable law or agreed to in writing, software | ||
| %% distributed under the License is distributed on an "AS IS" BASIS, | ||
| %% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| %% See the License for the specific language governing permissions and | ||
| %% limitations under the License. | ||
| %%-------------------------------------------------------------------- | ||
|
|
||
| -module(emqx_channel_tests). | ||
|
|
||
| -include_lib("eunit/include/eunit.hrl"). | ||
|
|
||
| set_tns_in_log_meta_test_() -> | ||
| PdKey = '$logger_metadata$', | ||
| Original = get(PdKey), | ||
| Set = fun(Cinfo) -> | ||
| Ch = emqx_channel:dummy(), | ||
| Ch1 = emqx_channel:set_field(clientinfo, Cinfo, Ch), | ||
| emqx_channel:set_log_meta(dummy, Ch1) | ||
| end, | ||
| Restore = fun() -> put(PdKey, Original) end, | ||
| NoTns = #{ | ||
| clientid => <<"id1">>, | ||
| client_attrs => #{<<"not_tns">> => <<"tns1">>}, | ||
| username => <<"user1">> | ||
| }, | ||
| NoTnsFn = fun(M) -> | ||
| ?assertMatch( | ||
| #{ | ||
| clientid := <<"id1">>, | ||
| username := <<"user1">> | ||
| }, | ||
| M | ||
| ), | ||
| ?assertNot(maps:is_key(tns, M)) | ||
| end, | ||
| Prefixed = #{ | ||
| clientid => <<"tns1-id1">>, | ||
| client_attrs => #{<<"tns">> => <<"tns1">>}, | ||
| username => <<"user2">> | ||
| }, | ||
| PrefixedFn = fun(M) -> | ||
| ?assertMatch( | ||
| #{ | ||
| clientid := <<"tns1-id1">>, | ||
| username := <<"user2">> | ||
| }, | ||
| M | ||
| ), | ||
| ?assertNot(maps:is_key(tns, M)) | ||
| end, | ||
|
|
||
| Username = #{ | ||
| clientid => <<"id1">>, | ||
| client_attrs => #{<<"tns">> => <<"user3">>}, | ||
| username => <<"user3">> | ||
| }, | ||
| UsernameFn = | ||
| fun(M) -> | ||
| ?assertMatch( | ||
| #{ | ||
| clientid := <<"id1">>, | ||
| username := <<"user3">> | ||
| }, | ||
| M | ||
| ), | ||
| ?assertNot(maps:is_key(tns, M)) | ||
| end, | ||
| TnsAdded = #{ | ||
| clientid => <<"id4">>, | ||
| client_attrs => #{<<"tns">> => <<"tns1">>}, | ||
| username => <<"user4">> | ||
| }, | ||
| TnsAddedFn = fun(M) -> | ||
| ?assertMatch( | ||
| #{ | ||
| clientid := <<"id4">>, | ||
| username := <<"user4">>, | ||
| tns := <<"tns1">> | ||
| }, | ||
| M | ||
| ) | ||
| end, | ||
| Run = fun(Cinfo, CheckFn) -> | ||
| Set(Cinfo), | ||
| try | ||
| CheckFn(get(PdKey)) | ||
| after | ||
| Restore() | ||
| end | ||
| end, | ||
| MakeTestFn = fun(Cinfo, CheckFn) -> | ||
| fun() -> | ||
| Run(Cinfo, CheckFn) | ||
| end | ||
| end, | ||
| [ | ||
| {"tns-added", MakeTestFn(TnsAdded, TnsAddedFn)}, | ||
| {"username as tns", MakeTestFn(Username, UsernameFn)}, | ||
| {"tns prefixed clientid", MakeTestFn(Prefixed, PrefixedFn)}, | ||
| {"no tns", MakeTestFn(NoTns, NoTnsFn)} | ||
| ]. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| %%-------------------------------------------------------------------- | ||
| %% Copyright (c) 2024 EMQ Technologies Co., Ltd. All Rights Reserved. | ||
| %% | ||
| %% Licensed under the Apache License, Version 2.0 (the "License"); | ||
| %% you may not use this file except in compliance with the License. | ||
| %% You may obtain a copy of the License at | ||
| %% | ||
| %% http://www.apache.org/licenses/LICENSE-2.0 | ||
| %% | ||
| %% Unless required by applicable law or agreed to in writing, software | ||
| %% distributed under the License is distributed on an "AS IS" BASIS, | ||
| %% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| %% See the License for the specific language governing permissions and | ||
| %% limitations under the License. | ||
| %%-------------------------------------------------------------------- | ||
| -module(emqx_trace_formatter_tests). | ||
|
|
||
| -include_lib("eunit/include/eunit.hrl"). | ||
|
|
||
| format_no_tns_in_meta_test() -> | ||
| Meta = #{ | ||
| clientid => <<"c">>, | ||
| trace_tag => tag | ||
| }, | ||
| Event = #{ | ||
| level => debug, | ||
| meta => Meta, | ||
| msg => <<"test_msg">> | ||
| }, | ||
| Config = #{payload_encode => hidden}, | ||
| Formatted = format(Event, Config), | ||
| ?assertMatch(nomatch, re:run(Formatted, "tns:")), | ||
| ok. | ||
|
|
||
| format_tns_in_meta_test() -> | ||
| Meta = #{ | ||
| tns => <<"a">>, | ||
| clientid => <<"c">>, | ||
| trace_tag => tag | ||
| }, | ||
| Event = #{ | ||
| level => debug, | ||
| meta => Meta, | ||
| msg => <<"test_msg">> | ||
| }, | ||
| Config = #{payload_encode => hidden}, | ||
| Formatted = format(Event, Config), | ||
| ?assertMatch({match, _}, re:run(Formatted, "\stns:\sa\s")), | ||
| ok. | ||
|
|
||
| format(Event, Config) -> | ||
| unicode:characters_to_binary(emqx_trace_formatter:format(Event, Config)). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Write client attribute named `tns` to log messages if such client attribute exists. |