mirror of
https://github.com/lukaszraczylo/go-simple-graphql.git
synced 2026-10-13 00:48:37 +00:00
Compare commits
@@ -0,0 +1,73 @@
|
|||||||
|
name: Autoupdate go.mod and go.sum
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
schedule:
|
||||||
|
- cron: "0 3 * * *"
|
||||||
|
|
||||||
|
env:
|
||||||
|
GO_VERSION: ">=1.21"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
# This job is responsible for preparation of the build
|
||||||
|
# environment variables.
|
||||||
|
prepare:
|
||||||
|
name: Preparing build context
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repo
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Install Go
|
||||||
|
uses: actions/setup-go@v5
|
||||||
|
id: cache
|
||||||
|
with:
|
||||||
|
go-version: ${{env.GO_VERSION}}
|
||||||
|
cache-dependency-path: "**/*.sum"
|
||||||
|
|
||||||
|
- name: Go get dependencies
|
||||||
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
|
run: |
|
||||||
|
go get ./...
|
||||||
|
|
||||||
|
# This job is responsible for running tests and linting the codebase
|
||||||
|
test:
|
||||||
|
name: "Unit testing"
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
container: golang:1
|
||||||
|
needs: [prepare]
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0 # Ensure full history is checked out
|
||||||
|
token: ${{ secrets.GHCR_TOKEN }}
|
||||||
|
|
||||||
|
- name: Install Go
|
||||||
|
uses: actions/setup-go@v5
|
||||||
|
with:
|
||||||
|
go-version: ${{env.GO_VERSION}}
|
||||||
|
cache-dependency-path: "**/*.sum"
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: |
|
||||||
|
apt-get update
|
||||||
|
apt-get install ca-certificates make -y
|
||||||
|
update-ca-certificates
|
||||||
|
go mod tidy
|
||||||
|
go get -u -v ./...
|
||||||
|
go mod tidy -v
|
||||||
|
|
||||||
|
- name: Run unit tests
|
||||||
|
run: |
|
||||||
|
CI_RUN=${CI} make test
|
||||||
|
git config --global --add safe.directory /__w/go-simple-graphql/go-simple-graphql
|
||||||
|
|
||||||
|
- name: Commit changes
|
||||||
|
uses: stefanzweifel/git-auto-commit-action@v5
|
||||||
|
with:
|
||||||
|
commit_message: "Update go.mod and go.sum"
|
||||||
|
commit_options: "--no-verify --signoff"
|
||||||
|
file_pattern: "go.mod go.sum"
|
||||||
+48
-27
@@ -12,6 +12,7 @@ import (
|
|||||||
|
|
||||||
"github.com/avast/retry-go/v4"
|
"github.com/avast/retry-go/v4"
|
||||||
"github.com/goccy/go-json"
|
"github.com/goccy/go-json"
|
||||||
|
libpack_logger "github.com/lukaszraczylo/go-simple-graphql/logging"
|
||||||
)
|
)
|
||||||
|
|
||||||
var bufferPool = sync.Pool{
|
var bufferPool = sync.Pool{
|
||||||
@@ -26,79 +27,86 @@ func (qe *QueryExecutor) executeQuery() ([]byte, error) {
|
|||||||
defer bufferPool.Put(buf)
|
defer bufferPool.Put(buf)
|
||||||
buf.Reset()
|
buf.Reset()
|
||||||
|
|
||||||
_, err := buf.Write(qe.Query)
|
buf.Write(qe.Query)
|
||||||
if err != nil {
|
|
||||||
qe.Logger.Error("Can't write to buffer", map[string]interface{}{"error": err})
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
httpRequest, err := http.NewRequest(http.MethodPost, qe.endpoint, buf)
|
httpRequest, err := http.NewRequest(http.MethodPost, qe.endpoint, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
qe.Logger.Error("Can't create HTTP request", map[string]interface{}{"error": err})
|
qe.Logger.Error(&libpack_logger.LogMessage{
|
||||||
|
Message: "Can't create HTTP request",
|
||||||
|
Pairs: map[string]interface{}{"error": err.Error()},
|
||||||
|
})
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
for key, value := range qe.Headers {
|
for key, value := range qe.Headers {
|
||||||
httpRequest.Header.Set(key, fmt.Sprint(value))
|
httpRequest.Header.Set(key, fmt.Sprint(value))
|
||||||
}
|
}
|
||||||
|
// Set Content-Type header if not already set
|
||||||
|
if httpRequest.Header.Get("Content-Type") == "" {
|
||||||
|
httpRequest.Header.Set("Content-Type", "application/json")
|
||||||
|
}
|
||||||
|
|
||||||
retriesMax := 1
|
retriesMax := 1
|
||||||
if qe.Retries {
|
if qe.Retries {
|
||||||
qe.Logger.Debug("Retries enabled", map[string]interface{}{"retries": qe.retries_number})
|
|
||||||
retriesMax = qe.retries_number
|
retriesMax = qe.retries_number
|
||||||
} else {
|
|
||||||
qe.Logger.Debug("Retries disabled", map[string]interface{}{"retries": 1})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var queryResult queryResults
|
var queryResult queryResults
|
||||||
err = retry.Do(
|
err = retry.Do(
|
||||||
func() error {
|
func() error {
|
||||||
|
// Reset buffer before each retry
|
||||||
|
buf.Reset()
|
||||||
|
buf.Write(qe.Query)
|
||||||
|
|
||||||
|
// Set the body of the request
|
||||||
|
httpRequest.Body = io.NopCloser(bytes.NewReader(buf.Bytes()))
|
||||||
|
httpRequest.ContentLength = int64(buf.Len())
|
||||||
|
|
||||||
httpResponse, err := qe.client.Do(httpRequest)
|
httpResponse, err := qe.client.Do(httpRequest)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
qe.Logger.Debug("Error executing HTTP request", map[string]interface{}{"error": err.Error()})
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
_, err := io.Copy(io.Discard, httpResponse.Body)
|
io.Copy(io.Discard, httpResponse.Body)
|
||||||
if err != nil {
|
|
||||||
qe.Logger.Debug("Error discarding HTTP response body", map[string]interface{}{"error": err.Error()})
|
|
||||||
}
|
|
||||||
httpResponse.Body.Close()
|
httpResponse.Body.Close()
|
||||||
}()
|
}()
|
||||||
|
|
||||||
if httpResponse.StatusCode < http.StatusOK || httpResponse.StatusCode >= http.StatusNoContent {
|
if httpResponse.StatusCode < http.StatusOK || httpResponse.StatusCode >= http.StatusMultipleChoices {
|
||||||
return fmt.Errorf("HTTP error - status code: %s for %s", httpResponse.Status, httpRequest.URL)
|
return fmt.Errorf("HTTP error - status code: %s for %s", httpResponse.Status, httpRequest.URL)
|
||||||
}
|
}
|
||||||
|
|
||||||
var reader io.ReadCloser
|
var reader io.Reader
|
||||||
encoding := httpResponse.Header.Get("Content-Encoding")
|
encoding := httpResponse.Header.Get("Content-Encoding")
|
||||||
if encoding == "gzip" {
|
if encoding == "gzip" {
|
||||||
reader, err = gzip.NewReader(httpResponse.Body)
|
gzipReader, err := gzip.NewReader(httpResponse.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
qe.Logger.Debug("Error creating gzip reader", map[string]interface{}{"error": err.Error()})
|
|
||||||
return fmt.Errorf("error creating gzip reader: %w", err)
|
return fmt.Errorf("error creating gzip reader: %w", err)
|
||||||
}
|
}
|
||||||
defer reader.Close()
|
defer gzipReader.Close()
|
||||||
|
reader = gzipReader
|
||||||
} else {
|
} else {
|
||||||
reader = httpResponse.Body
|
reader = httpResponse.Body
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Read all response body
|
||||||
body, err := io.ReadAll(reader)
|
body, err := io.ReadAll(reader)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
qe.Logger.Debug("Error reading HTTP response", map[string]interface{}{"error": err.Error()})
|
|
||||||
return fmt.Errorf("error reading HTTP response: %w", err)
|
return fmt.Errorf("error reading HTTP response: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Unmarshal response
|
||||||
err = json.Unmarshal(body, &queryResult)
|
err = json.Unmarshal(body, &queryResult)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
qe.Logger.Debug("Error unmarshalling HTTP response", map[string]interface{}{"error": err.Error()})
|
|
||||||
return fmt.Errorf("error unmarshalling HTTP response: %w", err)
|
return fmt.Errorf("error unmarshalling HTTP response: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
retry.OnRetry(func(n uint, err error) {
|
retry.OnRetry(func(n uint, err error) {
|
||||||
qe.Logger.Warning("Retrying query", map[string]interface{}{"error": err.Error(), "attempt": n + 1})
|
qe.Logger.Warning(&libpack_logger.LogMessage{
|
||||||
|
Message: "Retrying query",
|
||||||
|
Pairs: map[string]interface{}{"error": err.Error(), "attempt": n + 1},
|
||||||
|
})
|
||||||
}),
|
}),
|
||||||
retry.Attempts(uint(retriesMax)),
|
retry.Attempts(uint(retriesMax)),
|
||||||
retry.DelayType(retry.BackOffDelay),
|
retry.DelayType(retry.BackOffDelay),
|
||||||
@@ -106,23 +114,36 @@ func (qe *QueryExecutor) executeQuery() ([]byte, error) {
|
|||||||
retry.LastErrorOnly(true),
|
retry.LastErrorOnly(true),
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
qe.Logger.Debug("Error executing HTTP request", map[string]interface{}{"error": err.Error()})
|
qe.Logger.Debug(&libpack_logger.LogMessage{
|
||||||
|
Message: "Error executing HTTP request",
|
||||||
|
Pairs: map[string]interface{}{"error": err.Error()},
|
||||||
|
})
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(queryResult.Errors) > 0 {
|
if len(queryResult.Errors) > 0 {
|
||||||
qe.Logger.Debug("Error executing query", map[string]interface{}{"error": queryResult.Errors})
|
qe.Logger.Debug(&libpack_logger.LogMessage{
|
||||||
|
Message: "Error executing query",
|
||||||
|
Pairs: map[string]interface{}{"error": queryResult.Errors},
|
||||||
|
})
|
||||||
return nil, fmt.Errorf("error executing query: %s", queryResult.Errors)
|
return nil, fmt.Errorf("error executing query: %s", queryResult.Errors)
|
||||||
}
|
}
|
||||||
|
|
||||||
if queryResult.Data == nil {
|
if queryResult.Data == nil {
|
||||||
qe.Logger.Debug("Error executing query", map[string]interface{}{"error": "no data"})
|
qe.Logger.Debug(&libpack_logger.LogMessage{
|
||||||
|
Message: "Error executing query",
|
||||||
|
Pairs: map[string]interface{}{"error": "no data"},
|
||||||
|
})
|
||||||
return nil, errors.New("error executing query: no data")
|
return nil, errors.New("error executing query: no data")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Marshal queryResult.Data
|
||||||
jsonData, err := json.Marshal(queryResult.Data)
|
jsonData, err := json.Marshal(queryResult.Data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
qe.Logger.Debug("Error marshalling query result", map[string]interface{}{"error": err.Error(), "data": queryResult.Data})
|
qe.Logger.Debug(&libpack_logger.LogMessage{
|
||||||
|
Message: "Error marshalling query result",
|
||||||
|
Pairs: map[string]interface{}{"error": err.Error(), "data": queryResult.Data},
|
||||||
|
})
|
||||||
return nil, fmt.Errorf("error marshalling query result: %w. Data: %s", err, queryResult.Data)
|
return nil, fmt.Errorf("error marshalling query result: %w. Data: %s", err, queryResult.Data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,23 +4,21 @@ go 1.21
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/avast/retry-go/v4 v4.6.0
|
github.com/avast/retry-go/v4 v4.6.0
|
||||||
github.com/goccy/go-json v0.10.2
|
github.com/goccy/go-json v0.10.3
|
||||||
github.com/gookit/goutil v0.6.15
|
github.com/goccy/go-reflect v1.2.0
|
||||||
github.com/rs/zerolog v1.32.0
|
github.com/gookit/goutil v0.6.17
|
||||||
github.com/stretchr/testify v1.9.0
|
github.com/stretchr/testify v1.9.0
|
||||||
golang.org/x/net v0.25.0
|
golang.org/x/net v0.32.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
github.com/gookit/color v1.5.4 // indirect
|
github.com/gookit/color v1.5.4 // indirect
|
||||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
|
||||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
|
||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
||||||
golang.org/x/sync v0.7.0 // indirect
|
golang.org/x/sync v0.10.0 // indirect
|
||||||
golang.org/x/sys v0.20.0 // indirect
|
golang.org/x/sys v0.28.0 // indirect
|
||||||
golang.org/x/term v0.20.0 // indirect
|
golang.org/x/term v0.27.0 // indirect
|
||||||
golang.org/x/text v0.15.0 // indirect
|
golang.org/x/text v0.21.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,46 +1,33 @@
|
|||||||
github.com/avast/retry-go/v4 v4.6.0 h1:K9xNA+KeB8HHc2aWFuLb25Offp+0iVRXEvFx8IinRJA=
|
github.com/avast/retry-go/v4 v4.6.0 h1:K9xNA+KeB8HHc2aWFuLb25Offp+0iVRXEvFx8IinRJA=
|
||||||
github.com/avast/retry-go/v4 v4.6.0/go.mod h1:gvWlPhBVsvBbLkVGDg/KwvBv0bEkCOLRRSHKIr2PyOE=
|
github.com/avast/retry-go/v4 v4.6.0/go.mod h1:gvWlPhBVsvBbLkVGDg/KwvBv0bEkCOLRRSHKIr2PyOE=
|
||||||
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
|
||||||
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
|
||||||
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
github.com/goccy/go-reflect v1.2.0 h1:O0T8rZCuNmGXewnATuKYnkL0xm6o8UNOJZd/gOkb9ms=
|
||||||
|
github.com/goccy/go-reflect v1.2.0/go.mod h1:n0oYZn8VcV2CkWTxi8B9QjkCoq6GTtCEdfmR66YhFtE=
|
||||||
github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
|
github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
|
||||||
github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
|
github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
|
||||||
github.com/gookit/goutil v0.6.15 h1:mMQ0ElojNZoyPD0eVROk5QXJPh2uKR4g06slgPDF5Jo=
|
github.com/gookit/goutil v0.6.17 h1:SxmbDz2sn2V+O+xJjJhJT/sq1/kQh6rCJ7vLBiRPZjI=
|
||||||
github.com/gookit/goutil v0.6.15/go.mod h1:qdKdYEHQdEtyH+4fNdQNZfJHhI0jUZzHxQVAV3DaMDY=
|
github.com/gookit/goutil v0.6.17/go.mod h1:rSw1LchE1I3TDWITZvefoAC9tS09SFu3lHXLCV7EaEY=
|
||||||
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
|
|
||||||
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
|
|
||||||
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
|
||||||
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
|
||||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
|
||||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
|
||||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
|
|
||||||
github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
|
|
||||||
github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
|
|
||||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
|
||||||
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
|
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
|
||||||
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
|
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
|
||||||
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
|
golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
|
||||||
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
|
||||||
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
|
||||||
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
|
||||||
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
|
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
|
||||||
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
|
||||||
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
|
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
|
||||||
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
|
|
||||||
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
|
|
||||||
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
|
|||||||
+14
-5
@@ -1,13 +1,15 @@
|
|||||||
package gql
|
package gql
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"crypto/md5"
|
||||||
|
"encoding/hex"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/goccy/go-json"
|
"github.com/goccy/go-json"
|
||||||
"github.com/gookit/goutil/strutil"
|
libpack_logger "github.com/lukaszraczylo/go-simple-graphql/logging"
|
||||||
)
|
)
|
||||||
|
|
||||||
func searchForKeysInMapStringInterface(msi map[string]interface{}, key string) (value any) {
|
func searchForKeysInMapStringInterface(msi map[string]interface{}, key string) interface{} {
|
||||||
if msi == nil {
|
if msi == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -15,7 +17,8 @@ func searchForKeysInMapStringInterface(msi map[string]interface{}, key string) (
|
|||||||
}
|
}
|
||||||
|
|
||||||
func calculateHash(query *Query) string {
|
func calculateHash(query *Query) string {
|
||||||
return strutil.Md5(query.JsonQuery)
|
hash := md5.Sum(query.JsonQuery)
|
||||||
|
return hex.EncodeToString(hash[:])
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *BaseClient) cacheLookup(hash string) []byte {
|
func (b *BaseClient) cacheLookup(hash string) []byte {
|
||||||
@@ -29,7 +32,10 @@ func (b *BaseClient) decodeResponse(response []byte) (any, error) {
|
|||||||
var result map[string]interface{}
|
var result map[string]interface{}
|
||||||
err := json.Unmarshal(response, &result)
|
err := json.Unmarshal(response, &result)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
b.Logger.Error("Can't decode response into mapstring", map[string]interface{}{"error": err.Error()})
|
b.Logger.Error(&libpack_logger.LogMessage{
|
||||||
|
Message: "Can't decode response into mapstring",
|
||||||
|
Pairs: map[string]interface{}{"error": err.Error()},
|
||||||
|
})
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return result, nil
|
return result, nil
|
||||||
@@ -38,7 +44,10 @@ func (b *BaseClient) decodeResponse(response []byte) (any, error) {
|
|||||||
case "byte":
|
case "byte":
|
||||||
return response, nil
|
return response, nil
|
||||||
default:
|
default:
|
||||||
b.Logger.Error("Can't decode response;", map[string]interface{}{"error": "unknown response type"})
|
b.Logger.Error(&libpack_logger.LogMessage{
|
||||||
|
Message: "Can't decode response",
|
||||||
|
Pairs: map[string]interface{}{"error": "unknown response type"},
|
||||||
|
})
|
||||||
return nil, fmt.Errorf("Can't decode response - unknown response type specified")
|
return nil, fmt.Errorf("Can't decode response - unknown response type specified")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -1,8 +1,9 @@
|
|||||||
package gql
|
package gql
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"reflect"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/goccy/go-reflect"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (suite *Tests) Test_searchForKeysInMapStringInterface() {
|
func (suite *Tests) Test_searchForKeysInMapStringInterface() {
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
libpack_logger "github.com/lukaszraczylo/go-simple-graphql/logging"
|
||||||
"golang.org/x/net/http2"
|
"golang.org/x/net/http2"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -28,7 +29,10 @@ func (b *BaseClient) createHttpClient() (http_client *http.Client) {
|
|||||||
return http.ErrUseLastResponse
|
return http.ErrUseLastResponse
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
b.Logger.Debug("Using HTTP/1.1 over http", nil)
|
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||||
|
Message: "Using HTTP/1.1 over http",
|
||||||
|
Pairs: nil,
|
||||||
|
})
|
||||||
} else if strings.HasPrefix(b.endpoint, "https://") {
|
} else if strings.HasPrefix(b.endpoint, "https://") {
|
||||||
tlsClientConfig := &tls.Config{}
|
tlsClientConfig := &tls.Config{}
|
||||||
if strings.HasPrefix(b.endpoint, "https://") {
|
if strings.HasPrefix(b.endpoint, "https://") {
|
||||||
@@ -46,9 +50,14 @@ func (b *BaseClient) createHttpClient() (http_client *http.Client) {
|
|||||||
return http.ErrUseLastResponse
|
return http.ErrUseLastResponse
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
b.Logger.Debug("Using HTTP/2 over https", nil)
|
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||||
|
Message: "Using HTTP/2 over https",
|
||||||
|
Pairs: nil,
|
||||||
|
})
|
||||||
} else {
|
} else {
|
||||||
b.Logger.Critical("Invalid endpoint - neither http or https", nil)
|
b.Logger.Critical(&libpack_logger.LogMessage{
|
||||||
|
Message: "Invalid endpoint - neither http or https",
|
||||||
|
})
|
||||||
}
|
}
|
||||||
return http_client
|
return http_client
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,204 @@
|
|||||||
|
package libpack_logger
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"flag"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/goccy/go-json"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
_ = iota
|
||||||
|
LEVEL_DEBUG
|
||||||
|
LEVEL_INFO
|
||||||
|
LEVEL_WARN
|
||||||
|
LEVEL_ERROR
|
||||||
|
LEVEL_FATAL
|
||||||
|
)
|
||||||
|
|
||||||
|
var LevelNames = [...]string{
|
||||||
|
"none",
|
||||||
|
"debug",
|
||||||
|
"info",
|
||||||
|
"warn",
|
||||||
|
"error",
|
||||||
|
"fatal",
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
defaultFormat = time.RFC3339
|
||||||
|
defaultMinLevel = LEVEL_INFO
|
||||||
|
defaultShowCaller = false
|
||||||
|
)
|
||||||
|
|
||||||
|
var defaultOutput = os.Stdout
|
||||||
|
|
||||||
|
type Logger struct {
|
||||||
|
output io.Writer
|
||||||
|
format string
|
||||||
|
minLogLevel int
|
||||||
|
showCaller bool
|
||||||
|
}
|
||||||
|
|
||||||
|
type LogMessage struct {
|
||||||
|
output io.Writer
|
||||||
|
Pairs map[string]any
|
||||||
|
Message string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *LogMessage) String() string {
|
||||||
|
return m.Message
|
||||||
|
}
|
||||||
|
|
||||||
|
var fieldNames = map[string]string{
|
||||||
|
"timestamp": "timestamp",
|
||||||
|
"level": "level",
|
||||||
|
"message": "message",
|
||||||
|
}
|
||||||
|
|
||||||
|
func New() *Logger {
|
||||||
|
return &Logger{
|
||||||
|
format: defaultFormat,
|
||||||
|
minLogLevel: defaultMinLevel,
|
||||||
|
output: defaultOutput,
|
||||||
|
showCaller: defaultShowCaller,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) SetOutput(output io.Writer) *Logger {
|
||||||
|
l.output = output
|
||||||
|
return l
|
||||||
|
}
|
||||||
|
|
||||||
|
var bufferPool = sync.Pool{
|
||||||
|
New: func() any {
|
||||||
|
return new(bytes.Buffer)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var defaultPairs = make(map[string]any)
|
||||||
|
|
||||||
|
func GetLogLevel(level string) int {
|
||||||
|
for i, name := range LevelNames {
|
||||||
|
if name == strings.ToLower(level) {
|
||||||
|
return i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return defaultMinLevel
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) log(level int, m *LogMessage) {
|
||||||
|
if m.Pairs == nil {
|
||||||
|
m.Pairs = defaultPairs
|
||||||
|
}
|
||||||
|
|
||||||
|
m.Pairs[fieldNames["timestamp"]] = time.Now().Format(l.format)
|
||||||
|
m.Pairs[fieldNames["level"]] = LevelNames[level]
|
||||||
|
m.Pairs[fieldNames["message"]] = m.Message
|
||||||
|
|
||||||
|
if l.showCaller {
|
||||||
|
m.Pairs["caller"] = getCaller()
|
||||||
|
}
|
||||||
|
|
||||||
|
buffer := bufferPool.Get().(*bytes.Buffer)
|
||||||
|
defer bufferPool.Put(buffer)
|
||||||
|
buffer.Reset()
|
||||||
|
|
||||||
|
var encoder = json.NewEncoder(buffer)
|
||||||
|
err := encoder.Encode(m.Pairs)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("Error marshalling log message:", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// if not running in test - use stderr and stdout, otherwise - use logger's output setting
|
||||||
|
if flag.Lookup("test.v") != nil {
|
||||||
|
m.output = os.Stdout
|
||||||
|
if level >= LEVEL_ERROR {
|
||||||
|
m.output = os.Stderr
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use logger's output setting instead of os.Stdout or os.Stderr
|
||||||
|
l.output.Write(buffer.Bytes())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) Debug(m *LogMessage) {
|
||||||
|
if l.shouldLog(LEVEL_DEBUG) {
|
||||||
|
l.log(LEVEL_DEBUG, m)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) Info(m *LogMessage) {
|
||||||
|
if l.shouldLog(LEVEL_INFO) {
|
||||||
|
l.log(LEVEL_INFO, m)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) Warn(m *LogMessage) {
|
||||||
|
if l.shouldLog(LEVEL_WARN) {
|
||||||
|
l.log(LEVEL_WARN, m)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) Warning(m *LogMessage) {
|
||||||
|
l.Warn(m)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) Error(m *LogMessage) {
|
||||||
|
if l.shouldLog(LEVEL_ERROR) {
|
||||||
|
l.log(LEVEL_ERROR, m)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) Fatal(m *LogMessage) {
|
||||||
|
if l.shouldLog(LEVEL_FATAL) {
|
||||||
|
l.log(LEVEL_FATAL, m)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) Critical(m *LogMessage) {
|
||||||
|
l.Fatal(m)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) shouldLog(level int) bool {
|
||||||
|
return level >= l.minLogLevel
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) SetFormat(format string) *Logger {
|
||||||
|
l.format = format
|
||||||
|
return l
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) SetMinLogLevel(level int) *Logger {
|
||||||
|
l.minLogLevel = level
|
||||||
|
return l
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) SetFieldName(field, name string) *Logger {
|
||||||
|
fieldNames[field] = name
|
||||||
|
return l
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) SetShowCaller(show bool) *Logger {
|
||||||
|
l.showCaller = show
|
||||||
|
return l
|
||||||
|
}
|
||||||
|
|
||||||
|
func getCaller() string {
|
||||||
|
_, file, line, ok := runtime.Caller(3)
|
||||||
|
if !ok {
|
||||||
|
return "unknown:0"
|
||||||
|
}
|
||||||
|
file = filepath.Base(file)
|
||||||
|
return fmt.Sprintf("%s:%d", file, line)
|
||||||
|
}
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
package libpack_logger
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Benchmark_NewLogger(b *testing.B) {
|
||||||
|
type triggers struct {
|
||||||
|
ModFormat struct {
|
||||||
|
Format string
|
||||||
|
}
|
||||||
|
ModLevel struct {
|
||||||
|
Level int
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
triggers triggers
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "BenchmarkNew",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "BenchmarkNewChangeTimeFormat",
|
||||||
|
triggers: triggers{
|
||||||
|
ModFormat: struct{ Format string }{
|
||||||
|
Format: time.RFC3339Nano,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "BenchmarkNewChangeLogLevel",
|
||||||
|
triggers: triggers{
|
||||||
|
ModLevel: struct{ Level int }{
|
||||||
|
Level: LEVEL_DEBUG,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "BenchmarkNewChangeTimeFormatAndLogLevel",
|
||||||
|
triggers: triggers{
|
||||||
|
ModFormat: struct{ Format string }{
|
||||||
|
Format: time.RFC3339Nano,
|
||||||
|
},
|
||||||
|
ModLevel: struct{ Level int }{
|
||||||
|
Level: LEVEL_DEBUG,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
b.Run(tt.name, func(b *testing.B) {
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
got := New()
|
||||||
|
|
||||||
|
if tt.triggers.ModFormat.Format != "" {
|
||||||
|
got = got.SetFormat(tt.triggers.ModFormat.Format)
|
||||||
|
}
|
||||||
|
|
||||||
|
if tt.triggers.ModLevel.Level != 0 {
|
||||||
|
got = got.SetMinLogLevel(tt.triggers.ModLevel.Level)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Log_Debug(b *testing.B) {
|
||||||
|
output := &bytes.Buffer{}
|
||||||
|
logger := New().SetMinLogLevel(LEVEL_DEBUG).SetOutput(output)
|
||||||
|
msg := &LogMessage{
|
||||||
|
Message: "debug message",
|
||||||
|
Pairs: make(map[string]any),
|
||||||
|
}
|
||||||
|
|
||||||
|
b.ResetTimer()
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
logger.Debug(msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Log_Info(b *testing.B) {
|
||||||
|
output := &bytes.Buffer{}
|
||||||
|
logger := New().SetMinLogLevel(LEVEL_INFO).SetOutput(output)
|
||||||
|
msg := &LogMessage{
|
||||||
|
Message: "info message",
|
||||||
|
Pairs: make(map[string]any),
|
||||||
|
}
|
||||||
|
|
||||||
|
b.ResetTimer()
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
logger.Info(msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Log_Warn(b *testing.B) {
|
||||||
|
output := &bytes.Buffer{}
|
||||||
|
logger := New().SetMinLogLevel(LEVEL_WARN).SetOutput(output)
|
||||||
|
msg := &LogMessage{
|
||||||
|
Message: "warn message",
|
||||||
|
Pairs: make(map[string]any),
|
||||||
|
}
|
||||||
|
|
||||||
|
b.ResetTimer()
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
logger.Warn(msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Log_Error(b *testing.B) {
|
||||||
|
output := &bytes.Buffer{}
|
||||||
|
logger := New().SetMinLogLevel(LEVEL_ERROR).SetOutput(output)
|
||||||
|
msg := &LogMessage{
|
||||||
|
Message: "error message",
|
||||||
|
Pairs: map[string]any{"key": "value"},
|
||||||
|
}
|
||||||
|
|
||||||
|
b.ResetTimer()
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
logger.Error(msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Benchmark_Log_Fatal(b *testing.B) {
|
||||||
|
output := &bytes.Buffer{}
|
||||||
|
logger := New().SetMinLogLevel(LEVEL_FATAL).SetOutput(output)
|
||||||
|
msg := &LogMessage{
|
||||||
|
Message: "fatal message",
|
||||||
|
Pairs: make(map[string]any),
|
||||||
|
}
|
||||||
|
|
||||||
|
b.ResetTimer()
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
logger.Fatal(msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package libpack_logger
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
assertions "github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/suite"
|
||||||
|
)
|
||||||
|
|
||||||
|
type LoggerTestSuite struct {
|
||||||
|
suite.Suite
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
assert *assertions.Assertions
|
||||||
|
)
|
||||||
|
|
||||||
|
func (suite *LoggerTestSuite) BeforeTest(suiteName, testName string) {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *LoggerTestSuite) SetupTest() {
|
||||||
|
assert = assertions.New(suite.T())
|
||||||
|
}
|
||||||
|
|
||||||
|
// TearDownTest is run after each test to clean up
|
||||||
|
func (suite *LoggerTestSuite) TearDownTest() {
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSuite(t *testing.T) {
|
||||||
|
suite.Run(t, new(LoggerTestSuite))
|
||||||
|
}
|
||||||
@@ -0,0 +1,182 @@
|
|||||||
|
package libpack_logger
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/goccy/go-json"
|
||||||
|
"github.com/goccy/go-reflect"
|
||||||
|
)
|
||||||
|
|
||||||
|
func captureStderr(f func()) string {
|
||||||
|
originalStderr := os.Stderr
|
||||||
|
r, w, _ := os.Pipe()
|
||||||
|
os.Stderr = w
|
||||||
|
f()
|
||||||
|
w.Close()
|
||||||
|
var buf bytes.Buffer
|
||||||
|
buf.ReadFrom(r)
|
||||||
|
os.Stderr = originalStderr
|
||||||
|
return buf.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func captureStdOut(f func()) string {
|
||||||
|
originalStdout := os.Stdout
|
||||||
|
r, w, _ := os.Pipe()
|
||||||
|
os.Stdout = w
|
||||||
|
f()
|
||||||
|
w.Close()
|
||||||
|
var buf bytes.Buffer
|
||||||
|
buf.ReadFrom(r)
|
||||||
|
os.Stdout = originalStdout
|
||||||
|
return buf.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *LoggerTestSuite) Test_LogMessageString() {
|
||||||
|
msg := &LogMessage{
|
||||||
|
Message: "test message",
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.Equal("test message", msg.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
func callLoggerMethod(logger *Logger, methodName string, message *LogMessage) {
|
||||||
|
// Get the method by name using reflection
|
||||||
|
method := reflect.ValueOf(logger).MethodByName(methodName)
|
||||||
|
if method.IsValid() {
|
||||||
|
// Call the method with the message as an argument
|
||||||
|
method.Call([]reflect.Value{reflect.ValueOf(message)})
|
||||||
|
} else {
|
||||||
|
fmt.Printf("Method %s does not exist on Logger\n", methodName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *LoggerTestSuite) Test_LogsLevelsPrint() {
|
||||||
|
output := &bytes.Buffer{}
|
||||||
|
logger := New().SetOutput(output)
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
pairs map[string]any
|
||||||
|
name string
|
||||||
|
method string
|
||||||
|
message string
|
||||||
|
loggerMinLevel int
|
||||||
|
messageLogLevel int
|
||||||
|
wantOutput bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "Log: Debug, Level: Debug - no pairs",
|
||||||
|
method: "Debug",
|
||||||
|
loggerMinLevel: LEVEL_DEBUG,
|
||||||
|
messageLogLevel: LEVEL_DEBUG,
|
||||||
|
message: "debug message",
|
||||||
|
wantOutput: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Log: Info, Level: Info - one pair",
|
||||||
|
method: "Info",
|
||||||
|
loggerMinLevel: LEVEL_INFO,
|
||||||
|
messageLogLevel: LEVEL_INFO,
|
||||||
|
message: "info message",
|
||||||
|
pairs: map[string]any{
|
||||||
|
"key": "value",
|
||||||
|
},
|
||||||
|
wantOutput: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Log: Info, Level: Warn - with pairs",
|
||||||
|
method: "Info",
|
||||||
|
loggerMinLevel: LEVEL_WARN,
|
||||||
|
messageLogLevel: LEVEL_INFO,
|
||||||
|
message: "warn message",
|
||||||
|
pairs: map[string]any{
|
||||||
|
"key1": "value1",
|
||||||
|
"key2": "value2",
|
||||||
|
},
|
||||||
|
wantOutput: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Log: Warn, Level: Info - with 500 pairs",
|
||||||
|
method: "Warn",
|
||||||
|
loggerMinLevel: LEVEL_INFO,
|
||||||
|
messageLogLevel: LEVEL_WARN,
|
||||||
|
message: "warn message with 500 pairs",
|
||||||
|
pairs: func() map[string]any {
|
||||||
|
pairs := make(map[string]any)
|
||||||
|
for i := 0; i < 500; i++ {
|
||||||
|
pairs[fmt.Sprintf("key%d", i)] = fmt.Sprintf("value%d", i)
|
||||||
|
}
|
||||||
|
return pairs
|
||||||
|
}(),
|
||||||
|
wantOutput: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
suite.T().Run(tt.name, func(t *testing.T) {
|
||||||
|
msg := &LogMessage{
|
||||||
|
Message: tt.message,
|
||||||
|
Pairs: tt.pairs,
|
||||||
|
}
|
||||||
|
output.Reset()
|
||||||
|
|
||||||
|
// Set logger's minimum log level
|
||||||
|
logger.SetMinLogLevel(tt.loggerMinLevel)
|
||||||
|
fmt.Println("Logger min log level:", LevelNames[logger.minLogLevel])
|
||||||
|
|
||||||
|
// Call the logging method
|
||||||
|
callLoggerMethod(logger, tt.method, msg)
|
||||||
|
|
||||||
|
logOutput := output.String()
|
||||||
|
fmt.Println("Output:", logOutput)
|
||||||
|
|
||||||
|
if tt.wantOutput {
|
||||||
|
var loggedMessage map[string]any
|
||||||
|
err := json.Unmarshal([]byte(logOutput), &loggedMessage)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Error unmarshalling log message: %v\nLog output: %s", err, logOutput)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !containsLogMessage(logOutput, tt.message) {
|
||||||
|
t.Errorf("Expected log message %q, but got %q", tt.message, logOutput)
|
||||||
|
}
|
||||||
|
assert.Equal(LevelNames[tt.messageLogLevel], loggedMessage["level"])
|
||||||
|
if tt.pairs != nil {
|
||||||
|
for k, v := range tt.pairs {
|
||||||
|
assert.Equal(v, loggedMessage[k])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
assert.Equal("", logOutput)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func containsLogMessage(logOutput, expectedMessage string) bool {
|
||||||
|
return bytes.Contains([]byte(logOutput), []byte(expectedMessage))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *LoggerTestSuite) Test_SetFormat() {
|
||||||
|
logger := New().SetFormat(time.RFC3339Nano)
|
||||||
|
|
||||||
|
assert.Equal(time.RFC3339Nano, logger.format)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *LoggerTestSuite) Test_SetMinLogLevel() {
|
||||||
|
logger := New().SetMinLogLevel(LEVEL_DEBUG)
|
||||||
|
|
||||||
|
assert.Equal(LEVEL_DEBUG, logger.minLogLevel)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *LoggerTestSuite) Test_ShouldLog() {
|
||||||
|
logger := New().SetMinLogLevel(LEVEL_WARN)
|
||||||
|
|
||||||
|
assert.True(logger.shouldLog(LEVEL_WARN))
|
||||||
|
assert.True(logger.shouldLog(LEVEL_ERROR))
|
||||||
|
assert.False(logger.shouldLog(LEVEL_INFO))
|
||||||
|
assert.False(logger.shouldLog(LEVEL_DEBUG))
|
||||||
|
}
|
||||||
@@ -1,120 +0,0 @@
|
|||||||
package libpack_logging
|
|
||||||
|
|
||||||
import (
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/gookit/goutil/envutil"
|
|
||||||
"github.com/rs/zerolog"
|
|
||||||
)
|
|
||||||
|
|
||||||
type LogConfig struct {
|
|
||||||
logger zerolog.Logger
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
baseLogger zerolog.Logger
|
|
||||||
|
|
||||||
eventPool = sync.Pool{
|
|
||||||
New: func() interface{} {
|
|
||||||
return new(zerolog.Event)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
fieldMapPool = sync.Pool{
|
|
||||||
New: func() interface{} {
|
|
||||||
return make(map[string]interface{})
|
|
||||||
},
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
zerolog.TimeFieldFormat = time.RFC3339
|
|
||||||
zerolog.MessageFieldName = "short_message"
|
|
||||||
zerolog.TimestampFieldName = "timestamp"
|
|
||||||
zerolog.LevelFieldName = "level"
|
|
||||||
zerolog.LevelFatalValue = "critical"
|
|
||||||
|
|
||||||
baseLogger = zerolog.New(os.Stdout).With().Timestamp().Logger()
|
|
||||||
|
|
||||||
switch logLevel := envutil.Getenv("LOG_LEVEL", "info"); logLevel {
|
|
||||||
case "debug":
|
|
||||||
baseLogger = baseLogger.Level(zerolog.DebugLevel)
|
|
||||||
case "warn":
|
|
||||||
baseLogger = baseLogger.Level(zerolog.WarnLevel)
|
|
||||||
case "error":
|
|
||||||
baseLogger = baseLogger.Level(zerolog.ErrorLevel)
|
|
||||||
default:
|
|
||||||
baseLogger = baseLogger.Level(zerolog.InfoLevel)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewLogger() *LogConfig {
|
|
||||||
return &LogConfig{logger: baseLogger}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (lw *LogConfig) log(w io.Writer, level zerolog.Level, message string, fields map[string]interface{}) {
|
|
||||||
logger := lw.logger.Output(w)
|
|
||||||
event := logger.WithLevel(level).CallerSkipFrame(3)
|
|
||||||
|
|
||||||
for k, val := range fields {
|
|
||||||
switch v := val.(type) {
|
|
||||||
case string:
|
|
||||||
event = event.Str(k, v)
|
|
||||||
case int:
|
|
||||||
event = event.Int(k, v)
|
|
||||||
case float64:
|
|
||||||
event = event.Float64(k, v)
|
|
||||||
default:
|
|
||||||
event = event.Interface(k, val)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
event.Msg(message)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (lw *LogConfig) logWithLevel(level zerolog.Level, message string, fields map[string]interface{}) {
|
|
||||||
if lw.logger.GetLevel() <= level {
|
|
||||||
w := os.Stdout
|
|
||||||
if level >= zerolog.ErrorLevel {
|
|
||||||
w = os.Stderr
|
|
||||||
}
|
|
||||||
lw.log(w, level, message, fields)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (lw *LogConfig) Debug(message string, fields map[string]interface{}) {
|
|
||||||
lw.logWithLevel(zerolog.DebugLevel, message, fields)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (lw *LogConfig) Info(message string, fields map[string]interface{}) {
|
|
||||||
lw.logWithLevel(zerolog.InfoLevel, message, fields)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (lw *LogConfig) Warning(message string, fields map[string]interface{}) {
|
|
||||||
lw.logWithLevel(zerolog.WarnLevel, message, fields)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (lw *LogConfig) Error(message string, fields map[string]interface{}) {
|
|
||||||
lw.logWithLevel(zerolog.ErrorLevel, message, fields)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (lw *LogConfig) Critical(message string, fields map[string]interface{}) {
|
|
||||||
lw.logWithLevel(zerolog.FatalLevel, message, fields)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper function to get a new fields map from the pool
|
|
||||||
func getFieldsMap() map[string]interface{} {
|
|
||||||
return fieldMapPool.Get().(map[string]interface{})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper function to put a used fields map back into the pool
|
|
||||||
func putFieldsMap(fields map[string]interface{}) {
|
|
||||||
for k := range fields {
|
|
||||||
delete(fields, k)
|
|
||||||
}
|
|
||||||
fieldMapPool.Put(fields)
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
package libpack_logging
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func BenchmarkNewLogger(b *testing.B) {
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
NewLogger()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkInfoLog(b *testing.B) {
|
|
||||||
oldEnv := os.Getenv("LOG_LEVEL")
|
|
||||||
os.Setenv("LOG_LEVEL", "info")
|
|
||||||
oldStdout := os.Stdout
|
|
||||||
oldStderr := os.Stderr
|
|
||||||
os.Stdout, _ = os.Open(os.DevNull)
|
|
||||||
os.Stderr, _ = os.Open(os.DevNull)
|
|
||||||
defer func() {
|
|
||||||
os.Stdout = oldStdout
|
|
||||||
os.Stderr = oldStderr
|
|
||||||
os.Setenv("LOG_LEVEL", oldEnv)
|
|
||||||
}()
|
|
||||||
|
|
||||||
testsLogger := NewLogger()
|
|
||||||
b.ResetTimer()
|
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
testsLogger.Info("test", map[string]interface{}{"test": "test"})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package gql
|
package gql
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/gookit/goutil/envutil"
|
"github.com/gookit/goutil/envutil"
|
||||||
@@ -12,7 +13,7 @@ func NewConnection() (b *BaseClient) {
|
|||||||
b = &BaseClient{
|
b = &BaseClient{
|
||||||
endpoint: envutil.Getenv("GRAPHQL_ENDPOINT", "https://api.github.com/graphql"),
|
endpoint: envutil.Getenv("GRAPHQL_ENDPOINT", "https://api.github.com/graphql"),
|
||||||
responseType: envutil.Getenv("GRAPHQL_OUTPUT", "string"),
|
responseType: envutil.Getenv("GRAPHQL_OUTPUT", "string"),
|
||||||
Logger: logging.NewLogger(),
|
Logger: logging.New(),
|
||||||
cache: cache.New(time.Duration(envutil.GetInt("GRAPHQL_CACHE_TTL", 5)) * time.Second),
|
cache: cache.New(time.Duration(envutil.GetInt("GRAPHQL_CACHE_TTL", 5)) * time.Second),
|
||||||
cache_global: envutil.GetBool("GRAPHQL_CACHE_ENABLED", false),
|
cache_global: envutil.GetBool("GRAPHQL_CACHE_ENABLED", false),
|
||||||
retries_enable: envutil.GetBool("GRAPHQL_RETRIES_ENABLE", false),
|
retries_enable: envutil.GetBool("GRAPHQL_RETRIES_ENABLE", false),
|
||||||
@@ -20,7 +21,11 @@ func NewConnection() (b *BaseClient) {
|
|||||||
retries_number: envutil.GetInt("GRAPHQL_RETRIES_NUMBER", 3),
|
retries_number: envutil.GetInt("GRAPHQL_RETRIES_NUMBER", 3),
|
||||||
}
|
}
|
||||||
b.client = b.createHttpClient()
|
b.client = b.createHttpClient()
|
||||||
b.Logger.Debug("Created new GraphQL client connection", map[string]interface{}{"values": b})
|
b.Logger.Debug(&logging.LogMessage{
|
||||||
|
Message: "Created new GraphQL client connection",
|
||||||
|
Pairs: map[string]interface{}{
|
||||||
|
"values": b,
|
||||||
|
}})
|
||||||
return b
|
return b
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,3 +39,7 @@ func (b *BaseClient) SetOutput(responseType string) {
|
|||||||
// TODO: implement
|
// TODO: implement
|
||||||
b.responseType = responseType
|
b.responseType = responseType
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *BaseClient) SetHTTPClient(client *http.Client) {
|
||||||
|
b.client = client
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
// mock_server.go
|
||||||
|
package gql
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"io/ioutil"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"golang.org/x/net/http2"
|
||||||
|
)
|
||||||
|
|
||||||
|
func StartMockServer() *httptest.Server {
|
||||||
|
// Create your handler
|
||||||
|
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// Your existing handler code
|
||||||
|
bodyBytes, err := ioutil.ReadAll(r.Body)
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var req struct {
|
||||||
|
Variables map[string]interface{} `json:"variables"`
|
||||||
|
Query string `json:"query"`
|
||||||
|
}
|
||||||
|
err = json.Unmarshal(bodyBytes, &req)
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Simple validation to check for unbalanced braces as a syntax error
|
||||||
|
if !strings.HasPrefix(strings.TrimSpace(req.Query), "query") || !strings.HasSuffix(strings.TrimSpace(req.Query), "}") {
|
||||||
|
resp := []byte(`{"errors":[{"message":"Syntax Error: Invalid query"}]}`)
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(http.StatusBadRequest)
|
||||||
|
w.Write(resp)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var resp []byte
|
||||||
|
if strings.Contains(req.Query, "viewer") {
|
||||||
|
resp = []byte(`{"data":{"viewer":{"login":"mockuser"}}}`)
|
||||||
|
} else if strings.Contains(req.Query, "dragons") {
|
||||||
|
resp = []byte(`{"data":{"dragons":[{"name":"Mock Dragon 1"},{"name":"Mock Dragon 2"}]}}`)
|
||||||
|
} else {
|
||||||
|
resp = []byte(`{"errors":[{"message":"Unknown query"}]}`)
|
||||||
|
w.WriteHeader(http.StatusBadRequest)
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.Write(resp)
|
||||||
|
})
|
||||||
|
|
||||||
|
// Create an unstarted server
|
||||||
|
server := httptest.NewUnstartedServer(handler)
|
||||||
|
|
||||||
|
// Configure the server to support HTTP/2
|
||||||
|
http2.ConfigureServer(server.Config, &http2.Server{})
|
||||||
|
server.TLS = server.Config.TLSConfig
|
||||||
|
|
||||||
|
// Start the server with TLS
|
||||||
|
server.StartTLS()
|
||||||
|
return server
|
||||||
|
}
|
||||||
@@ -1,32 +1,38 @@
|
|||||||
package gql
|
package gql
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
"sync"
|
|
||||||
|
|
||||||
"github.com/goccy/go-json"
|
"github.com/goccy/go-json"
|
||||||
"github.com/gookit/goutil"
|
"github.com/gookit/goutil"
|
||||||
"github.com/gookit/goutil/strutil"
|
"github.com/gookit/goutil/strutil"
|
||||||
|
libpack_logger "github.com/lukaszraczylo/go-simple-graphql/logging"
|
||||||
)
|
)
|
||||||
|
|
||||||
var jsonBufferPool = sync.Pool{
|
|
||||||
New: func() interface{} {
|
|
||||||
return new([]byte)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *BaseClient) convertToJSON(v any) []byte {
|
func (b *BaseClient) convertToJSON(v any) []byte {
|
||||||
jsonBuffer := jsonBufferPool.Get().(*[]byte)
|
// Reuse buffer to reduce allocations
|
||||||
defer jsonBufferPool.Put(jsonBuffer)
|
buf := bufferPool.Get().(*bytes.Buffer)
|
||||||
|
defer bufferPool.Put(buf)
|
||||||
|
buf.Reset()
|
||||||
|
|
||||||
*jsonBuffer = (*jsonBuffer)[:0]
|
// Use json.Marshal to avoid adding extra newline
|
||||||
jsonData, err := json.Marshal(v)
|
jsonData, err := json.Marshal(v)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
b.Logger.Error("Can't convert to JSON", map[string]interface{}{"error": err.Error()})
|
b.Logger.Error(&libpack_logger.LogMessage{
|
||||||
|
Message: "Can't convert to JSON",
|
||||||
|
Pairs: map[string]interface{}{"error": err.Error()},
|
||||||
|
})
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
*jsonBuffer = append(*jsonBuffer, jsonData...)
|
|
||||||
return *jsonBuffer
|
// Copy the bytes to the buffer
|
||||||
|
buf.Write(jsonData)
|
||||||
|
|
||||||
|
// Copy the bytes to a new slice before returning
|
||||||
|
result := make([]byte, buf.Len())
|
||||||
|
copy(result, buf.Bytes())
|
||||||
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *BaseClient) compileQuery(queryPartials ...any) *Query {
|
func (b *BaseClient) compileQuery(queryPartials ...any) *Query {
|
||||||
@@ -42,7 +48,10 @@ func (b *BaseClient) compileQuery(queryPartials ...any) *Query {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if query == "" {
|
if query == "" {
|
||||||
b.Logger.Error("Can't compile query", map[string]interface{}{"error": "query is empty"})
|
b.Logger.Error(&libpack_logger.LogMessage{
|
||||||
|
Message: "Can't compile query",
|
||||||
|
Pairs: map[string]interface{}{"error": "query is empty"},
|
||||||
|
})
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,10 +66,16 @@ func (b *BaseClient) compileQuery(queryPartials ...any) *Query {
|
|||||||
func (b *BaseClient) Query(query string, variables map[string]interface{}, headers map[string]interface{}) (any, error) {
|
func (b *BaseClient) Query(query string, variables map[string]interface{}, headers map[string]interface{}) (any, error) {
|
||||||
compiledQuery := b.compileQuery(query, variables)
|
compiledQuery := b.compileQuery(query, variables)
|
||||||
if compiledQuery.JsonQuery == nil {
|
if compiledQuery.JsonQuery == nil {
|
||||||
b.Logger.Error("Can't compile query", map[string]interface{}{"error": "query is empty"})
|
b.Logger.Error(&libpack_logger.LogMessage{
|
||||||
|
Message: "Can't compile query",
|
||||||
|
Pairs: map[string]interface{}{"error": "query is empty"},
|
||||||
|
})
|
||||||
return nil, fmt.Errorf("can't compile query")
|
return nil, fmt.Errorf("can't compile query")
|
||||||
}
|
}
|
||||||
b.Logger.Debug("Compiled query", map[string]interface{}{"query": compiledQuery})
|
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||||
|
Message: "Compiled query",
|
||||||
|
Pairs: map[string]interface{}{"query": compiledQuery},
|
||||||
|
})
|
||||||
|
|
||||||
enableCache, enableRetries, recompileRequired := compiledQuery.parseHeadersAndVariables(headers)
|
enableCache, enableRetries, recompileRequired := compiledQuery.parseHeadersAndVariables(headers)
|
||||||
if recompileRequired {
|
if recompileRequired {
|
||||||
@@ -69,17 +84,22 @@ func (b *BaseClient) Query(query string, variables map[string]interface{}, heade
|
|||||||
|
|
||||||
var queryHash string
|
var queryHash string
|
||||||
if (enableCache || b.cache_global) && strutil.HasPrefix(compiledQuery.Query, "query") {
|
if (enableCache || b.cache_global) && strutil.HasPrefix(compiledQuery.Query, "query") {
|
||||||
b.Logger.Debug("Cache enabled", nil)
|
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||||
|
Message: "Cache enabled",
|
||||||
|
Pairs: nil,
|
||||||
|
})
|
||||||
queryHash = calculateHash(compiledQuery)
|
queryHash = calculateHash(compiledQuery)
|
||||||
if cachedValue := b.cacheLookup(queryHash); cachedValue != nil {
|
if cachedValue := b.cacheLookup(queryHash); cachedValue != nil {
|
||||||
b.Logger.Debug("Cache hit", map[string]interface{}{"query": compiledQuery})
|
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||||
return cachedValue, nil
|
Message: "Cache hit",
|
||||||
|
Pairs: map[string]interface{}{"query": compiledQuery},
|
||||||
|
})
|
||||||
|
return b.decodeResponse(cachedValue)
|
||||||
}
|
}
|
||||||
b.Logger.Debug("Cache miss", map[string]interface{}{"query": compiledQuery})
|
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||||
}
|
Message: "Cache miss",
|
||||||
|
Pairs: map[string]interface{}{"query": compiledQuery},
|
||||||
if enableRetries || b.retries_enable {
|
})
|
||||||
b.Logger.Debug("Retries enabled", nil)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
q := &QueryExecutor{
|
q := &QueryExecutor{
|
||||||
@@ -97,11 +117,14 @@ func (b *BaseClient) Query(query string, variables map[string]interface{}, heade
|
|||||||
|
|
||||||
rv, err := q.executeQuery()
|
rv, err := q.executeQuery()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
b.Logger.Error("Error executing query", map[string]interface{}{"error": err.Error()})
|
b.Logger.Error(&libpack_logger.LogMessage{
|
||||||
|
Message: "Error executing query",
|
||||||
|
Pairs: map[string]interface{}{"error": err.Error()},
|
||||||
|
})
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return q.decodeResponse(rv)
|
return b.decodeResponse(rv)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *Query) parseHeadersAndVariables(headers map[string]interface{}) (enableCache, enableRetries, recompileRequired bool) {
|
func (q *Query) parseHeadersAndVariables(headers map[string]interface{}) (enableCache, enableRetries, recompileRequired bool) {
|
||||||
|
|||||||
+19
-2
@@ -36,10 +36,15 @@ func Benchmark_convertToJson(bn *testing.B) {
|
|||||||
b.convertToJSON(query)
|
b.convertToJSON(query)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func Benchmark_Query(bn *testing.B) {
|
func Benchmark_Query(bn *testing.B) {
|
||||||
|
mockServer := StartMockServer()
|
||||||
|
bn.Cleanup(func() {
|
||||||
|
mockServer.Close()
|
||||||
|
})
|
||||||
|
|
||||||
b := NewConnection()
|
b := NewConnection()
|
||||||
query := `query { viewer { login } }`
|
b.SetEndpoint(mockServer.URL)
|
||||||
|
query := "query { viewer { login } }"
|
||||||
variables := map[string]interface{}{
|
variables := map[string]interface{}{
|
||||||
"var1": "value1",
|
"var1": "value1",
|
||||||
}
|
}
|
||||||
@@ -54,7 +59,13 @@ func Benchmark_Query(bn *testing.B) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func Benchmark_QueryNoCacheNoRetry(bn *testing.B) {
|
func Benchmark_QueryNoCacheNoRetry(bn *testing.B) {
|
||||||
|
mockServer := StartMockServer()
|
||||||
|
bn.Cleanup(func() {
|
||||||
|
mockServer.Close()
|
||||||
|
})
|
||||||
|
|
||||||
b := NewConnection()
|
b := NewConnection()
|
||||||
|
b.SetEndpoint(mockServer.URL)
|
||||||
query := `query { viewer { login } }`
|
query := `query { viewer { login } }`
|
||||||
variables := map[string]interface{}{
|
variables := map[string]interface{}{
|
||||||
"var1": "value1",
|
"var1": "value1",
|
||||||
@@ -69,7 +80,13 @@ func Benchmark_QueryNoCacheNoRetry(bn *testing.B) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func Benchmark_QueryWithEmptyVariables(bn *testing.B) {
|
func Benchmark_QueryWithEmptyVariables(bn *testing.B) {
|
||||||
|
mockServer := StartMockServer()
|
||||||
|
bn.Cleanup(func() {
|
||||||
|
mockServer.Close()
|
||||||
|
})
|
||||||
|
|
||||||
b := NewConnection()
|
b := NewConnection()
|
||||||
|
b.SetEndpoint(mockServer.URL)
|
||||||
query := `query { viewer { login } }`
|
query := `query { viewer { login } }`
|
||||||
headers := map[string]interface{}{
|
headers := map[string]interface{}{
|
||||||
"Authorization": "Bearer token",
|
"Authorization": "Bearer token",
|
||||||
|
|||||||
+22
-156
@@ -1,8 +1,9 @@
|
|||||||
package gql
|
package gql
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"reflect"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/goccy/go-reflect"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (suite *Tests) TestBaseClient_convertToJSON() {
|
func (suite *Tests) TestBaseClient_convertToJSON() {
|
||||||
@@ -115,182 +116,48 @@ func (suite *Tests) TestBaseClient_Query() {
|
|||||||
args args
|
args args
|
||||||
wantReturned_value any
|
wantReturned_value any
|
||||||
name string
|
name string
|
||||||
graphQLServer string
|
|
||||||
wantType string
|
wantType string
|
||||||
wantErr bool
|
wantErr bool
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "TestBaseClient_Query_spacex_working",
|
name: "TestBaseClient_Query_viewer",
|
||||||
graphQLServer: "https://spacex-production.up.railway.app/",
|
|
||||||
args: args{
|
args: args{
|
||||||
query: `query Dragons {
|
query: "query { viewer { login } }",
|
||||||
dragons {
|
|
||||||
name
|
|
||||||
}
|
|
||||||
}`,
|
|
||||||
variables: nil,
|
variables: nil,
|
||||||
headers: map[string]interface{}{
|
headers: map[string]interface{}{
|
||||||
"x-apollo-operation-name": "Dragons/github.com/lukaszraczylo/go-simple-graphql",
|
"x-apollo-operation-name": "ViewerQuery",
|
||||||
"content-type": "application/json",
|
"content-type": "application/json",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
wantReturned_value: string(`{"dragons":[{"name":"Dragon 1"},{"name":"Dragon 2"}]}`),
|
wantReturned_value: `{"viewer":{"login":"mockuser"}}`, // Adjusted expected value
|
||||||
wantErr: false,
|
wantErr: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "TestBaseClient_Query_spacex_invalid_query",
|
name: "TestBaseClient_Query_dragons",
|
||||||
graphQLServer: "https://spacex-production.up.railway.app/",
|
|
||||||
args: args{
|
args: args{
|
||||||
query: `query Dragons {
|
query: `query Dragons {
|
||||||
dragons {
|
dragons {
|
||||||
name
|
name
|
||||||
}
|
}
|
||||||
`,
|
}`,
|
||||||
variables: nil,
|
variables: nil,
|
||||||
headers: map[string]interface{}{
|
headers: map[string]interface{}{
|
||||||
"x-apollo-operation-name": "Dragons/github.com/lukaszraczylo/go-simple-graphql",
|
"x-apollo-operation-name": "DragonsQuery",
|
||||||
"content-type": "application/json",
|
"content-type": "application/json",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
wantReturned_value: nil,
|
wantReturned_value: `{"dragons":[{"name":"Mock Dragon 1"},{"name":"Mock Dragon 2"}]}`, // Adjusted expected value
|
||||||
wantErr: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "TestBaseClient_Query_tgbotapp_working",
|
|
||||||
graphQLServer: "https://telegram-bot.app/v1/graphql",
|
|
||||||
args: args{
|
|
||||||
query: `query {
|
|
||||||
__type(name: "Query") {
|
|
||||||
name
|
|
||||||
}
|
|
||||||
}`,
|
|
||||||
},
|
|
||||||
wantReturned_value: string(`{"__type":null}`),
|
|
||||||
wantErr: false,
|
wantErr: false,
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
name: "TestBaseClient_Query_tgbotapp_invalid_query",
|
name: "TestBaseClient_Query_invalid_query",
|
||||||
graphQLServer: "https://telegram-bot.app/v1/graphql",
|
|
||||||
args: args{
|
args: args{
|
||||||
query: `query {
|
query: "query { potato { login } ",
|
||||||
__type(name: "Query") {
|
variables: nil,
|
||||||
name
|
headers: map[string]interface{}{
|
||||||
}
|
"x-apollo-operation-name": "InvalidQuery",
|
||||||
`,
|
"content-type": "application/json",
|
||||||
},
|
|
||||||
wantReturned_value: nil,
|
|
||||||
wantErr: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "TestBaseClient_Query_tgbotapp_invalid_wrong_field",
|
|
||||||
graphQLServer: "https://telegram-bot.app/v1/graphql",
|
|
||||||
args: args{
|
|
||||||
query: `query {
|
|
||||||
__type(name: "Query") {
|
|
||||||
name2
|
|
||||||
}
|
|
||||||
}`,
|
|
||||||
},
|
|
||||||
wantReturned_value: nil,
|
|
||||||
wantErr: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "TestBaseClient_Query_tgbotapp_wrong_url",
|
|
||||||
graphQLServer: "https://telegram-bot.app/v0/graphql",
|
|
||||||
args: args{
|
|
||||||
query: `query {
|
|
||||||
__type(name: "Query") {
|
|
||||||
name
|
|
||||||
}
|
|
||||||
}`,
|
|
||||||
},
|
|
||||||
wantReturned_value: nil,
|
|
||||||
wantErr: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "TestBaseClient_Query_tgbotapp_valid_query_mapstring",
|
|
||||||
graphQLServer: "https://telegram-bot.app/v1/graphql",
|
|
||||||
wantType: "mapstring",
|
|
||||||
args: args{
|
|
||||||
query: `query {
|
|
||||||
__type(name: "Query") {
|
|
||||||
name
|
|
||||||
}
|
|
||||||
}`,
|
|
||||||
},
|
|
||||||
wantReturned_value: map[string]interface{}{"__type": nil},
|
|
||||||
wantErr: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "TestBaseClient_Query_tgbotapp_valid_query_byte",
|
|
||||||
graphQLServer: "https://telegram-bot.app/v1/graphql",
|
|
||||||
wantType: "byte",
|
|
||||||
args: args{
|
|
||||||
query: `query {
|
|
||||||
__type(name: "Query") {
|
|
||||||
name
|
|
||||||
}
|
|
||||||
}`,
|
|
||||||
},
|
|
||||||
wantReturned_value: []byte(`{"__type":null}`),
|
|
||||||
wantErr: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "TestBaseClient_Query_tgbotapp_valid_query_string",
|
|
||||||
graphQLServer: "https://telegram-bot.app/v1/graphql",
|
|
||||||
wantType: "string",
|
|
||||||
args: args{
|
|
||||||
query: `query {
|
|
||||||
__type(name: "Query") {
|
|
||||||
name
|
|
||||||
}
|
|
||||||
}`,
|
|
||||||
},
|
|
||||||
wantReturned_value: string(`{"__type":null}`),
|
|
||||||
wantErr: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "TestBaseClient_Query_tgbotapp_valid_query_invalid_type",
|
|
||||||
graphQLServer: "https://telegram-bot.app/v1/graphql",
|
|
||||||
wantType: "potato",
|
|
||||||
args: args{
|
|
||||||
query: `query {
|
|
||||||
__type(name: "Query") {
|
|
||||||
name
|
|
||||||
}
|
|
||||||
}`,
|
|
||||||
},
|
|
||||||
wantReturned_value: nil,
|
|
||||||
wantErr: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "TestBaseClient_Query_tgbotapp_valid_query_cache",
|
|
||||||
graphQLServer: "https://telegram-bot.app/v1/graphql",
|
|
||||||
args: args{
|
|
||||||
query: `query {
|
|
||||||
__type(name: "Query") {
|
|
||||||
name
|
|
||||||
}
|
|
||||||
}`,
|
|
||||||
variables: map[string]interface{}{
|
|
||||||
"gqlcache": true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
wantReturned_value: string(`{"__type":null}`),
|
|
||||||
wantErr: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "TestBaseClient_Query_tgbotapp_valid_query_with_retry",
|
|
||||||
graphQLServer: "https://telegram-bot.app/v0/graphql",
|
|
||||||
wantType: "byte",
|
|
||||||
args: args{
|
|
||||||
query: `query {
|
|
||||||
__type(name: "Query") {
|
|
||||||
name
|
|
||||||
}
|
|
||||||
}`,
|
|
||||||
variables: map[string]interface{}{
|
|
||||||
"gqlretries": true,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
wantReturned_value: nil,
|
wantReturned_value: nil,
|
||||||
@@ -300,9 +167,8 @@ func (suite *Tests) TestBaseClient_Query() {
|
|||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
suite.T().Run(tt.name, func(t *testing.T) {
|
suite.T().Run(tt.name, func(t *testing.T) {
|
||||||
b := NewConnection()
|
b := NewConnection()
|
||||||
if tt.graphQLServer != "" {
|
b.SetEndpoint(mockServer.URL)
|
||||||
b.SetEndpoint(tt.graphQLServer)
|
b.SetHTTPClient(mockServer.Client())
|
||||||
}
|
|
||||||
if tt.wantType != "" {
|
if tt.wantType != "" {
|
||||||
b.SetOutput(tt.wantType)
|
b.SetOutput(tt.wantType)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -10,7 +10,7 @@ import (
|
|||||||
|
|
||||||
type BaseClient struct {
|
type BaseClient struct {
|
||||||
cache *cache.Cache
|
cache *cache.Cache
|
||||||
Logger *logging.LogConfig
|
Logger *logging.Logger
|
||||||
client *http.Client
|
client *http.Client
|
||||||
endpoint string
|
endpoint string
|
||||||
responseType string
|
responseType string
|
||||||
|
|||||||
+15
-1
@@ -1,6 +1,7 @@
|
|||||||
package gql
|
package gql
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"net/http/httptest"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
assertions "github.com/stretchr/testify/assert"
|
assertions "github.com/stretchr/testify/assert"
|
||||||
@@ -12,9 +13,22 @@ type Tests struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
assert *assertions.Assertions
|
assert *assertions.Assertions
|
||||||
|
mockServer *httptest.Server
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func (suite *Tests) SetupSuite() {
|
||||||
|
// Start mock GraphQL server
|
||||||
|
mockServer = StartMockServer()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *Tests) TearDownSuite() {
|
||||||
|
// Close the mock server
|
||||||
|
if mockServer != nil {
|
||||||
|
mockServer.Close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (suite *Tests) SetupTest() {
|
func (suite *Tests) SetupTest() {
|
||||||
assert = assertions.New(suite.T())
|
assert = assertions.New(suite.T())
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user