diff options
| author |  Dominik Süß <dominik@suess.wtf> | 2025-02-06 12:14:37 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2025-02-06 12:14:37 +0100 |
| commit | dd094e401282e135989f57c0ca3dee7dea3f5207 (patch) | |
| tree | 74cb77830f621840273255a17565ced73b4fa997 /vendor/google.golang.org/grpc/service_config.go | |
| parent | [feature] Use `X-Robots-Tag` headers to instruct scrapers/crawlers (#3737) (diff) | |
| download | gotosocial-dd094e401282e135989f57c0ca3dee7dea3f5207.tar.xz | |
[chore] update otel libraries (#3740)
* chore: update otel dependencies
* refactor: combine tracing & metrics in observability package
* chore: update example tracing compose file
Diffstat (limited to 'vendor/google.golang.org/grpc/service_config.go')
| -rw-r--r-- | vendor/google.golang.org/grpc/service_config.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/google.golang.org/grpc/service_config.go b/vendor/google.golang.org/grpc/service_config.go index 2671c5ef6..7e83027d1 100644 --- a/vendor/google.golang.org/grpc/service_config.go +++ b/vendor/google.golang.org/grpc/service_config.go @@ -168,6 +168,7 @@ func init() { return parseServiceConfig(js, defaultMaxCallAttempts) } } + func parseServiceConfig(js string, maxAttempts int) *serviceconfig.ParseResult { if len(js) == 0 { return &serviceconfig.ParseResult{Err: fmt.Errorf("no JSON service config provided")} @@ -297,7 +298,7 @@ func convertRetryPolicy(jrp *jsonRetryPolicy, maxAttempts int) (p *internalservi return rp, nil } -func min(a, b *int) *int { +func minPointers(a, b *int) *int { if *a < *b { return a } @@ -309,7 +310,7 @@ func getMaxSize(mcMax, doptMax *int, defaultVal int) *int { return &defaultVal } if mcMax != nil && doptMax != nil { - return min(mcMax, doptMax) + return minPointers(mcMax, doptMax) } if mcMax != nil { return mcMax |