|
2 | 2 |
|
3 | 3 | #include <gmock/gmock.h> |
4 | 4 |
|
| 5 | +#include <ugrpc/server/middlewares/access_log/middleware.hpp> |
| 6 | +#include <userver/ugrpc/server/middlewares/access_log/log_extra.hpp> |
5 | 7 | #include <userver/utest/log_capture_fixture.hpp> |
6 | 8 | #include <userver/utils/regex.hpp> |
7 | 9 |
|
8 | | -#include <ugrpc/server/middlewares/access_log/middleware.hpp> |
9 | | - |
10 | 10 | #include <tests/unit_test_client.usrv.pb.hpp> |
11 | 11 | #include <tests/unit_test_service.usrv.pb.hpp> |
12 | 12 | #include <userver/ugrpc/tests/service_fixtures.hpp> |
@@ -73,17 +73,20 @@ class ServiceWithAccessLogFixture : public ugrpc::tests::ServiceFixtureBase { |
73 | 73 | // Test middleware that adds custom tags to LogExtra |
74 | 74 | class TagsMiddleware final : public ugrpc::server::MiddlewareBase { |
75 | 75 | public: |
| 76 | + /// [grpc log extra tag] |
76 | 77 | void OnCallStart(ugrpc::server::MiddlewareCallContext& context) const override { |
77 | | - auto* log_extra = context.GetStorageContext().GetOptional(ugrpc::server::middlewares::access_log::kLogExtraTag); |
78 | | - |
79 | | - if (log_extra) { |
80 | | - log_extra->Extend("user_id", "12345"); |
81 | | - log_extra->Extend("session_id", "abc-def-ghi"); |
82 | | - log_extra->Extend("request_id", "req-98765"); |
83 | | - log_extra->Extend("custom_tag", "test-value"); |
84 | | - log_extra->Extend("numeric_tag", "42"); |
85 | | - } |
| 78 | + ugrpc::server::middlewares::access_log::SetAdditionalLogKeys( |
| 79 | + context, |
| 80 | + logging::LogExtra{ |
| 81 | + std::pair<std::string, std::string>("user_id", "12345"), |
| 82 | + std::pair<std::string, std::string>("session_id", "abc-def-ghi"), |
| 83 | + std::pair<std::string, std::string>("request_id", "req-98765"), |
| 84 | + std::pair<std::string, std::string>("custom_tag", "test-value"), |
| 85 | + std::pair<std::string, std::string>("numeric_tag", "42"), |
| 86 | + } |
| 87 | + ); |
86 | 88 | } |
| 89 | + /// [grpc log extra tag] |
87 | 90 | }; |
88 | 91 |
|
89 | 92 | template <typename GrpcService> |
|
0 commit comments