From 7c2bea662ac3fe044ae8d1d6a6efc9db623c0a46 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Wed, 21 Feb 2024 16:22:09 +0300
Subject: [PATCH] =?UTF-8?q?revert=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D1=85?=
 =?UTF-8?q?=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logs/zap/buffered_write_syncer_test.go           | 12 ++++++------
 pkg/collections/middleware/logging_middleware.go |  2 +-
 zap/filter_core.go                               |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/logs/zap/buffered_write_syncer_test.go b/logs/zap/buffered_write_syncer_test.go
index 77b6ca24..073663ed 100644
--- a/logs/zap/buffered_write_syncer_test.go
+++ b/logs/zap/buffered_write_syncer_test.go
@@ -24,10 +24,10 @@ func TestBufferedWriteSyncer_Write(t *testing.T) {
 
 	ws := &BufferedWriteSyncer{Service: service}
 
-	err := ws.Write(&logs.Entry{Message: "first logs message"})
+	err := ws.Write(&logs.Entry{Message: "first log message"})
 	require.NoError(t, err)
 
-	err = ws.Write(&logs.Entry{Message: "second logs message"})
+	err = ws.Write(&logs.Entry{Message: "second log message"})
 	require.NoError(t, err)
 
 	err = ws.Stop()
@@ -53,7 +53,7 @@ func TestBufferedWriteSyncer_Write_Concurrent(t *testing.T) {
 		wg.Add(1)
 		go func(wg *sync.WaitGroup) {
 			defer wg.Done()
-			require.NoError(t, ws.Write(&logs.Entry{Message: "logs message"}))
+			require.NoError(t, ws.Write(&logs.Entry{Message: "log message"}))
 		}(&wg)
 	}
 
@@ -77,7 +77,7 @@ func TestBufferedWriteSyncer_Flush(t *testing.T) {
 
 	for i := 0; i < 10; i++ {
 		for j := 0; j < 10; j++ {
-			require.NoError(t, ws.Write(&logs.Entry{Message: "logs message"}))
+			require.NoError(t, ws.Write(&logs.Entry{Message: "log message"}))
 		}
 		require.NoError(t, ws.Sync())
 	}
@@ -100,7 +100,7 @@ func TestBufferedWriteSyncer_MaxBufferSize(t *testing.T) {
 	ws := &BufferedWriteSyncer{Service: service, MaxBufferSize: 10}
 
 	for i := 0; i < 100; i++ {
-		require.NoError(t, ws.Write(&logs.Entry{Message: "logs message"}))
+		require.NoError(t, ws.Write(&logs.Entry{Message: "log message"}))
 	}
 
 	require.NoError(t, ws.Stop())
@@ -121,7 +121,7 @@ func TestBufferedWriteSyncer_FlushInterval(t *testing.T) {
 	ws := &BufferedWriteSyncer{Service: service, FlushInterval: time.Second}
 
 	for j := 0; j < 10; j++ {
-		require.NoError(t, ws.Write(&logs.Entry{Message: "logs message"}))
+		require.NoError(t, ws.Write(&logs.Entry{Message: "log message"}))
 	}
 
 	time.Sleep(3 * time.Second) // ждем, пока сработает интервал
diff --git a/pkg/collections/middleware/logging_middleware.go b/pkg/collections/middleware/logging_middleware.go
index 1827c96b..c5e2e2fb 100644
--- a/pkg/collections/middleware/logging_middleware.go
+++ b/pkg/collections/middleware/logging_middleware.go
@@ -1,5 +1,5 @@
 // Code generated by gowrap. DO NOT EDIT.
-// template: ../../../assets/templates/middleware/logs.tmpl
+// template: ../../../assets/templates/middleware/log.tmpl
 // gowrap: http://github.com/hexdigest/gowrap
 
 package middleware
diff --git a/zap/filter_core.go b/zap/filter_core.go
index 8f92b800..7e99d942 100644
--- a/zap/filter_core.go
+++ b/zap/filter_core.go
@@ -67,8 +67,8 @@ type filterCore struct {
 //	core = WithFilters(core, ContainsField(zap.Int("a", 5)))
 //
 //	logger := zap.New(core)
-//	logger.Info("Test logs") // НЕ будет записан
-//	logger.Info("Test logs", zap.Int("a", 5)) // будет записан
+//	logger.Info("Test log") // НЕ будет записан
+//	logger.Info("Test log", zap.Int("a", 5)) // будет записан
 func WithFilters(core zapcore.Core, filters ...FilterFunc) zapcore.Core {
 	return &filterCore{
 		Core:    core,
-- 
GitLab