fabric
/
logbox
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'main' of git.lowcodeplatform.net:fabric/logbox

main v0.2.18
loveckiy.ivan 3 months ago
parent
e67c442954 3050c51200
commit
eb54bd816f
5 changed files with 22 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      go.mod
  2. 7
      go.sum
  3. 12
      vendor/git.lowcodeplatform.net/fabric/logbox-client/client.go
  4. 11
      vendor/git.lowcodeplatform.net/packages/logger/middleware.go
  5. 4
      vendor/modules.txt

4
go.mod
View File

@ -6,7 +6,7 @@ require (
git.lowcodeplatform.net/fabric/lib v0.2.14
git.lowcodeplatform.net/fabric/models v0.1.32
git.lowcodeplatform.net/packages/cache v0.1.8
git.lowcodeplatform.net/packages/logger v0.1.21
git.lowcodeplatform.net/packages/logger v0.1.22
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
github.com/go-kit/kit v0.12.0
github.com/google/uuid v1.3.0
@ -34,7 +34,7 @@ require (
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
cloud.google.com/go/storage v1.28.1 // indirect
git.lowcodeplatform.net/fabric/logbox-client v0.1.16 // indirect
git.lowcodeplatform.net/fabric/logbox-client v0.1.17 // indirect
git.lowcodeplatform.net/packages/grpcbalancer v0.0.0-20230625153511-db2331a573d5 // indirect
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect

7
go.sum
View File

@ -46,6 +46,8 @@ git.lowcodeplatform.net/fabric/lib v0.2.14 h1:yktdOYeEPMtttIQbynoL3xUByXxMXlP1XA
git.lowcodeplatform.net/fabric/lib v0.2.14/go.mod h1:bDQ/TDL5Gzb+y2J4s2K7is5601DzyteDJu7nqSdTI/I=
git.lowcodeplatform.net/fabric/logbox-client v0.1.16 h1:7qeQrmqYqI1M4W77AMER+AnKHDS1wmwqxSmzWpkTuPk=
git.lowcodeplatform.net/fabric/logbox-client v0.1.16/go.mod h1:0fSeuQBhKikxfCCVlZGhuuNRMF7KVD2BHQF39r5qBuE=
git.lowcodeplatform.net/fabric/logbox-client v0.1.17 h1:rXHlYzTT78FpB3zIPVUl5zqJHrwzoQUctBK5k0P/L4s=
git.lowcodeplatform.net/fabric/logbox-client v0.1.17/go.mod h1:0fSeuQBhKikxfCCVlZGhuuNRMF7KVD2BHQF39r5qBuE=
git.lowcodeplatform.net/fabric/models v0.1.27 h1:LXS9y6/NWyDwBlb59kZLYxviHNAfY99H/qVLzMUGyK8=
git.lowcodeplatform.net/fabric/models v0.1.27/go.mod h1:RSR+ysusHS7bhYOCDuWbkuGQkFL0Mum4r/FXPzStUQQ=
git.lowcodeplatform.net/fabric/models v0.1.32 h1:tkz46cUv6zc6j0vQ0ZR6rwWsn2Lwm6/qbaqg7Hq/910=
@ -56,6 +58,8 @@ git.lowcodeplatform.net/packages/grpcbalancer v0.0.0-20230625153511-db2331a573d5
git.lowcodeplatform.net/packages/grpcbalancer v0.0.0-20230625153511-db2331a573d5/go.mod h1:6+zmaCCxq59km/hBH+Qn0Ran/VGZVHBV+iZPsf0E5gU=
git.lowcodeplatform.net/packages/logger v0.1.21 h1:jIfEqURkkg+dROJSMZDTH7mQkjJGlDh4UAV+79YbwIA=
git.lowcodeplatform.net/packages/logger v0.1.21/go.mod h1:TPYiizHJLGEe+isQOu0Hne8CjvHRkuQo7q7LNNw+C2U=
git.lowcodeplatform.net/packages/logger v0.1.22 h1:dF4jvbhIb3m2IQ/6Awku73mQfbCz6HE7Adwxw8Aa0lA=
git.lowcodeplatform.net/packages/logger v0.1.22/go.mod h1:2Vf4M2rO/j6v7rixEzl6mAjVABOxPBMeuKN2SQw/nB4=
github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible h1:bmmC38SlE8/E81nNADlgmVGurPWMHDX2YNXVQMrBpEE=
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
@ -91,6 +95,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/ReneKroon/ttlcache v1.7.0 h1:8BkjFfrzVFXyrqnMtezAaJ6AHPSsVV10m6w28N/Fgkk=
github.com/ReneKroon/ttlcache v1.7.0/go.mod h1:8BGGzdumrIjWxdRx8zpK6L3oGMWvIXdvB2GD1cfvd+I=
github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
@ -140,6 +146,7 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/gabriel-vasile/mimetype v1.4.1 h1:TRWk7se+TOjCYgRth7+1/OYLNiRNIotknkFtf/dnN7Q=
github.com/gabriel-vasile/mimetype v1.4.1/go.mod h1:05Vi0w3Y9c/lNvJOdmIwvrrAhX3rYhfQQCaf9VJcv7M=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=

12
vendor/git.lowcodeplatform.net/fabric/logbox-client/client.go
View File

@ -103,17 +103,17 @@ func New(ctx context.Context, urlstr string, reqTimeout time.Duration, cbMaxRequ
return nil, err
}
splitUrl := strings.Split(u.Path, "/")
if len(splitUrl) < 3 {
return nil, fmt.Errorf("error path: %s", urlstr)
}
domain := splitUrl[1:3]
//if len(splitUrl) < 3 {
// domain := []string{""}
//}
//splitUrl = splitUrl[1:3]
return &client{
client: b,
cb: cb,
domain: strings.Join(domain, "/"),
domain: strings.Join(splitUrl, "/"),
projectKey: projectKey,
}, err
}, nil
}
func GRPCUnaryClientInterceptor(

11
vendor/git.lowcodeplatform.net/packages/logger/middleware.go
View File

@ -14,6 +14,7 @@ import (
"strings"
"time"
"git.lowcodeplatform.net/fabric/models"
"github.com/segmentio/ksuid"
_ "github.com/segmentio/ksuid"
"go.uber.org/zap"
@ -97,12 +98,10 @@ func HTTPMiddleware(next http.Handler) http.Handler {
// HttpClientHeaders устанавливает заголовки реквеста из контекста и headers
func HttpClientHeaders(ctx context.Context, req *http.Request, headers map[string]string) {
if requestID := req.Header.Get(headerXRequestID); requestID != "" {
req.Header.Add(headerXRequestID, requestID)
}
if userID := req.Header.Get(headerXUserID); userID != "" {
req.Header.Add(headerXUserID, userID)
for ctxField, headerField := range models.ProxiedHeaders {
if value := GetFieldCtx(ctx, ctxField); value != "" {
req.Header.Add(headerField, value)
}
}
if len(headers) > 0 {

4
vendor/modules.txt
View File

@ -24,7 +24,7 @@ cloud.google.com/go/storage/internal/apiv2/stubs
## explicit; go 1.18
git.lowcodeplatform.net/fabric/lib
git.lowcodeplatform.net/fabric/lib/pkg/s3
# git.lowcodeplatform.net/fabric/logbox-client v0.1.16
# git.lowcodeplatform.net/fabric/logbox-client v0.1.17
## explicit; go 1.18
git.lowcodeplatform.net/fabric/logbox-client
# git.lowcodeplatform.net/fabric/models v0.1.32
@ -37,7 +37,7 @@ git.lowcodeplatform.net/packages/cache
## explicit; go 1.17
git.lowcodeplatform.net/packages/grpcbalancer
git.lowcodeplatform.net/packages/grpcbalancer/multiresolver
# git.lowcodeplatform.net/packages/logger v0.1.21
# git.lowcodeplatform.net/packages/logger v0.1.22
## explicit; go 1.19
git.lowcodeplatform.net/packages/logger
git.lowcodeplatform.net/packages/logger/types

Write Preview
Loading…
Cancel
Save