diff --git a/alibabacloud-gateway-sls/util/golang/client/compress_test.go b/alibabacloud-gateway-sls/util/golang/client/compress_test.go index 86032a1..6736967 100644 --- a/alibabacloud-gateway-sls/util/golang/client/compress_test.go +++ b/alibabacloud-gateway-sls/util/golang/client/compress_test.go @@ -2,7 +2,7 @@ package client import ( "bytes" - "io" + "io/ioutil" "math/rand" "strconv" "testing" @@ -21,7 +21,7 @@ func testData(data []byte, t *testing.T) { if err != nil { t.Fatal(err) } - decompressed, err := io.ReadAll(r2) + decompressed, err := ioutil.ReadAll(r2) if err != nil { t.Fatal(err) } diff --git a/alibabacloud-gateway-sls/util/golang/client/decompressor.go b/alibabacloud-gateway-sls/util/golang/client/decompressor.go index b348ea9..2a8c80f 100644 --- a/alibabacloud-gateway-sls/util/golang/client/decompressor.go +++ b/alibabacloud-gateway-sls/util/golang/client/decompressor.go @@ -3,7 +3,7 @@ package client import ( "bytes" "compress/zlib" - "io" + "io/ioutil" "github.com/klauspost/compress/zstd" "github.com/pierrec/lz4" @@ -41,7 +41,7 @@ func (d *gzipDecompressor) decompress(src []byte, bodyRawSize int) ([]byte, erro return nil, err } defer reader.Close() - return io.ReadAll(reader) + return ioutil.ReadAll(reader) } type zstdDecompressor struct { diff --git a/alibabacloud-gateway-sls/util/golang/client/log_serializer_test.go b/alibabacloud-gateway-sls/util/golang/client/log_serializer_test.go new file mode 100644 index 0000000..b69c432 --- /dev/null +++ b/alibabacloud-gateway-sls/util/golang/client/log_serializer_test.go @@ -0,0 +1,71 @@ +package client + +import ( + "testing" + + "github.com/gogo/protobuf/proto" +) + +func TestSerializeLogGroupToPB(t *testing.T) { + // Prepare test data + logGroupMap := map[string]interface{}{ + "Topic": "test-topic", + "Source": "test-source", + "LogTags": []interface{}{ + map[string]interface{}{ + "Key": "tag-key", + "Value": "tag-value", + }, + }, + "LogItems": []interface{}{ + map[string]interface{}{ + "Time": int(1678888888), + "TimeNs": int(123456), + "Contents": []interface{}{ + map[string]interface{}{ + "Key": "content-key", + "Value": "content-value", + }, + }, + }, + }, + } + + // Execute + data, err := serializeLogGroupToPB(logGroupMap) + if err != nil { + t.Fatalf("serializeLogGroupToPB failed: %v", err) + } + + // Validate + if len(data) == 0 { + t.Fatal("serialized data is empty") + } + + var lg LogGroup + if err := proto.Unmarshal(data, &lg); err != nil { + t.Fatalf("failed to unmarshal serialized data: %v", err) + } + + if lg.GetTopic() != "test-topic" { + t.Errorf("expected topic 'test-topic', got %s", lg.GetTopic()) + } + + if lg.GetSource() != "test-source" { + t.Errorf("expected source 'test-source', got %s", lg.GetSource()) + } + + if len(lg.LogTags) != 1 { + t.Fatalf("expected 1 tag, got %d", len(lg.LogTags)) + } + if lg.LogTags[0].GetKey() != "tag-key" || lg.LogTags[0].GetValue() != "tag-value" { + t.Errorf("unexpected tag content: %v", lg.LogTags[0]) + } + + if len(lg.Logs) != 1 { + t.Fatalf("expected 1 log item, got %d", len(lg.Logs)) + } + if lg.Logs[0].GetTime() != 1678888888 { + t.Errorf("expected time 1678888888, got %d", lg.Logs[0].GetTime()) + } +} diff --git a/alibabacloud-gateway-sls/util/golang/client/zstd_test.go b/alibabacloud-gateway-sls/util/golang/client/zstd_test.go new file mode 100644 index 0000000..a160060 --- /dev/null +++ b/alibabacloud-gateway-sls/util/golang/client/zstd_test.go @@ -0,0 +1,51 @@ +package client + +import ( + "bytes" + "io/ioutil" + "strconv" + "testing" + + "github.com/alibabacloud-go/tea/tea" +) + +func TestZstdSimple(t *testing.T) { + // 准备测试数据 + input := "Hello, Zstd!" + originalBytes := []byte(input) + compressType := "zstd" + + // 1. 压缩 + compressedBytes, err := Compress(originalBytes, &compressType) + if err != nil { + t.Fatalf("Compression failed: %v", err) + } + + // 确保压缩后的数据不为空 + if len(compressedBytes) == 0 { + t.Fatal("Compressed data is empty") + } + + // 2. 解压 + // ReadAndUncompressBlock 需要原始大小作为字符串参数 + rawSizeStr := strconv.Itoa(len(originalBytes)) + + resultReader, err := ReadAndUncompressBlock( + bytes.NewReader(compressedBytes), + &compressType, + tea.String(rawSizeStr), + ) + if err != nil { + t.Fatalf("Decompression failed: %v", err) + } + + decodedBytes, err := ioutil.ReadAll(resultReader) + if err != nil { + t.Fatalf("Failed to read decompressed data: %v", err) + } + + // 3. 验证 + if string(decodedBytes) != input { + t.Errorf("Content mismatch.\nExpected: %s\nGot: %s", input, string(decodedBytes)) + } +} diff --git a/alibabacloud-gateway-sls/util/golang/go.mod b/alibabacloud-gateway-sls/util/golang/go.mod index 981edac..80a22ce 100644 --- a/alibabacloud-gateway-sls/util/golang/go.mod +++ b/alibabacloud-gateway-sls/util/golang/go.mod @@ -1,20 +1,17 @@ module github.com/alibabacloud-go/alibabacloud-gateway-sls-util -go 1.19 +go 1.13 require ( github.com/alibabacloud-go/tea v1.1.0 github.com/alibabacloud-go/tea-utils/v2 v2.0.1 github.com/gogo/protobuf v1.3.2 github.com/golang/protobuf v1.5.2 - github.com/klauspost/compress v1.17.8 + github.com/klauspost/compress v1.15.9 github.com/pierrec/lz4 v2.6.0+incompatible ) require ( - github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68 // indirect github.com/frankban/quicktest v1.14.5 // indirect - github.com/google/go-cmp v0.5.9 // indirect golang.org/x/net v0.23.0 // indirect - google.golang.org/protobuf v1.26.0 // indirect ) diff --git a/alibabacloud-gateway-sls/util/golang/go.sum b/alibabacloud-gateway-sls/util/golang/go.sum index d03bef0..a10d9f1 100644 --- a/alibabacloud-gateway-sls/util/golang/go.sum +++ b/alibabacloud-gateway-sls/util/golang/go.sum @@ -17,8 +17,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= +github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -30,31 +30,64 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=