Drop the suffix after the first left parenthesis from UserAgent (stable-24-3) (#11259)

qyryq · web-flow · commit 731f5849c366 · 2024-11-06T16:17:13.000+03:00
diff --git a/ydb/services/deprecated/persqueue_v0/grpc_pq_read_actor.cpp b/ydb/services/deprecated/persqueue_v0/grpc_pq_read_actor.cpp
@@ -843,7 +843,7 @@ void TReadSessionActor::SetupBytesReadByUserAgentCounter() {
         ->GetSubgroup("host", "")
         ->GetSubgroup("protocol", "pqv0")
         ->GetSubgroup("consumer", ClientPath)
-        ->GetSubgroup("user_agent", V1::CleanupCounterValueString(UserAgent))
+        ->GetSubgroup("user_agent", V1::DropUserAgentSuffix(V1::CleanupCounterValueString(UserAgent)))
         ->GetExpiringNamedCounter("sensor", "BytesReadByUserAgent", true);
 }
 
diff --git a/ydb/services/deprecated/persqueue_v0/grpc_pq_write_actor.cpp b/ydb/services/deprecated/persqueue_v0/grpc_pq_write_actor.cpp
@@ -262,7 +262,7 @@ void TWriteSessionActor::SetupBytesWrittenByUserAgentCounter() {
         ->GetSubgroup("host", "")
         ->GetSubgroup("protocol", "pqv0")
         ->GetSubgroup("topic", FullConverter->GetFederationPath())
-        ->GetSubgroup("user_agent", V1::CleanupCounterValueString(UserAgent))
+        ->GetSubgroup("user_agent", V1::DropUserAgentSuffix(V1::CleanupCounterValueString(UserAgent)))
         ->GetExpiringNamedCounter("sensor", "BytesWrittenByUserAgent", true);
 }
 
diff --git a/ydb/services/persqueue_v1/actors/helpers.cpp b/ydb/services/persqueue_v1/actors/helpers.cpp
@@ -29,7 +29,7 @@ bool HasMessages(const Topic::StreamReadMessage::ReadResponse& data) {
 
 
 TString CleanupCounterValueString(const TString& value) {
-    // Internal Monitoring system requires metrics values to no longer than 200 characters
+    // Internal Monitoring system requires metrics values to be no longer than 200 characters
     // and prohibits some ASCII characters.
 
     TString clean;
@@ -55,4 +55,15 @@ TString CleanupCounterValueString(const TString& value) {
     return clean;
 }
 
+
+TString DropUserAgentSuffix(const TString& userAgent) {
+    auto ua = TStringBuf(userAgent);
+    TStringBuf beforeParen, afterParen;
+    ua.Split('(', beforeParen, afterParen);
+    while (beforeParen.ends_with(' ')) {
+        beforeParen.Chop(1);
+    }
+    return TString(beforeParen);
+}
+
 }
diff --git a/ydb/services/persqueue_v1/actors/helpers.h b/ydb/services/persqueue_v1/actors/helpers.h
@@ -18,5 +18,6 @@ bool HasMessages(const PersQueue::V1::MigrationStreamingReadServerMessage::DataB
 bool HasMessages(const Topic::StreamReadMessage::ReadResponse& data);
 
 TString CleanupCounterValueString(const TString& value);
+TString DropUserAgentSuffix(const TString& userAgent);
 
 }
diff --git a/ydb/services/persqueue_v1/actors/read_session_actor.cpp b/ydb/services/persqueue_v1/actors/read_session_actor.cpp
@@ -899,7 +899,7 @@ void TReadSessionActor<UseMigrationProtocol>::SetupBytesReadByUserAgentCounter()
         ->GetSubgroup("protocol", protocol)
         ->GetSubgroup("consumer", ClientPath)
         ->GetSubgroup("sdk_build_info", CleanupCounterValueString(SdkBuildInfo))
-        ->GetSubgroup("user_agent", CleanupCounterValueString(UserAgent))
+        ->GetSubgroup("user_agent", DropUserAgentSuffix(CleanupCounterValueString(UserAgent)))
         ->GetExpiringNamedCounter("sensor", "BytesReadByUserAgent", true);
 }
 
diff --git a/ydb/services/persqueue_v1/actors/write_session_actor.cpp b/ydb/services/persqueue_v1/actors/write_session_actor.cpp
@@ -502,7 +502,7 @@ void TWriteSessionActor<UseMigrationProtocol>::SetupBytesWrittenByUserAgentCount
         ->GetSubgroup("protocol", protocol)
         ->GetSubgroup("topic", topicPath)
         ->GetSubgroup("sdk_build_info", CleanupCounterValueString(SdkBuildInfo))
-        ->GetSubgroup("user_agent", CleanupCounterValueString(UserAgent))
+        ->GetSubgroup("user_agent", DropUserAgentSuffix(CleanupCounterValueString(UserAgent)))
         ->GetExpiringNamedCounter("sensor", "BytesWrittenByUserAgent", true);
 }
 
diff --git a/ydb/services/persqueue_v1/persqueue_new_schemecache_ut.cpp b/ydb/services/persqueue_v1/persqueue_new_schemecache_ut.cpp
@@ -425,7 +425,7 @@ namespace NKikimr::NPersQueueTests {
                             } else {
                                 UNIT_FAIL("Neither topic nor consumer were provided");
                             }
-                            UNIT_ASSERT_VALUES_EQUAL(labels["user_agent"].GetString(), NGRpcProxy::V1::CleanupCounterValueString(userAgent));
+                            UNIT_ASSERT_VALUES_EQUAL(labels["user_agent"].GetString(), NGRpcProxy::V1::DropUserAgentSuffix(NGRpcProxy::V1::CleanupCounterValueString(userAgent)));
                         }
                     };
 
@@ -439,7 +439,7 @@ namespace NKikimr::NPersQueueTests {
                     UNIT_ASSERT(result.IsSuccess());
                 }
 
-                static constexpr auto userAgent = "test-client/v0.1 ' ?*'\"`| ";
+                static constexpr auto userAgent = "test-client/v0.1 ' ?*'\"`| (some build info (codename); os 1.0)";
 
                 {
                     auto newDriverCfg = driverCfg;
@@ -624,7 +624,7 @@ namespace NKikimr::NPersQueueTests {
                             } else {
                                 UNIT_FAIL("Neither topic nor consumer were provided");
                             }
-                            UNIT_ASSERT_VALUES_EQUAL(labels["user_agent"].GetString(), NGRpcProxy::V1::CleanupCounterValueString(userAgent));
+                            UNIT_ASSERT_VALUES_EQUAL(labels["user_agent"].GetString(), NGRpcProxy::V1::DropUserAgentSuffix(NGRpcProxy::V1::CleanupCounterValueString(userAgent)));
                         }
                     };
 
@@ -638,7 +638,7 @@ namespace NKikimr::NPersQueueTests {
                     UNIT_ASSERT(result.IsSuccess());
                 }
 
-                static constexpr auto userAgent = "test-client/v0.1 ' ?*'\"`| ";
+                static constexpr auto userAgent = "test-client/v0.1 ' ?*'\"`| (some build info (codename); os 1.0)";
 
                 {
                     auto newDriverCfg = driverCfg;
diff --git a/ydb/services/persqueue_v1/persqueue_ut.cpp b/ydb/services/persqueue_v1/persqueue_ut.cpp
@@ -3676,7 +3676,8 @@ TPersQueueV1TestServer server{{.CheckACL=true, .NodeCount=1}};
                     } else {
                         UNIT_FAIL("Neither topic nor consumer were provided");
                     }
-                    UNIT_ASSERT_VALUES_EQUAL(labels["user_agent"].GetString(), NGRpcProxy::V1::CleanupCounterValueString(userAgent));
+                    UNIT_ASSERT_VALUES_EQUAL(labels["user_agent"].GetString(), "test-client/v0.1");
+                    UNIT_ASSERT_VALUES_EQUAL(labels["user_agent"].GetString(), NGRpcProxy::V1::DropUserAgentSuffix(NGRpcProxy::V1::CleanupCounterValueString(userAgent)));
                 }
             };
 
@@ -3711,7 +3712,7 @@ TPersQueueV1TestServer server{{.CheckACL=true, .NodeCount=1}};
 
             auto driver = server.AnnoyingClient->GetDriver();
 
-            static constexpr auto userAgent = "test-client/v0.1 ' ?*'\"`| ";
+            static constexpr auto userAgent = "test-client/v0.1 ' ?*'\"`| (some build info (codename); os 1.0)";
 
             auto writer = CreateWriter(
                 *driver,
@@ -3865,8 +3866,7 @@ TPersQueueV1TestServer server{{.CheckACL=true, .NodeCount=1}};
                               "", "Dc1", consumerName, consumerPath
                               );
 
-                checkUserAgentCounters(server.CleverServer->GetRuntime()->GetMonPort(),
-                                       "BytesReadByUserAgent", "pqv1", userAgent, "", consumerPath);
+                checkUserAgentCounters(monPort, "BytesReadByUserAgent", "pqv1", userAgent, "", consumerPath);
             }
         };
 

Original file line number	Diff line number	Diff line change
`@@ -843,7 +843,7 @@ void TReadSessionActor::SetupBytesReadByUserAgentCounter() {`
`843`	`843`	`->GetSubgroup("host", "")`
`844`	`844`	`->GetSubgroup("protocol", "pqv0")`
`845`	`845`	`->GetSubgroup("consumer", ClientPath)`
`846`		`- ->GetSubgroup("user_agent", V1::CleanupCounterValueString(UserAgent))`
	`846`	`+ ->GetSubgroup("user_agent", V1::DropUserAgentSuffix(V1::CleanupCounterValueString(UserAgent)))`
`847`	`847`	`->GetExpiringNamedCounter("sensor", "BytesReadByUserAgent", true);`
`848`	`848`	`}`
`849`	`849`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ void TWriteSessionActor::SetupBytesWrittenByUserAgentCounter() {`
`262`	`262`	`->GetSubgroup("host", "")`
`263`	`263`	`->GetSubgroup("protocol", "pqv0")`
`264`	`264`	`->GetSubgroup("topic", FullConverter->GetFederationPath())`
`265`		`- ->GetSubgroup("user_agent", V1::CleanupCounterValueString(UserAgent))`
	`265`	`+ ->GetSubgroup("user_agent", V1::DropUserAgentSuffix(V1::CleanupCounterValueString(UserAgent)))`
`266`	`266`	`->GetExpiringNamedCounter("sensor", "BytesWrittenByUserAgent", true);`
`267`	`267`	`}`
`268`	`268`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,6 @@ bool HasMessages(const PersQueue::V1::MigrationStreamingReadServerMessage::DataB`
`18`	`18`	`bool HasMessages(const Topic::StreamReadMessage::ReadResponse& data);`
`19`	`19`
`20`	`20`	`TString CleanupCounterValueString(const TString& value);`
	`21`	`+TString DropUserAgentSuffix(const TString& userAgent);`
`21`	`22`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -899,7 +899,7 @@ void TReadSessionActor<UseMigrationProtocol>::SetupBytesReadByUserAgentCounter()`
`899`	`899`	`->GetSubgroup("protocol", protocol)`
`900`	`900`	`->GetSubgroup("consumer", ClientPath)`
`901`	`901`	`->GetSubgroup("sdk_build_info", CleanupCounterValueString(SdkBuildInfo))`
`902`		`- ->GetSubgroup("user_agent", CleanupCounterValueString(UserAgent))`
	`902`	`+ ->GetSubgroup("user_agent", DropUserAgentSuffix(CleanupCounterValueString(UserAgent)))`
`903`	`903`	`->GetExpiringNamedCounter("sensor", "BytesReadByUserAgent", true);`
`904`	`904`	`}`
`905`	`905`
Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ void TWriteSessionActor<UseMigrationProtocol>::SetupBytesWrittenByUserAgentCount`
`502`	`502`	`->GetSubgroup("protocol", protocol)`
`503`	`503`	`->GetSubgroup("topic", topicPath)`
`504`	`504`	`->GetSubgroup("sdk_build_info", CleanupCounterValueString(SdkBuildInfo))`
`505`		`- ->GetSubgroup("user_agent", CleanupCounterValueString(UserAgent))`
	`505`	`+ ->GetSubgroup("user_agent", DropUserAgentSuffix(CleanupCounterValueString(UserAgent)))`
`506`	`506`	`->GetExpiringNamedCounter("sensor", "BytesWrittenByUserAgent", true);`
`507`	`507`	`}`
`508`	`508`
Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ namespace NKikimr::NPersQueueTests {`
`425`	`425`	`} else {`
`426`	`426`	`UNIT_FAIL("Neither topic nor consumer were provided");`
`427`	`427`	`}`
`428`		`- UNIT_ASSERT_VALUES_EQUAL(labels["user_agent"].GetString(), NGRpcProxy::V1::CleanupCounterValueString(userAgent));`
	`428`	`+ UNIT_ASSERT_VALUES_EQUAL(labels["user_agent"].GetString(), NGRpcProxy::V1::DropUserAgentSuffix(NGRpcProxy::V1::CleanupCounterValueString(userAgent)));`
`429`	`429`	`}`
`430`	`430`	`};`
`431`	`431`
`@@ -439,7 +439,7 @@ namespace NKikimr::NPersQueueTests {`
`439`	`439`	`UNIT_ASSERT(result.IsSuccess());`
`440`	`440`	`}`
`441`	`441`
`442`		- static constexpr auto userAgent = "test-client/v0.1 ' ?*'\"`\| ";
	`442`	+ static constexpr auto userAgent = "test-client/v0.1 ' ?*'\"`\| (some build info (codename); os 1.0)";
`443`	`443`
`444`	`444`	`{`
`445`	`445`	`auto newDriverCfg = driverCfg;`
`@@ -624,7 +624,7 @@ namespace NKikimr::NPersQueueTests {`
`624`	`624`	`} else {`
`625`	`625`	`UNIT_FAIL("Neither topic nor consumer were provided");`
`626`	`626`	`}`
`627`		`- UNIT_ASSERT_VALUES_EQUAL(labels["user_agent"].GetString(), NGRpcProxy::V1::CleanupCounterValueString(userAgent));`
	`627`	`+ UNIT_ASSERT_VALUES_EQUAL(labels["user_agent"].GetString(), NGRpcProxy::V1::DropUserAgentSuffix(NGRpcProxy::V1::CleanupCounterValueString(userAgent)));`
`628`	`628`	`}`
`629`	`629`	`};`
`630`	`630`
`@@ -638,7 +638,7 @@ namespace NKikimr::NPersQueueTests {`
`638`	`638`	`UNIT_ASSERT(result.IsSuccess());`
`639`	`639`	`}`
`640`	`640`
`641`		- static constexpr auto userAgent = "test-client/v0.1 ' ?*'\"`\| ";
	`641`	+ static constexpr auto userAgent = "test-client/v0.1 ' ?*'\"`\| (some build info (codename); os 1.0)";
`642`	`642`
`643`	`643`	`{`
`644`	`644`	`auto newDriverCfg = driverCfg;`